[PIR save/load] Change PIR DEVELOP_VERSION to 0 (#72751)

huangjiyi · web-flow · commit 3561b07043e2 · 2025-05-20T11:28:04.000+08:00
diff --git a/paddle/fluid/inference/api/analysis_predictor.cc b/paddle/fluid/inference/api/analysis_predictor.cc
@@ -1093,7 +1093,7 @@ void AnalysisPredictor::OptimizeInferencePirProgram() {
     if (config_.save_optimized_model_) {
       std::string optimized_model =
           GetOptimizedModelPath() + "/" + "_optimized.json";
-      pir::WriteModule(*pir_program_, optimized_model, 1, true, false, true);
+      pir::WriteModule(*pir_program_, optimized_model);
       LOG(INFO) << "Optimized model saved to " << optimized_model;
       SaveOrLoadPirParameters(true);
     }
@@ -1401,7 +1401,7 @@ bool AnalysisPredictor::PreparePirProgram() {
       common::errors::Fatal("Here, pir_program must be a nullptr!"));
 
   pir_program_ = std::make_shared<pir::Program>(pir::IrContext::Instance());
-  pir::ReadModule(config_.prog_file(), pir_program_.get(), 1 /*pir_version*/);
+  pir::ReadModule(config_.prog_file(), pir_program_.get());
   if (!SaveOrLoadPirParameters(false)) {
     return false;
   }
diff --git a/paddle/fluid/jit/serializer.cc b/paddle/fluid/jit/serializer.cc
@@ -169,7 +169,7 @@ std::shared_ptr<pir::Program> Deserializer::LoadPirProgram(
   VLOG(3) << "LoadPirProgram from: " << file_name;
   auto pir_program_ =
       std::make_shared<pir::Program>(pir::IrContext::Instance());
-  pir::ReadModule(file_name, pir_program_.get(), 1);
+  pir::ReadModule(file_name, pir_program_.get());
   return pir_program_;
 }
 
diff --git a/paddle/fluid/pir/serialize_deserialize/CMakeLists.txt b/paddle/fluid/pir/serialize_deserialize/CMakeLists.txt
@@ -13,7 +13,7 @@ endif()
 
 file(GLOB_RECURSE YAML_PATCH_FILES "*.yaml")
 # change pir version when new patches are added
-add_definitions(-DDEVELOP_VERSION=1)
+add_definitions(-DDEVELOP_VERSION=0)
 add_definitions(-DRELEASE_VERSION=1)
 set(TEMPLATE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/patch/template.h.in)
 set(PATCH_HEADER ${CMAKE_CURRENT_BINARY_DIR}/patch/patch.h)
diff --git a/paddle/fluid/pir/serialize_deserialize/include/interface.h b/paddle/fluid/pir/serialize_deserialize/include/interface.h
@@ -40,10 +40,10 @@ namespace pir {
  */
 void IR_API WriteModule(const pir::Program& program,
                         const std::string& file_path,
-                        uint64_t pir_version,
-                        bool overwrite,
+                        bool overwrite = true,
                         bool readable = false,
-                        bool trainable = true);
+                        bool trainable = true,
+                        int64_t pir_version = -1);
 
 /**
  * @brief Gets a PIR program from the specified file path.
diff --git a/paddle/fluid/pir/serialize_deserialize/src/interface.cc b/paddle/fluid/pir/serialize_deserialize/src/interface.cc
@@ -28,10 +28,10 @@ namespace pir {
 #define PIR "pir"
 void WriteModule(const pir::Program& program,
                  const std::string& file_path,
-                 uint64_t pir_version,
                  bool overwrite,
                  bool readable,
-                 bool trainable) {
+                 bool trainable,
+                 int64_t pir_version) {
   PADDLE_ENFORCE_EQ(
       FileExists(file_path) && !overwrite,
       false,
@@ -43,6 +43,11 @@ void WriteModule(const pir::Program& program,
   // write base code
   Json total;
 
+  if (pir_version < 0) {
+    pir_version = DEVELOP_VERSION;
+    VLOG(6) << "pir_version is null, get pir_version: " << pir_version;
+  }
+
   total[BASE_CODE] = {
       {MAGIC, PIR}, {PIRVERSION, pir_version}, {TRAINABLE, trainable}};
 
diff --git a/paddle/fluid/pir/serialize_deserialize/src/patch_util.cc b/paddle/fluid/pir/serialize_deserialize/src/patch_util.cc
@@ -35,7 +35,6 @@ Json BuildAttrJsonPatch(const YAML::Node &action) {
     j_attr_type = nullptr;
   } else {
     j_attr_type = GetAttrJson(action);
-    j_attr_type = GetAttrJson(action);
   }
   return j_attr_type;
 }
diff --git a/paddle/fluid/pybind/io.cc b/paddle/fluid/pybind/io.cc
@@ -166,10 +166,10 @@ void BindIO(pybind11::module *m) {
          &pir::WriteModule,
          py::arg("program"),
          py::arg("file_path"),
-         py::arg("pir_version"),
          py::arg("overwrite") = true,
          py::arg("readable") = false,
-         py::arg("trainable") = true);
+         py::arg("trainable") = true,
+         py::arg("pir_version") = -1);
   m->def("deserialize_pir_program",
          &pir::ReadModule,
          py::arg("file_path"),
diff --git a/python/paddle/framework/io.py b/python/paddle/framework/io.py
@@ -944,9 +944,7 @@ def save(
 
         if isinstance(obj, paddle.static.Program):
             if in_pir_mode():
-                paddle.core.serialize_pir_program(
-                    obj, path, 1, True, False, True
-                )
+                paddle.core.serialize_pir_program(obj, path)
             else:
                 obj.desc.flush()
                 with _open_file_buffer(path, "wb") as f:
@@ -1255,9 +1253,7 @@ def load(path: str | BytesIO, **configs: Unpack[_LoadOptions]) -> Any:
                     try:
                         if in_pir_mode():
                             program = paddle.static.Program()
-                            paddle.core.deserialize_pir_program(
-                                path, program, 1
-                            )
+                            paddle.core.deserialize_pir_program(path, program)
                             return program
                         with _open_file_buffer(path, "rb") as f:
                             program_desc_str = f.read()
diff --git a/python/paddle/jit/pir_translated_layer.py b/python/paddle/jit/pir_translated_layer.py
@@ -39,7 +39,7 @@
 def _load_pir_program(model_file_path):
     program = paddle.static.Program()
     trainable = paddle.base.core.deserialize_pir_program(
-        model_file_path, program, 1
+        model_file_path, program
     )
 
     return program, trainable
diff --git a/python/paddle/static/pir_io.py b/python/paddle/static/pir_io.py
@@ -625,9 +625,7 @@ def get_tensor(var):
         pickle.dump(opt_dict, f, protocol=protocol)
 
     # save program
-    paddle.core.serialize_pir_program(
-        program, model_path + ".json", 1, True, False, True
-    )
+    paddle.core.serialize_pir_program(program, model_path + ".json")
 
 
 @static_only
@@ -766,7 +764,6 @@ def save_inference_model_pir(
             if kwargs.get('separate_parameters', False)
             else model_path
         ),
-        1,
         True,
         readable,
         trainable,
@@ -872,7 +869,7 @@ def load_inference_model_pir(path_prefix, executor, **kwargs):
 
         # deserialize bytes to program
         program = paddle.static.Program()
-        paddle.base.core.deserialize_pir_program(model_filename, program, 1)
+        paddle.base.core.deserialize_pir_program(model_filename, program)
 
         params, opts = get_pir_parameters(program)
         vars = params + opts
@@ -926,7 +923,7 @@ def load_inference_model_pir(path_prefix, executor, **kwargs):
 
         # deserialize bytes to program
         program = paddle.static.Program()
-        paddle.base.core.deserialize_pir_program(model_path, program, 1)
+        paddle.base.core.deserialize_pir_program(model_path, program)
         # load parameters
         params, opts = get_pir_parameters(program)
         vars = params + opts
diff --git a/test/cpp/pir/serialize_deserialize/save_load_version_compat_test.cc b/test/cpp/pir/serialize_deserialize/save_load_version_compat_test.cc
@@ -138,7 +138,7 @@ TEST(save_load_version_compat, attribute_patch_test1) {
 
   // Save the program into file
   pir::WriteModule(
-      program, "./test_save_load", /*pir_version*/ 1, true, false, true);
+      program, "./test_save_load", true, false, true, /*pir_version*/ 1);
   // Load the program from file
   pir::Program new_program(ctx);
   ReadModuleForTest("./test_save_load", &new_program, 2);
