Fixed merge issues

Author: jim19930609

paddle/fluid/inference/lite/test_tensor_utils.cc

@@ -122,7 +122,7 @@ void test_tensor_copy(const platform::DeviceContext& ctx) {
   }
 #endif
   std::vector<float> result;
-  TensorToVector(lod_tensor_n, ctx, &result);
+  paddle::framework::TensorToVector(lod_tensor_n, ctx, &result);
   ASSERT_EQ(result, vector);
   ASSERT_EQ(lod_tensor_n.lod(), lod_tensor.lod());
 }
@@ -142,7 +142,7 @@ void test_tensor_share(const platform::DeviceContext& ctx) {
   framework::LoDTensor lod_tensor_n;
   TensorCopyAsync(&lod_tensor_n, lite_api_tensor, ctx);
   std::vector<float> result;
-  TensorToVector(lod_tensor_n, ctx, &result);
+  paddle::framework::TensorToVector(lod_tensor_n, ctx, &result);
   ASSERT_EQ(result, vector);
   ASSERT_EQ(lod_tensor_n.lod(), lod_tensor.lod());
 }

paddle/fluid/platform/device/npu/npu_op_runner.cc

@@ -231,7 +231,7 @@ NpuOpRunner &NpuOpRunner::AddInput(std::vector<int32_t> &&dims) {
   auto *dev_ctx =
       static_cast<platform::CPUDeviceContext *>(pool.Get(platform::CPUPlace()));
   Tensor host_tensor;
-  TensorFromVector(dims, *dev_ctx, &host_tensor);
+  paddle::framework::TensorFromVector(dims, *dev_ctx, &host_tensor);
   host_tensors_.emplace_back(host_tensor);
 
   // create aclTensorDesc
@@ -247,7 +247,7 @@ NpuOpRunner &NpuOpRunner::AddInput(std::vector<int64_t> &&dims) {
   auto *dev_ctx =
       static_cast<platform::CPUDeviceContext *>(pool.Get(platform::CPUPlace()));
   Tensor host_tensor;
-  TensorFromVector(dims, *dev_ctx, &host_tensor);
+  paddle::framework::TensorFromVector(dims, *dev_ctx, &host_tensor);
   host_tensors_.emplace_back(host_tensor);
 
   // create aclTensorDesc
@@ -263,7 +263,7 @@ NpuOpRunner &NpuOpRunner::AddInput(std::vector<float> &&values) {
   auto *dev_ctx =
       static_cast<platform::CPUDeviceContext *>(pool.Get(platform::CPUPlace()));
   Tensor host_tensor;
-  TensorFromVector(values, *dev_ctx, &host_tensor);
+  paddle::framework::TensorFromVector(values, *dev_ctx, &host_tensor);
   host_tensors_.emplace_back(host_tensor);
 
   // create aclTensorDesc
@@ -279,7 +279,7 @@ NpuOpRunner &NpuOpRunner::AddInput(std::vector<double> &&values) {
   auto *dev_ctx =
       static_cast<platform::CPUDeviceContext *>(pool.Get(platform::CPUPlace()));
   Tensor host_tensor;
-  TensorFromVector(values, *dev_ctx, &host_tensor);
+  paddle::framework::TensorFromVector(values, *dev_ctx, &host_tensor);
   host_tensors_.emplace_back(host_tensor);
 
   // create aclTensorDesc

paddle/pten/kernels/gpu/elementwise.h

@@ -854,7 +854,7 @@ void LaunchElementwiseCudaKernel(const KPDevice &ctx,
     dims_size.emplace_back(in->dims().size());
   }
   if (no_broadcast_flag) {
-    ptem::LaunchSameDimsElementwiseCudaKernel<ET, InT, OutT, Functor, NumOuts>(
+    pten::LaunchSameDimsElementwiseCudaKernel<ET, InT, OutT, Functor, NumOuts>(
         ctx, ins, outs, func);
   } else {
     axis = axis == -1