diff --git a/paddle/fluid/lite/api/cxx_api.cc b/paddle/fluid/lite/api/cxx_api.cc index 07a216b63739d48ce68dc359c87245f812f97715..6bf789c35fe804a89c4c95c4d2f46b148e2fe5cc 100644 --- a/paddle/fluid/lite/api/cxx_api.cc +++ b/paddle/fluid/lite/api/cxx_api.cc @@ -25,7 +25,7 @@ namespace paddle { namespace lite { #ifndef LITE_WITH_LIGHT_WEIGHT_FRAMEWORK -void LightPredictor::SaveModel(const std::string &dir) { +void CXXPredictor::SaveModel(const std::string &dir) { MkDirRecursively(dir.c_str()); program_->PersistModel(dir, program_desc_); } diff --git a/paddle/fluid/lite/api/cxx_api.h b/paddle/fluid/lite/api/cxx_api.h index d9c0c4a195a35598f7d424a1fbb4779723855bec..72e1bea61416035af0a9c9271111860d76565365 100644 --- a/paddle/fluid/lite/api/cxx_api.h +++ b/paddle/fluid/lite/api/cxx_api.h @@ -28,14 +28,13 @@ namespace lite { struct Config {}; -class LightPredictor { +class CXXPredictor { public: - LightPredictor() { scope_ = std::make_shared(); } + CXXPredictor() { scope_ = std::make_shared(); } void Build(const std::string& model_path, const Place& prefer_place, const std::vector& valid_places) { LoadModel(model_path, scope_.get(), &program_desc_); - Program program(program_desc_, scope_, valid_places); optimizer_.KernelPickPreferPlace(prefer_place); diff --git a/paddle/fluid/lite/api/cxx_api_bin.cc b/paddle/fluid/lite/api/cxx_api_bin.cc index 4ff18ded8496ba7acf09b28486d2863140f7b080..4340387f853b4ecad2a674a2abfe5133ec51e5b6 100644 --- a/paddle/fluid/lite/api/cxx_api_bin.cc +++ b/paddle/fluid/lite/api/cxx_api_bin.cc @@ -20,7 +20,7 @@ namespace paddle { namespace lite { void Run(const char* model_dir) { - lite::LightPredictor predictor; + lite::CXXPredictor predictor; #ifndef LITE_WITH_CUDA std::vector valid_places({Place{TARGET(kHost), PRECISION(kFloat)}}); #else diff --git a/paddle/fluid/lite/api/cxx_api_test.cc b/paddle/fluid/lite/api/cxx_api_test.cc index 3d929ffb38a9d014b37ac128ce3ce48f14986152..bbd19340a148b7091083cc09a47fb736c37c9666 100644 --- a/paddle/fluid/lite/api/cxx_api_test.cc +++ b/paddle/fluid/lite/api/cxx_api_test.cc @@ -26,7 +26,7 @@ namespace paddle { namespace lite { TEST(CXXApi, test) { - lite::LightPredictor predictor; + lite::CXXPredictor predictor; #ifndef LITE_WITH_CUDA std::vector valid_places({Place{TARGET(kHost), PRECISION(kFloat)}}); #else @@ -64,7 +64,7 @@ TEST(CXXApi, test) { #ifndef LITE_WITH_LIGHT_WEIGHT_FRAMEWORK TEST(CXXApi, save_model) { - lite::LightPredictor predictor; + lite::CXXPredictor predictor; std::vector valid_places({Place{TARGET(kHost), PRECISION(kFloat)}}); predictor.Build(FLAGS_model_dir, Place{TARGET(kCUDA), PRECISION(kFloat)}, valid_places); diff --git a/paddle/fluid/lite/core/type_system.h b/paddle/fluid/lite/core/type_system.h index b83eca233bf45ca6cb6dc67761b305f9a532671a..46d17e3c33e9058288f9a73649cb88ea8c3ed868 100644 --- a/paddle/fluid/lite/core/type_system.h +++ b/paddle/fluid/lite/core/type_system.h @@ -212,7 +212,7 @@ struct ParamType { const Type* type; ParamType() = default; - explicit ParamType(const Type* type) : type(type) {} + ParamType(const Type* type) : type(type) {} // NOLINT std::string DebugString() const { return type->name(); } };