@@ -244,7 +244,7 @@ TEST(save_load_version_compat, op_patch_test1) {
   program.block()->push_back(op2);
 
   pir::WriteModule(
-      program, "./test_save_load", /*pir_version*/ 1, true, false, true);
+      program, "./test_save_load", true, false, true, /*pir_version*/ 1);
   // Load the program from file
   pir::Program new_program(ctx);
   ReadModuleForTest("./test_save_load", &new_program, 2);
@@ -299,7 +299,7 @@ TEST(save_load_version_compat, op_patch_test2) {
   block->push_back(op2);
 
   pir::WriteModule(
-      program, "./test_save_load", /*pir_version*/ 1, true, false, true);
+      program, "./test_save_load", true, false, true, /*pir_version*/ 1);
   // Load the program from file
   pir::Program new_program(ctx);
   ReadModuleForTest("./test_save_load", &new_program, 2);
@@ -341,7 +341,7 @@ TEST(save_load_version_compat, op_patch_test3) {
   block->push_back(op2);
 
   pir::WriteModule(
-      program, "./test_save_load", /*pir_version*/ 1, true, false, true);
+      program, "./test_save_load", true, false, true, /*pir_version*/ 1);
   // Load the program from file
   pir::Program new_program(ctx);
   ReadModuleForTest("./test_save_load", &new_program, 2);
