Fix (#70015)

PaddlePaddle · Dec 9, 2024 · 84fff6c · 84fff6c
1 parent d6b74b7
commit 84fff6c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 16 deletions.
diff --git a/paddle/fluid/pybind/eager.cc b/paddle/fluid/pybind/eager.cc
@@ -106,7 +106,7 @@ void EmptyTensorInitializer(TensorObject* self,
   } else {
     VLOG(6) << "in EmptyTensorInitializer, create DenseTensor";
     if (var_type == paddle::framework::proto::VarType::DENSE_TENSOR) {
-      // TODO(jiabin): Maybe support LOD later
+      // TODO(jiabin): Maybe support LegacyLoD later
       std::shared_ptr<phi::DenseTensor> dense_tensor = nullptr;
       if (dims.size() == 1 && dims[0] == 0) {
         std::shared_ptr<phi::Allocation> allocation_ptr = nullptr;

diff --git a/paddle/fluid/pybind/eager_utils.cc b/paddle/fluid/pybind/eager_utils.cc
@@ -1914,7 +1914,7 @@ paddle::Tensor CreateTensorFromVarDesc(
   autograd_meta->SetStopGradient(var_desc.StopGradient());
 
   if (var_type == paddle::framework::proto::VarType::DENSE_TENSOR) {
-    // TODO(jiabin): Maybe support LOD later
+    // TODO(jiabin): Maybe support LegacyLoD later
     std::shared_ptr<phi::DenseTensor> dense_tensor = nullptr;
     if (dims.size() == 1 && dims[0] == 0) {
       std::shared_ptr<phi::Allocation> allocation_ptr = nullptr;
@@ -1998,7 +1998,7 @@ paddle::Tensor CreateTensorFromValue(const pir::Value& value) {
   autograd_meta->SetStopGradient(GetValueBoolAttr(value, kAttrStopGradients));
 
   if (value.type().isa<paddle::dialect::DenseTensorType>()) {
-    // TODO(jiabin): Maybe support LOD later
+    // TODO(jiabin): Maybe support LegacyLoD later
     std::shared_ptr<phi::DenseTensor> dense_tensor = nullptr;
     auto dtype = paddle::dialect::TransToPhiDataType(
         value.type().dyn_cast<paddle::dialect::DenseTensorType>().dtype());

diff --git a/paddle/fluid/pybind/protobuf.cc b/paddle/fluid/pybind/protobuf.cc
@@ -306,7 +306,6 @@ void BindVarDesc(pybind11::module *m) {
       .value("FEED_MINIBATCH", pd::proto::VarType::FEED_MINIBATCH)
       .value("FETCH_LIST", pd::proto::VarType::FETCH_LIST)
       .value("STEP_SCOPES", pd::proto::VarType::STEP_SCOPES)
-      .value("LOD_RANK_TABLE", pd::proto::VarType::LOD_RANK_TABLE)
       .value("DENSE_TENSOR_ARRAY", pd::proto::VarType::DENSE_TENSOR_ARRAY)
       .value("PLACE_LIST", pd::proto::VarType::PLACE_LIST)
       .value("READER", pd::proto::VarType::READER)

diff --git a/paddle/fluid/pybind/reader_py.cc b/paddle/fluid/pybind/reader_py.cc
@@ -425,11 +425,11 @@ void BindReader(py::module *module) {
         });
 
   m.def(
-      "init_lod_tensor_blocking_queue",
+      "init_dense_tensor_blocking_queue",
       [](framework::Variable &var,
          size_t capacity,
          bool is_ordered) -> py::object {
-        VLOG(1) << "init_lod_tensor_blocking_queue";
+        VLOG(1) << "init_dense_tensor_blocking_queue";
         if (is_ordered) {
           auto *holder = var.GetMutable<
               reader::OrderedMultiDeviceDenseTensorBlockingQueueHolder>();

diff --git a/paddle/fluid/pybind/tensor.cc b/paddle/fluid/pybind/tensor.cc
@@ -507,11 +507,9 @@ void BindTensor(pybind11::module &m) {  // NOLINT
         return std::make_unique<phi::DenseTensor>(new_offset_lod);
       }))
       .def(py::init([]() { return std::make_unique<phi::DenseTensor>(); }))
-      // We implement offset based LOD in C++ while we use length based with
-      // Python API. So we changed set_lod to set_recursive_sequence_lengths
-      // to
-      // avoid misuse.
-      // The discussion is here:
+      // We implement offset based LegacyLoD in C++ while we use length based
+      // with Python API. So we changed set_lod to
+      // set_recursive_sequence_lengths to avoid misuse. The discussion is here:
       // https://github.com/PaddlePaddle/Paddle/issues/10855
       .def(
           "set_lod",

diff --git a/python/paddle/base/reader.py b/python/paddle/base/reader.py
@@ -590,7 +590,7 @@ def _init_iterable(self):
         self._shapes = []
         self._dtypes = []
         self._need_check_feed = []
-        self._blocking_queue = core.init_lod_tensor_blocking_queue(
+        self._blocking_queue = core.init_dense_tensor_blocking_queue(
             core.Variable(), self._capacity, False
         )
         self._reader = None
@@ -854,7 +854,7 @@ def _init_iterable(self):
             self._need_check_feed = [
                 v.desc.need_check_feed() for v in self._feed_list
             ]
-        self._queue = core.init_lod_tensor_blocking_queue(
+        self._queue = core.init_dense_tensor_blocking_queue(
             core.Variable(), self._capacity, self._keep_order
         )
         self._reader = None
@@ -898,7 +898,7 @@ def _init_non_iterable(self):
         double_buffer_name = data_loader_unique_name_generator('double_buffer')
 
         var = global_scope().var(queue_name)
-        self._queue = core.init_lod_tensor_blocking_queue(
+        self._queue = core.init_dense_tensor_blocking_queue(
             var, self._capacity, self._keep_order
         )
 

diff --git a/python/paddle/io/dataloader/dataloader_iter.py b/python/paddle/io/dataloader/dataloader_iter.py
@@ -203,7 +203,7 @@ def _init_thread(self):
             ]
             self._dtypes = [v.dtype for v in self._feed_list]
         # if only 1 place, do not need to keep order
-        self._blocking_queue = core.init_lod_tensor_blocking_queue(
+        self._blocking_queue = core.init_dense_tensor_blocking_queue(
             core.Variable(),
             self._blocking_queue_capacity,
             len(self._places) > 1,
@@ -507,7 +507,7 @@ def _init_thread(self):
             ]
             self._dtypes = [v.dtype for v in self._feed_list]
         # if only 1 place, do not need to keep order
-        self._blocking_queue = core.init_lod_tensor_blocking_queue(
+        self._blocking_queue = core.init_dense_tensor_blocking_queue(
             core.Variable(), self._outstanding_capacity, len(self._places) > 1
         )
         core._set_max_memory_map_allocation_pool_size(