[Lod][fluid_ops] data_transform.cc (#69702)

co63oc · web-flow · commit 0780ed14e33e · 2024-11-26T17:04:52.000+08:00
diff --git a/paddle/fluid/framework/data_transform.cc b/paddle/fluid/framework/data_transform.cc
@@ -137,14 +137,14 @@ void SetTensorToVariable(const Variable &in_var,
                          const phi::DenseTensor &tensor,
                          Variable *out_var) {
   if (in_var.IsType<phi::DenseTensor>()) {
-    auto &in_lod_tensor = in_var.Get<phi::DenseTensor>();
-    auto *tran_lod_tensor = out_var->GetMutable<phi::DenseTensor>();
-    tran_lod_tensor->set_lod(in_lod_tensor.lod());
-    tran_lod_tensor->set_layout(in_lod_tensor.layout());
+    auto &in_dense_tensor = in_var.Get<phi::DenseTensor>();
+    auto *tran_dense_tensor = out_var->GetMutable<phi::DenseTensor>();
+    tran_dense_tensor->set_lod(in_dense_tensor.lod());
+    tran_dense_tensor->set_layout(in_dense_tensor.layout());
 #ifdef PADDLE_WITH_DNNL
-    tran_lod_tensor->set_mem_desc(in_lod_tensor.mem_desc());
+    tran_dense_tensor->set_mem_desc(in_dense_tensor.mem_desc());
 #endif
-    tran_lod_tensor->ShareDataWith(tensor);
+    tran_dense_tensor->ShareDataWith(tensor);
   } else if (in_var.IsType<phi::SelectedRows>()) {
     auto &in_selected_rows = in_var.Get<phi::SelectedRows>();
     auto *trans_selected_rows = out_var->GetMutable<phi::SelectedRows>();
diff --git a/paddle/fluid/framework/executor_gc_helper.cc b/paddle/fluid/framework/executor_gc_helper.cc
@@ -194,13 +194,13 @@ void DeleteUnusedTensors(const Scope &scope,
                                 ->mutable_value()
                                 ->MoveMemoryHolder());
     } else if (var->IsType<phi::TensorArray>()) {
-      auto *lod_tensor_arr = var->GetMutable<phi::TensorArray>();
-      for (auto &t : *lod_tensor_arr) {
+      auto *dense_tensor_arr = var->GetMutable<phi::TensorArray>();
+      for (auto &t : *dense_tensor_arr) {
         garbages.emplace_back(t.MoveMemoryHolder());
       }
-      // NOTE(wangxi): need clear the vector, otherwise lod_tensor_arr.size() is
-      // wrong, if size() decrease in next step, an error maybe occur.
-      lod_tensor_arr->clear();
+      // NOTE(wangxi): need clear the vector, otherwise dense_tensor_arr.size()
+      // is wrong, if size() decrease in next step, an error maybe occur.
+      dense_tensor_arr->clear();
     } else if (var->IsType<Strings>()) {
     } else {
       PADDLE_THROW(common::errors::Unimplemented(
diff --git a/paddle/fluid/framework/new_executor/instruction/control_flow/select_input_instruction.cc b/paddle/fluid/framework/new_executor/instruction/control_flow/select_input_instruction.cc
@@ -79,9 +79,9 @@ class AssignFunctor {
  public:
   explicit AssignFunctor(Variable *out) : out_(out) {}
 
-  void operator()(const phi::DenseTensor &lod_tensor) const {
+  void operator()(const phi::DenseTensor &dense_tensor) const {
     auto &out_tensor = *out_->GetMutable<phi::DenseTensor>();
-    copy_tensor(lod_tensor, &out_tensor);
+    copy_tensor(dense_tensor, &out_tensor);
   }
 
   void operator()(const phi::TensorArray &array) const {
@@ -111,12 +111,12 @@ class AssignFunctor {
   }
 
  private:
-  void copy_tensor(const phi::DenseTensor &lod_tensor,
+  void copy_tensor(const phi::DenseTensor &dense_tensor,
                    phi::DenseTensor *out) const {
-    if (!lod_tensor.IsInitialized()) return;
+    if (!dense_tensor.IsInitialized()) return;
     auto &out_tensor = *out;
-    TensorCopy(lod_tensor, lod_tensor.place(), &out_tensor);
-    out_tensor.set_lod(lod_tensor.lod());
+    TensorCopy(dense_tensor, dense_tensor.place(), &out_tensor);
+    out_tensor.set_lod(dense_tensor.lod());
   }
 
   Variable *out_;
diff --git a/paddle/fluid/framework/new_executor/instruction/control_flow/select_output_instruction.cc b/paddle/fluid/framework/new_executor/instruction/control_flow/select_output_instruction.cc
@@ -78,9 +78,9 @@ class AssignFunctor {
  public:
   explicit AssignFunctor(Variable *out) : out_(out) {}
 
-  void operator()(const phi::DenseTensor &lod_tensor) const {
+  void operator()(const phi::DenseTensor &dense_tensor) const {
     auto &out_tensor = *out_->GetMutable<phi::DenseTensor>();
-    copy_tensor(lod_tensor, &out_tensor);
+    copy_tensor(dense_tensor, &out_tensor);
   }
 
   void operator()(const phi::TensorArray &array) const {
@@ -110,12 +110,12 @@ class AssignFunctor {
   }
 
  private:
-  void copy_tensor(const phi::DenseTensor &lod_tensor,
+  void copy_tensor(const phi::DenseTensor &dense_tensor,
                    phi::DenseTensor *out) const {
-    if (!lod_tensor.IsInitialized()) return;
+    if (!dense_tensor.IsInitialized()) return;
     auto &out_tensor = *out;
-    TensorCopy(lod_tensor, lod_tensor.place(), &out_tensor);
-    out_tensor.set_lod(lod_tensor.lod());
+    TensorCopy(dense_tensor, dense_tensor.place(), &out_tensor);
+    out_tensor.set_lod(dense_tensor.lod());
   }
 
   Variable *out_;
diff --git a/paddle/fluid/framework/new_executor/pir_interpreter.cc b/paddle/fluid/framework/new_executor/pir_interpreter.cc
@@ -482,8 +482,8 @@ void PirInterpreter::ClearLoDTensorArrayInLocalScope() {
   auto vars = local_scope_->LocalVars();
   for (auto var : vars) {
     if (var->IsType<phi::TensorArray>()) {
-      auto* lod_tensor_arr = var->GetMutable<phi::TensorArray>();
-      lod_tensor_arr->clear();
+      auto* dense_tensor_arr = var->GetMutable<phi::TensorArray>();
+      dense_tensor_arr->clear();
     }
   }
 }
diff --git a/paddle/fluid/framework/new_executor/program_interpreter.cc b/paddle/fluid/framework/new_executor/program_interpreter.cc
@@ -674,8 +674,8 @@ void ProgramInterpreter::ClearLoDTensorArrayInLocalScope() {
   auto vars = local_scope_->LocalVars();
   for (auto var : vars) {
     if (var->IsType<phi::TensorArray>()) {
-      auto* lod_tensor_arr = var->GetMutable<phi::TensorArray>();
-      lod_tensor_arr->clear();
+      auto* dense_tensor_arr = var->GetMutable<phi::TensorArray>();
+      dense_tensor_arr->clear();
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -482,8 +482,8 @@ void PirInterpreter::ClearLoDTensorArrayInLocalScope() {`
`482`	`482`	`auto vars = local_scope_->LocalVars();`
`483`	`483`	`for (auto var : vars) {`
`484`	`484`	`if (var->IsType<phi::TensorArray>()) {`
`485`		`- auto* lod_tensor_arr = var->GetMutable<phi::TensorArray>();`
`486`		`- lod_tensor_arr->clear();`
	`485`	`+ auto* dense_tensor_arr = var->GetMutable<phi::TensorArray>();`
	`486`	`+ dense_tensor_arr->clear();`
`487`	`487`	`}`
`488`	`488`	`}`
`489`	`489`	`}`
Original file line number	Diff line number	Diff line change
`@@ -674,8 +674,8 @@ void ProgramInterpreter::ClearLoDTensorArrayInLocalScope() {`
`674`	`674`	`auto vars = local_scope_->LocalVars();`
`675`	`675`	`for (auto var : vars) {`
`676`	`676`	`if (var->IsType<phi::TensorArray>()) {`
`677`		`- auto* lod_tensor_arr = var->GetMutable<phi::TensorArray>();`
`678`		`- lod_tensor_arr->clear();`
	`677`	`+ auto* dense_tensor_arr = var->GetMutable<phi::TensorArray>();`
	`678`	`+ dense_tensor_arr->clear();`
`679`	`679`	`}`
`680`	`680`	`}`
`681`	`681`	`}`