[PIR] Fix Deepcopy: new-push_back (#60879)

chen2016013 · Aurelius84 · web-flow · commit f3d2cbca7fc1 · 2024-01-18T10:43:59.000+08:00
* fix deepcopy

* Apply suggestions from code review

Co-authored-by: Aurelius84 &lt;zhangliujie@baidu.com&gt;

* Update tuple_pop_instruction.cc

* Update pir_adaptor_util.cc


---------

Co-authored-by: Aurelius84 &lt;zhangliujie@baidu.com&gt;
diff --git a/paddle/fluid/framework/new_executor/instruction/control_flow/tuple_pop_instruction.cc b/paddle/fluid/framework/new_executor/instruction/control_flow/tuple_pop_instruction.cc
@@ -96,15 +96,14 @@ void ShareVarData(const Variable* src_var, Variable* dst_var) {
     auto src_tensor_array = src_var->Get<phi::TensorArray>();
     auto* dst_tensor_array = dst_var->GetMutable<phi::TensorArray>();
     if (src_tensor_array.size() == 0) return;
-    dst_tensor_array->clear();
-    for (auto src_tensor : src_tensor_array) {
-      phi::DenseTensor* tmp_dst_tensor = new phi::DenseTensor();
-      if (src_tensor.numel() == 0) {
-        tmp_dst_tensor->set_meta(src_tensor.meta());
+    dst_tensor_array->resize(src_tensor_array.size());
+    for (size_t i = 0; i < src_tensor_array.size(); ++i) {
+      phi::DenseTensor& tmp_dst_tensor = dst_tensor_array->at(i);
+      if (src_tensor_array.at(i).numel() == 0) {
+        tmp_dst_tensor.set_meta(src_tensor_array.at(i).meta());
       } else {
-        tmp_dst_tensor->ShareDataWith(src_tensor);
+        tmp_dst_tensor.ShareDataWith(src_tensor_array.at(i));
       }
-      dst_tensor_array->push_back(*tmp_dst_tensor);
     }
   } else if (src_var->IsType<VariableRefArray>()) {
     auto src_var_array = src_var->Get<VariableRefArray>();
diff --git a/paddle/fluid/framework/new_executor/pir_adaptor/pir_adaptor_util.cc b/paddle/fluid/framework/new_executor/pir_adaptor/pir_adaptor_util.cc
@@ -354,15 +354,16 @@ void DeepCopyVariable(const Variable* src_var,
             "TensorArray shouldn't be null"));
       }
     }
-    dst_tensor_array->clear();
-    for (auto src_tensor : src_tensor_array) {
-      phi::DenseTensor* tmp_dst_tensor = new phi::DenseTensor();
-      if (src_tensor.numel() == 0) {
-        tmp_dst_tensor->set_meta(src_tensor.meta());
+    dst_tensor_array->resize(src_tensor_array.size());
+    for (size_t i = 0; i < src_tensor_array.size(); ++i) {
+      phi::DenseTensor& tmp_dst_tensor = dst_tensor_array->at(i);
+      if (src_tensor_array.at(i).numel() == 0) {
+        tmp_dst_tensor.set_meta(src_tensor_array.at(i).meta());
         continue;
       }
-      framework::TensorCopy(src_tensor, src_tensor.place(), tmp_dst_tensor);
-      dst_tensor_array->push_back(*tmp_dst_tensor);
+      framework::TensorCopy(src_tensor_array.at(i),
+                            src_tensor_array.at(i).place(),
+                            &tmp_dst_tensor);
     }
   } else if (src_var->IsType<VariableRefArray>()) {
     auto src_ref_array = src_var->Get<VariableRefArray>();

Original file line number	Diff line number	Diff line change
`@@ -354,15 +354,16 @@ void DeepCopyVariable(const Variable* src_var,`
`354`	`354`	`"TensorArray shouldn't be null"));`
`355`	`355`	`}`
`356`	`356`	`}`
`357`		`- dst_tensor_array->clear();`
`358`		`- for (auto src_tensor : src_tensor_array) {`
`359`		`- phi::DenseTensor* tmp_dst_tensor = new phi::DenseTensor();`
`360`		`- if (src_tensor.numel() == 0) {`
`361`		`- tmp_dst_tensor->set_meta(src_tensor.meta());`
	`357`	`+ dst_tensor_array->resize(src_tensor_array.size());`
	`358`	`+ for (size_t i = 0; i < src_tensor_array.size(); ++i) {`
	`359`	`+ phi::DenseTensor& tmp_dst_tensor = dst_tensor_array->at(i);`
	`360`	`+ if (src_tensor_array.at(i).numel() == 0) {`
	`361`	`+ tmp_dst_tensor.set_meta(src_tensor_array.at(i).meta());`
`362`	`362`	`continue;`
`363`	`363`	`}`
`364`		`- framework::TensorCopy(src_tensor, src_tensor.place(), tmp_dst_tensor);`
`365`		`- dst_tensor_array->push_back(*tmp_dst_tensor);`
	`364`	`+ framework::TensorCopy(src_tensor_array.at(i),`
	`365`	`+ src_tensor_array.at(i).place(),`
	`366`	`+ &tmp_dst_tensor);`
`366`	`367`	`}`
`367`	`368`	`} else if (src_var->IsType<VariableRefArray>()) {`
`368`	`369`	`auto src_ref_array = src_var->Get<VariableRefArray>();`