From 9cbf2023abe8109aa950e01846b39ffd7ea884c0 Mon Sep 17 00:00:00 2001 From: luotao1 Date: Sat, 29 Sep 2018 17:19:37 +0800 Subject: [PATCH] rollback paddle_inference_helper.h to helper.h test=develop --- cmake/inference_lib.cmake | 6 ++---- paddle/fluid/inference/api/analysis_predictor.cc | 2 +- paddle/fluid/inference/api/api_impl.cc | 2 +- paddle/fluid/inference/api/helper.cc | 2 +- .../inference/api/{paddle_inference_helper.h => helper.h} | 0 paddle/fluid/inference/api/paddle_inference_api.h | 5 ++--- paddle/fluid/inference/tests/api/anakin_rnn1_tester.cc | 2 +- paddle/fluid/inference/tests/api/tester_helper.h | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) rename paddle/fluid/inference/api/{paddle_inference_helper.h => helper.h} (100%) diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake index 840aa06c224..077072f6ead 100644 --- a/cmake/inference_lib.cmake +++ b/cmake/inference_lib.cmake @@ -157,11 +157,9 @@ endif() set(module "inference") copy(inference_lib DEPS ${inference_deps} SRCS ${src_dir}/${module}/*.h ${PADDLE_BINARY_DIR}/paddle/fluid/inference/libpaddle_fluid.* - ${src_dir}/${module}/api/paddle_inference_api.h ${src_dir}/${module}/api/paddle_inference_helper.h - ${src_dir}/${module}/api/demo_ci + ${src_dir}/${module}/api/paddle_inference_api.h ${src_dir}/${module}/api/demo_ci ${PADDLE_BINARY_DIR}/paddle/fluid/inference/api/paddle_inference_pass.h - DSTS ${dst_dir}/${module} ${dst_dir}/${module} ${dst_dir}/${module} ${dst_dir}/${module} - ${dst_dir}/${module} ${dst_dir}/${module} + DSTS ${dst_dir}/${module} ${dst_dir}/${module} ${dst_dir}/${module} ${dst_dir}/${module} ${dst_dir}/${module} ) set(module "platform") diff --git a/paddle/fluid/inference/api/analysis_predictor.cc b/paddle/fluid/inference/api/analysis_predictor.cc index cd2e5444336..a153433d29b 100644 --- a/paddle/fluid/inference/api/analysis_predictor.cc +++ b/paddle/fluid/inference/api/analysis_predictor.cc @@ -21,8 +21,8 @@ #include "paddle/fluid/framework/ir/pass.h" #include "paddle/fluid/framework/naive_executor.h" #include "paddle/fluid/framework/scope.h" +#include "paddle/fluid/inference/api/helper.h" #include "paddle/fluid/inference/api/paddle_inference_api.h" -#include "paddle/fluid/inference/api/paddle_inference_helper.h" #include "paddle/fluid/inference/api/paddle_inference_pass.h" #include "paddle/fluid/inference/utils/singleton.h" #include "paddle/fluid/platform/profiler.h" diff --git a/paddle/fluid/inference/api/api_impl.cc b/paddle/fluid/inference/api/api_impl.cc index ff4224c997c..6682e0a81b2 100644 --- a/paddle/fluid/inference/api/api_impl.cc +++ b/paddle/fluid/inference/api/api_impl.cc @@ -22,7 +22,7 @@ limitations under the License. */ #include "paddle/fluid/framework/feed_fetch_method.h" #include "paddle/fluid/inference/api/api_impl.h" -#include "paddle/fluid/inference/api/paddle_inference_helper.h" +#include "paddle/fluid/inference/api/helper.h" #include "paddle/fluid/platform/profiler.h" DEFINE_bool(profile, false, "Turn on profiler for fluid"); diff --git a/paddle/fluid/inference/api/helper.cc b/paddle/fluid/inference/api/helper.cc index f982d9e4ef5..9cc491e10d6 100644 --- a/paddle/fluid/inference/api/helper.cc +++ b/paddle/fluid/inference/api/helper.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/fluid/inference/api/paddle_inference_helper.h" +#include "paddle/fluid/inference/api/helper.h" namespace paddle { namespace inference { diff --git a/paddle/fluid/inference/api/paddle_inference_helper.h b/paddle/fluid/inference/api/helper.h similarity index 100% rename from paddle/fluid/inference/api/paddle_inference_helper.h rename to paddle/fluid/inference/api/helper.h diff --git a/paddle/fluid/inference/api/paddle_inference_api.h b/paddle/fluid/inference/api/paddle_inference_api.h index 3aa5c614687..a70edf4aff5 100644 --- a/paddle/fluid/inference/api/paddle_inference_api.h +++ b/paddle/fluid/inference/api/paddle_inference_api.h @@ -268,9 +268,8 @@ struct AnalysisConfig : public NativeConfig { // NOT stable yet. bool use_feed_fetch_ops{true}; - // NOTE this is just for internal development, please not use it. NOT - // stable - // yet. + // NOTE this is just for internal development, please not use it. + // NOT stable yet. bool _use_mkldnn{false}; }; diff --git a/paddle/fluid/inference/tests/api/anakin_rnn1_tester.cc b/paddle/fluid/inference/tests/api/anakin_rnn1_tester.cc index 2bc8b61ef73..c4022225fd4 100644 --- a/paddle/fluid/inference/tests/api/anakin_rnn1_tester.cc +++ b/paddle/fluid/inference/tests/api/anakin_rnn1_tester.cc @@ -20,8 +20,8 @@ limitations under the License. */ #include #include // NOLINT #include +#include "paddle/fluid/inference/api/helper.h" #include "paddle/fluid/inference/api/paddle_inference_api.h" -#include "paddle/fluid/inference/api/paddle_inference_helper.h" #include "utils/logger/logger.h" DEFINE_string(model, "", "Directory of the inference model."); diff --git a/paddle/fluid/inference/tests/api/tester_helper.h b/paddle/fluid/inference/tests/api/tester_helper.h index d87b35da249..8603d09cbd0 100644 --- a/paddle/fluid/inference/tests/api/tester_helper.h +++ b/paddle/fluid/inference/tests/api/tester_helper.h @@ -23,7 +23,7 @@ #include "paddle/fluid/inference/analysis/analyzer.h" #include "paddle/fluid/inference/analysis/ut_helper.h" #include "paddle/fluid/inference/api/analysis_predictor.h" -#include "paddle/fluid/inference/api/paddle_inference_helper.h" +#include "paddle/fluid/inference/api/helper.h" #include "paddle/fluid/inference/api/paddle_inference_pass.h" #include "paddle/fluid/platform/profiler.h" -- GitLab