Fix (#69540)

co63oc · web-flow · commit feb694135034 · 2024-11-22T09:48:27.000+08:00
diff --git a/paddle/fluid/pybind/io.cc b/paddle/fluid/pybind/io.cc
@@ -45,7 +45,7 @@ void Load(const std::string &file_path,
   pir::LoadFunction(file_path, seek, shape, load_as_fp16, out, place);
 }
 void BindIO(pybind11::module *m) {
-  m->def("save_lod_tensor",
+  m->def("save_dense_tensor",
          [](const phi::DenseTensor &tensor, const std::string &str_file_name) {
            std::ofstream fout(str_file_name, std::ios::binary);
            PADDLE_ENFORCE_EQ(
@@ -60,7 +60,7 @@ void BindIO(pybind11::module *m) {
            return tellp;
          });
 
-  m->def("load_lod_tensor",
+  m->def("load_dense_tensor",
          [](phi::DenseTensor &tensor, const std::string &str_file_name) {
            std::ifstream fin(str_file_name, std::ios::binary);
            PADDLE_ENFORCE_EQ(
@@ -107,14 +107,14 @@ void BindIO(pybind11::module *m) {
         return tellg;
       });
 
-  m->def("save_lod_tensor_to_memory",
+  m->def("save_dense_tensor_to_memory",
          [](const phi::DenseTensor &tensor) -> py::bytes {
            std::ostringstream ss;
            paddle::framework::SerializeToStream(ss, tensor);
            return ss.str();
          });
 
-  m->def("load_lod_tensor_from_memory",
+  m->def("load_dense_tensor_from_memory",
          [](phi::DenseTensor &tensor, const std::string &tensor_bytes) {
            std::istringstream fin(tensor_bytes,
                                   std::ios::in | std::ios::binary);
diff --git a/python/paddle/framework/io.py b/python/paddle/framework/io.py
@@ -672,17 +672,17 @@ def ndarray_to_tensor(obj):
         )
 
 
-def _save_lod_tensor(tensor, file_name):
+def _save_dense_tensor(tensor, file_name):
     if not tensor._is_initialized():
         raise ValueError(
             "The saved tensor is not initialized. If you used group sharded, please use save_group_sharded_model firstly."
         )
     if _is_file_path(file_name):
-        _seek = core.save_lod_tensor(tensor, file_name)
+        _seek = core.save_dense_tensor(tensor, file_name)
         # '_seek' is the end position of this tensor in the file.
 
     elif _is_memory_buffer(file_name):
-        tensor_bytes = core.save_lod_tensor_to_memory(tensor)
+        tensor_bytes = core.save_dense_tensor_to_memory(tensor)
 
         with _open_file_buffer(file_name, 'wb') as f:
             f.write(tensor_bytes)
@@ -695,16 +695,16 @@ def _save_lod_tensor(tensor, file_name):
     return _seek
 
 
-def _load_lod_tensor(file_name):
+def _load_dense_tensor(file_name):
     temp_t = paddle.base.core.DenseTensor()
     if _is_file_path(file_name):
         # '_seek' is the end position of this tensor in the file.
-        _seek = paddle.base.core.load_lod_tensor(temp_t, file_name)
+        _seek = paddle.base.core.load_dense_tensor(temp_t, file_name)
 
     elif _is_memory_buffer(file_name):
         with _open_file_buffer(file_name, 'rb') as f:
             tensor_bytes = f.read()
-            paddle.base.core.load_lod_tensor_from_memory(temp_t, tensor_bytes)
+            paddle.base.core.load_dense_tensor_from_memory(temp_t, tensor_bytes)
             _seek = f.tell()
 
     else:
@@ -758,11 +758,11 @@ def _load_selected_rows(file_name):
 
 def _save_binary_var(obj, path):
     if isinstance(obj, core.DenseTensor):
-        _save_lod_tensor(obj, path)
+        _save_dense_tensor(obj, path)
     elif isinstance(obj, core.SelectedRows):
         _save_selected_rows(obj, path)
     elif isinstance(obj, core.eager.Tensor):
-        _save_lod_tensor(obj.value().get_tensor(), path)
+        _save_dense_tensor(obj.value().get_tensor(), path)
     else:
         # Since the concept of 'Tensor' is only exposed to users, the error message can only contain tensor instead of 'DenseTensor' or 'SelectedRows'
         raise NotImplementedError(
@@ -1237,7 +1237,7 @@ def load(path: str | BytesIO, **configs: Unpack[_LoadOptions]) -> Any:
                 return tensor
             except:
                 try:
-                    tensor, _ = _load_lod_tensor(path)
+                    tensor, _ = _load_dense_tensor(path)
                     if config.return_numpy:
                         p = core.Place()
                         p.set_place(paddle.CPUPlace())
diff --git a/test/legacy_test/test_paddle_save_load_binary.py b/test/legacy_test/test_paddle_save_load_binary.py
@@ -142,7 +142,7 @@ def test_replace_save_load_vars(self):
 
                     np.testing.assert_array_equal(new_t, base_t)
 
-    def test_save_load_lod_tensor(self):
+    def test_save_load_dense_tensor(self):
         paddle.enable_static()
         OUTPUT_NUM = 32
         with new_program_scope():
@@ -165,7 +165,7 @@ def test_save_load_lod_tensor(self):
             exe.run(base.default_startup_program())
 
             dirname = os.path.join(
-                self.temp_dir.name, 'test_save_load_lod_tensor1/tensor_'
+                self.temp_dir.name, 'test_save_load_dense_tensor1/tensor_'
             )
             for var in prog.list_vars():
                 if var.persistable and list(var.shape) == [
@@ -208,7 +208,7 @@ def test_save_load_lod_tensor(self):
             paddle.save(temp_lod, path, use_binary_format=True)
 
         with self.assertRaises(RuntimeError):
-            base.core.save_lod_tensor(
+            base.core.save_dense_tensor(
                 temp_lod,
                 os.path.join(
                     self.temp_dir.name,
@@ -217,7 +217,7 @@ def test_save_load_lod_tensor(self):
             )
 
         with self.assertRaises(RuntimeError):
-            base.core.load_lod_tensor(
+            base.core.load_dense_tensor(
                 temp_lod,
                 os.path.join(
                     self.temp_dir.name,
@@ -235,9 +235,9 @@ def test_save_load_lod_tensor(self):
         np.testing.assert_array_equal(np.array(tensor), to_array_mem)
 
         with self.assertRaises(NotImplementedError):
-            paddle.framework.io._save_lod_tensor(tensor, 1)
+            paddle.framework.io._save_dense_tensor(tensor, 1)
         with self.assertRaises(NotImplementedError):
-            paddle.framework.io._load_lod_tensor(1)
+            paddle.framework.io._load_dense_tensor(1)
 
     def test_save_load_selected_rows(self):
         paddle.enable_static()
