[Lod][fluid_ops] paddle lodtensor (#69494)

co63oc · web-flow · commit 25c3a72902f8 · 2024-11-21T09:48:08.000+08:00
* Fix

* Fix
diff --git a/paddle/phi/README.md b/paddle/phi/README.md
@@ -299,7 +299,7 @@ Tensor ondnn() const;
 
 ##### 2.3.3.3 DenseTensor、SparseTensor
 
-- `DenseTensor` is the basic implementation of Tensor, which corresponds to the `LoDTensor` class in the original fluid. `DenseTensorMeta` in `DenseTensor` contains basic members that describe Tensor information, and `Allocation` in `DenseTensor` is the original `Allocation` of fluid.
+- `DenseTensor` is the basic implementation of Tensor. `DenseTensorMeta` in `DenseTensor` contains basic members that describe Tensor information, and `Allocation` in `DenseTensor` is the original `Allocation` of fluid.
 - `SparseCsrTensor` and `SparseCooTensor` are newly designed sparse Tensor types, see code implementation for details.
 
 > In order to be compatible with the original framework scheduling and operators, we have also migrated `SelectedRows` as a basic Tensor type. If it can be replaced by a new sparse Tensor in the future, it will be removed.
diff --git a/python/paddle/base/executor.py b/python/paddle/base/executor.py
@@ -180,7 +180,7 @@ def as_numpy(tensor, copy=False):
             "Some of your fetched tensors hold LoD information. \
             They can not be completely cast to Python ndarray. \
             Please set the parameter 'return_numpy' as 'False' to \
-            return LoDTensor itself directly."
+            return DenseTensor itself directly."
         )
     if tensor._is_initialized():
         if copy:
diff --git a/python/paddle/base/framework.py b/python/paddle/base/framework.py
@@ -2876,7 +2876,7 @@ def set_value(self, value, scope=None):
 
         if not (isinstance(value, np.ndarray) or hasattr(value, "__array__")):
             raise TypeError(
-                f"`value` should be `numpy.ndarray` or `LoDTensor`, but received {type(value)}."
+                f"`value` should be `numpy.ndarray` or `DenseTensor`, but received {type(value)}."
             )
 
         if scope is not None and not isinstance(scope, core._Scope):
diff --git a/python/paddle/base/lod_tensor.py b/python/paddle/base/lod_tensor.py
@@ -105,7 +105,7 @@ def create_lod_tensor(data, recursive_seq_lens, place):
         return tensor
     else:
         raise TypeError(
-            "data should be either a LoDTensor, a Numpy array or a list"
+            "data should be either a DenseTensor, a Numpy array or a list"
         )
 
 
diff --git a/python/paddle/base/trainer_factory.py b/python/paddle/base/trainer_factory.py
@@ -226,7 +226,7 @@ def handler_launch_func(self, scope, handler):
                                             hold LoD information. \
                                             They can not be completely cast \
                                             to Python ndarray. We can \
-                                            not return LoDTensor itself directly, \
+                                            not return DenseTensor itself directly, \
                                             please choose another targets"
                         )
                     if res_dict[user_name]._is_initialized():
diff --git a/python/paddle/distributed/auto_parallel/static/utils.py b/python/paddle/distributed/auto_parallel/static/utils.py
@@ -547,7 +547,7 @@ def _check_param_dict(param_dict):
                 )
             if not isinstance(value, paddle.base.DenseTensor):
                 raise TypeError(
-                    "The type of value of 'param_dict' should be 'LoDTensor', "
+                    "The type of value of 'param_dict' should be 'DenseTensor', "
                     f"but got '{type(value)}'."
                 )
         return param_dict
diff --git a/python/paddle/framework/io_utils.py b/python/paddle/framework/io_utils.py
@@ -276,7 +276,7 @@ def _unpack_saved_dict(saved_obj, protocol):
 def set_value(var, value, scope=None):
     if not (isinstance(value, np.ndarray) or hasattr(value, "__array__")):
         raise TypeError(
-            f"`value` should be `numpy.ndarray` or `LoDTensor`, but received {type(value)}."
+            f"`value` should be `numpy.ndarray` or `DenseTensor`, but received {type(value)}."
         )
 
     if scope is not None and not isinstance(scope, core._Scope):
diff --git a/python/paddle/inference/wrapper.py b/python/paddle/inference/wrapper.py
@@ -84,7 +84,7 @@ def tensor_share_external_data(self, data: Tensor) -> None:
         )
     else:
         raise TypeError(
-            "In share_external_data, we only support Tensor and LoDTensor."
+            "In share_external_data, we only support Tensor and DenseTensor."
         )
 
 