diff --git a/test/cpp/pir/serialize_deserialize/test_builtin_parameter.cc b/test/cpp/pir/serialize_deserialize/test_builtin_parameter.cc
@@ -45,7 +45,7 @@ TEST(SaveTest, uncompelteted_parameter) {
   program.block()->push_back(op);
 
   pir::WriteModule(
-      program, "./test_param", /*pir_version*/ 0, true, false, true);
+      program, "./test_param", true, false, true, /*pir_version*/ 0);
 
   pir::Program new_program(ctx);
   pir::ReadModule("./test_param", &new_program, /*pir_version*/ 0);
diff --git a/test/ir/pir/test_ir_save_load.py b/test/ir/pir/test_ir_save_load.py
@@ -45,7 +45,9 @@ def test_save_load(self):
 
         file_path = os.path.join(self.temp_dir.name, "test_save_program1.json")
         pir_version = 1
-        base.core.serialize_pir_program(main_program, file_path, pir_version)
+        base.core.serialize_pir_program(
+            main_program, file_path, True, False, True, pir_version
+        )
 
         recover_program = paddle.static.Program()
         base.core.deserialize_pir_program(
@@ -82,7 +84,7 @@ def test_save_no_trainable(self):
         )
         pir_version = 1
         base.core.serialize_pir_program(
-            main_program, file_path, pir_version, True, True, False
+            main_program, file_path, True, True, False, pir_version
         )
 
         recover_program = paddle.static.Program()
@@ -109,7 +111,7 @@ def test_builtin_save(self):
         file_path = os.path.join(self.temp_dir.name, "test_save_program2.json")
         pir_version = 1
         base.core.serialize_pir_program(
-            main_program, file_path, pir_version, True, True, True
+            main_program, file_path, True, True, True, pir_version
         )
 
         recover_program = paddle.static.Program()
@@ -180,7 +182,9 @@ def test_if_with_single_output(self):
             self.temp_dir.name, "test_save_program_if.json"
         )
         pir_version = 1
-        base.core.serialize_pir_program(main_program, file_path, pir_version)
+        base.core.serialize_pir_program(
+            main_program, file_path, True, False, True, pir_version
+        )
 
         recover_program = paddle.static.Program()
         base.core.deserialize_pir_program(
@@ -201,7 +205,9 @@ def test_if_with_multiple_output(self):
             self.temp_dir.name, "test_save_program_if2.json"
         )
         pir_version = 1
-        base.core.serialize_pir_program(main_program, file_path, pir_version)
+        base.core.serialize_pir_program(
+            main_program, file_path, True, False, True, pir_version
+        )
 
         recover_program = paddle.static.Program()
         base.core.deserialize_pir_program(
@@ -267,7 +273,9 @@ def test_while_base(self):
             self.temp_dir.name, "test_save_program_while.json"
         )
         pir_version = 1
-        base.core.serialize_pir_program(main_program, file_path, pir_version)
+        base.core.serialize_pir_program(
+            main_program, file_path, True, False, True, pir_version
+        )
 
         recover_program = paddle.static.Program()
         base.core.deserialize_pir_program(
@@ -293,7 +301,9 @@ def test_get_used_external_value(self):
             self.temp_dir.name, "test_save_program_while.json"
         )
         pir_version = 1
-        base.core.serialize_pir_program(main_program, file_path, pir_version)
+        base.core.serialize_pir_program(
+            main_program, file_path, True, False, True, pir_version
+        )
 
         recover_program = paddle.static.Program()
         base.core.deserialize_pir_program(
@@ -357,7 +367,9 @@ def internal_body(j, init, sums):
             self.temp_dir.name, "test_save_program_while_nest.json"
         )
         pir_version = 1
-        base.core.serialize_pir_program(main_program, file_path, pir_version)
+        base.core.serialize_pir_program(
+            main_program, file_path, True, False, True, pir_version
+        )
 
         recover_program = paddle.static.Program()
         base.core.deserialize_pir_program(

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ std::shared_ptr<pir::Program> Deserializer::LoadPirProgram(`
`169`	`169`	`VLOG(3) << "LoadPirProgram from: " << file_name;`
`170`	`170`	`auto pir_program_ =`
`171`	`171`	`std::make_shared<pir::Program>(pir::IrContext::Instance());`
`172`		`- pir::ReadModule(file_name, pir_program_.get(), 1);`
	`172`	`+ pir::ReadModule(file_name, pir_program_.get());`
`173`	`173`	`return pir_program_;`
`174`	`174`	`}`
`175`	`175`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ Json BuildAttrJsonPatch(const YAML::Node &action) {`
`35`	`35`	`j_attr_type = nullptr;`
`36`	`36`	`} else {`
`37`	`37`	`j_attr_type = GetAttrJson(action);`
`38`		`- j_attr_type = GetAttrJson(action);`
`39`	`38`	`}`
`40`	`39`	`return j_attr_type;`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`def _load_pir_program(model_file_path):`
`40`	`40`	`program = paddle.static.Program()`
`41`	`41`	`trainable = paddle.base.core.deserialize_pir_program(`
`42`		`- model_file_path, program, 1`
	`42`	`+ model_file_path, program`
`43`	`43`	`)`
`44`	`44`
`45`	`45`	`return program, trainable`