Handle combined case of 1.0 save format

PaddlePaddle · Aug 3, 2023 · ae92b26 · ae92b26
1 parent 7db4ce8
commit ae92b26
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/paddle/cinn/frontend/paddle/model_parser.cc b/paddle/cinn/frontend/paddle/model_parser.cc
@@ -245,16 +245,8 @@ void LoadModelPb(const std::string &model_dir,
   VLOG(3) << "param_file is: " << param_file;
   // Load model
   VLOG(4) << "Start load model program...";
-  std::string prog_path = model_dir + "/__model__";
-  std::string param_file_temp = param_file;
-  if (combined) {
-    // In combined case, prog path is saved as [model_dir].pdmodel
-    // Param file is saved as [model_dir].pdiparams
-    // For example, /path/model.pdmodel , /path/model.pdiparams
-    // In this case, model_file = ".pdmodel", param_file = ".pdiparams"
-    prog_path = model_dir + model_file;
-    param_file_temp = model_dir + param_file;
-  }
+  std::string prog_path = model_dir + model_file;
+  std::string param_file_temp = model_dir + param_file;
   framework_proto::ProgramDesc pb_proto_prog =
       *LoadProgram(prog_path, model_from_memory);
   pb::ProgramDesc pb_prog(&pb_proto_prog);

diff --git a/paddle/cinn/frontend/paddle_model_convertor.cc b/paddle/cinn/frontend/paddle_model_convertor.cc
@@ -127,15 +127,14 @@ Program PaddleModelConvertor::LoadModel(
   paddle::cpp::ProgramDesc program_desc;
   if (FLAGS_cinn_infer_model_version < 2.0) {
     paddle::LoadModelPb(model_dir,
-                        "__model__",
-                        "",
+                        "/__model__",
+                        "/params",
                         scope_.get(),
                         &program_desc,
                         is_combined,
                         false,
                         target_);
   } else {
-    is_combined = true;
     paddle::LoadModelPb(model_dir,
                         ".pdmodel",
                         ".pdiparams",

diff --git a/paddle/cinn/frontend/paddle_model_to_program.cc b/paddle/cinn/frontend/paddle_model_to_program.cc
@@ -744,8 +744,8 @@ std::unique_ptr<Program> PaddleModelToProgram::operator()(
   paddle::cpp::ProgramDesc program_desc;
   if (FLAGS_cinn_infer_model_version < 2.0) {
     paddle::LoadModelPb(model_dir,
-                        "__model__",
-                        "",
+                        "/__model__",
+                        "/params",
                         scope_,
                         &program_desc,
                         is_combined,