diff --git a/python/paddle/jit/dy2static/convert_operators.py b/python/paddle/jit/dy2static/convert_operators.py
@@ -631,7 +631,7 @@ def convert_len(var):
             return paddle.tensor.array_length(var)
         else:
             raise TypeError(
-                f'len(var) only supports LoDTensor/DenseTensorArray/SelectedRows, but received {type(var)}.'
+                f'len(var) only supports DenseTensor/DenseTensorArray/SelectedRows, but received {type(var)}.'
             )
     elif isinstance(var, Value):
         if var.is_dense_tensor_type() or var.is_selected_row_type():

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ def as_numpy(tensor, copy=False):`
`180`	`180`	`"Some of your fetched tensors hold LoD information. \`
`181`	`181`	`They can not be completely cast to Python ndarray. \`
`182`	`182`	`Please set the parameter 'return_numpy' as 'False' to \`
`183`		`- return LoDTensor itself directly."`
	`183`	`+ return DenseTensor itself directly."`
`184`	`184`	`)`
`185`	`185`	`if tensor._is_initialized():`
`186`	`186`	`if copy:`
Original file line number	Diff line number	Diff line change
`@@ -2876,7 +2876,7 @@ def set_value(self, value, scope=None):`
`2876`	`2876`
`2877`	`2877`	`if not (isinstance(value, np.ndarray) or hasattr(value, "__array__")):`
`2878`	`2878`	`raise TypeError(`
`2879`		- f"`value` should be `numpy.ndarray` or `LoDTensor`, but received {type(value)}."
	`2879`	+ f"`value` should be `numpy.ndarray` or `DenseTensor`, but received {type(value)}."
`2880`	`2880`	`)`
`2881`	`2881`
`2882`	`2882`	`if scope is not None and not isinstance(scope, core._Scope):`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ def create_lod_tensor(data, recursive_seq_lens, place):`
`105`	`105`	`return tensor`
`106`	`106`	`else:`
`107`	`107`	`raise TypeError(`
`108`		`- "data should be either a LoDTensor, a Numpy array or a list"`
	`108`	`+ "data should be either a DenseTensor, a Numpy array or a list"`
`109`	`109`	`)`
`110`	`110`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ def handler_launch_func(self, scope, handler):`
`226`	`226`	`hold LoD information. \`
`227`	`227`	`They can not be completely cast \`
`228`	`228`	`to Python ndarray. We can \`
`229`		`- not return LoDTensor itself directly, \`
	`229`	`+ not return DenseTensor itself directly, \`
`230`	`230`	`please choose another targets"`
`231`	`231`	`)`
`232`	`232`	`if res_dict[user_name]._is_initialized():`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ def _check_param_dict(param_dict):`
`547`	`547`	`)`
`548`	`548`	`if not isinstance(value, paddle.base.DenseTensor):`
`549`	`549`	`raise TypeError(`
`550`		`- "The type of value of 'param_dict' should be 'LoDTensor', "`
	`550`	`+ "The type of value of 'param_dict' should be 'DenseTensor', "`
`551`	`551`	`f"but got '{type(value)}'."`
`552`	`552`	`)`
`553`	`553`	`return param_dict`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ def _unpack_saved_dict(saved_obj, protocol):`
`276`	`276`	`def set_value(var, value, scope=None):`
`277`	`277`	`if not (isinstance(value, np.ndarray) or hasattr(value, "__array__")):`
`278`	`278`	`raise TypeError(`
`279`		- f"`value` should be `numpy.ndarray` or `LoDTensor`, but received {type(value)}."
	`279`	+ f"`value` should be `numpy.ndarray` or `DenseTensor`, but received {type(value)}."
`280`	`280`	`)`
`281`	`281`
`282`	`282`	`if scope is not None and not isinstance(scope, core._Scope):`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ def tensor_share_external_data(self, data: Tensor) -> None:`
`84`	`84`	`)`
`85`	`85`	`else:`
`86`	`86`	`raise TypeError(`
`87`		`- "In share_external_data, we only support Tensor and LoDTensor."`
	`87`	`+ "In share_external_data, we only support Tensor and DenseTensor."`
`88`	`88`	`)`
`89`	`89`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -631,7 +631,7 @@ def convert_len(var):`
`631`	`631`	`return paddle.tensor.array_length(var)`
`632`	`632`	`else:`
`633`	`633`	`raise TypeError(`
`634`		`- f'len(var) only supports LoDTensor/DenseTensorArray/SelectedRows, but received {type(var)}.'`
	`634`	`+ f'len(var) only supports DenseTensor/DenseTensorArray/SelectedRows, but received {type(var)}.'`
`635`	`635`	`)`
`636`	`636`	`elif isinstance(var, Value):`
`637`	`637`	`if var.is_dense_tensor_type() or var.is_selected_row_type():`