Replace framework::TensorCopy phi::Copy (#64131)

co63oc · web-flow · commit 1f751d43ca0f · 2024-05-10T11:15:15.000+08:00
* Fix

* Fix
diff --git a/paddle/fluid/operators/array_operator.h b/paddle/fluid/operators/array_operator.h
@@ -54,7 +54,7 @@ class ArrayOp : public framework::OperatorBase {
         platform::is_custom_place(i_tensor.place())) {
       // FIXME: Avoid copy from GPU to CPU
       phi::DenseTensor t;
-      framework::TensorCopy(i_tensor, platform::CPUPlace(), dev_ctx, &t);
+      phi::Copy(dev_ctx, i_tensor, phi::CPUPlace(), false, &t);
       dev_ctx.Wait();
       offset = static_cast<size_t>(*t.data<int64_t>());
     } else {
diff --git a/paddle/fluid/operators/detection/collect_fpn_proposals_op.cu b/paddle/fluid/operators/detection/collect_fpn_proposals_op.cu
@@ -130,8 +130,11 @@ class GPUCollectFpnProposalsOpKernel : public framework::OpKernel<T> {
 
     // copy batch id list to GPU
     phi::DenseTensor roi_batch_id_list_gpu;
-    framework::TensorCopy(
-        roi_batch_id_list, dev_ctx.GetPlace(), &roi_batch_id_list_gpu);
+    phi::Copy(dev_ctx,
+              roi_batch_id_list,
+              dev_ctx.GetPlace(),
+              false,
+              &roi_batch_id_list_gpu);
 
     phi::DenseTensor index_in_t;
     int* idx_in =
diff --git a/paddle/fluid/operators/expand_op.h b/paddle/fluid/operators/expand_op.h
@@ -217,8 +217,8 @@ class ExpandGradKernel : public framework::OpKernel<T> {
       auto* out0 =
           context.Output<phi::DenseTensor>(framework::GradVarName("X"));
       out0->mutable_data<T>(context.GetPlace());
-      framework::TensorCopy(
-          *in0, context.GetPlace(), context.device_context(), out0);
+      phi::Copy(
+          context.device_context(), *in0, context.GetPlace(), false, out0);
     } else {
       PADDLE_ENFORCE_GE(dims,
                         1,
diff --git a/paddle/fluid/operators/get_tensor_from_selected_rows_op.cc b/paddle/fluid/operators/get_tensor_from_selected_rows_op.cc
@@ -63,8 +63,7 @@ class GetTensorFromSelectedRowsKernel {
 
     out->Resize(x->value().dims());
     out->mutable_data(ctx.GetPlace(), x->value().type());
-    framework::TensorCopy(
-        x->value(), ctx.GetPlace(), ctx.device_context(), out);
+    phi::Copy(ctx.device_context(), x->value(), ctx.GetPlace(), false, out);
   }
 };
 
diff --git a/paddle/fluid/operators/squeeze_op.h b/paddle/fluid/operators/squeeze_op.h
@@ -101,11 +101,11 @@ class Squeeze2Kernel : public framework::OpKernel<T> {
     auto out_dims = GetOutputShape(axes, x_dims, true);
 
     out->mutable_data(context.GetPlace(), in->type());
-    framework::TensorCopy(
-        *in,
-        context.GetPlace(),
-        context.template device_context<platform::DeviceContext>(),
-        out);
+    phi::Copy(context.template device_context<platform::DeviceContext>(),
+              *in,
+              context.GetPlace(),
+              false,
+              out);
     out->Resize(out_dims);
   }
 };
diff --git a/paddle/fluid/operators/tensorrt/tensorrt_engine_op.h b/paddle/fluid/operators/tensorrt/tensorrt_engine_op.h
@@ -550,7 +550,7 @@ class TensorRTEngineOp : public framework::OperatorBase {
       // check the input_tensor
       if (!platform::is_gpu_place(t.place())) {
         phi::DenseTensor out;
-        framework::TensorCopy(t, dev_place, dev_ctx, &out);
+        phi::Copy(dev_ctx, t, dev_place, false, &out);
         t.ShareDataWith(out);
       }
       auto t_shape = common::vectorize<int64_t>(t.dims());
@@ -855,7 +855,7 @@ class TensorRTEngineOp : public framework::OperatorBase {
         auto int32_tensor = scope.FindVar(y_t)->GetMutable<phi::DenseTensor>();
         int32_tensor->Resize(fluid_t->dims());
         dev_ctx.Alloc<int32_t>(int32_tensor);
-        framework::TensorCopy(*fluid_t, dev_place, dev_ctx, int32_tensor);
+        phi::Copy(dev_ctx, *fluid_t, dev_place, false, int32_tensor);
         *fluid_t = phi::Cast<int32_t>(
             reinterpret_cast<const phi::GPUContext &>(dev_ctx),
             *int32_tensor,
@@ -871,7 +871,7 @@ class TensorRTEngineOp : public framework::OperatorBase {
         auto fp32_tensor = scope.FindVar(y_t)->GetMutable<phi::DenseTensor>();
         fp32_tensor->Resize(fluid_t->dims());
         dev_ctx.Alloc<float>(fp32_tensor);
-        framework::TensorCopy(*fluid_t, dev_place, dev_ctx, fp32_tensor);
+        phi::Copy(dev_ctx, *fluid_t, dev_place, false, fp32_tensor);
         *fluid_t =
             phi::Cast<float>(reinterpret_cast<const phi::GPUContext &>(dev_ctx),
                              *fp32_tensor,

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,7 @@ class GetTensorFromSelectedRowsKernel {`
`63`	`63`
`64`	`64`	`out->Resize(x->value().dims());`
`65`	`65`	`out->mutable_data(ctx.GetPlace(), x->value().type());`
`66`		`- framework::TensorCopy(`
`67`		`- x->value(), ctx.GetPlace(), ctx.device_context(), out);`
	`66`	`+ phi::Copy(ctx.device_context(), x->value(), ctx.GetPlace(), false, out);`
`68`	`67`	`}`
`69`	`68`	`};`
`70`	`69`