From a548e70caf547195cc9ff9ee181cda24e59f4187 Mon Sep 17 00:00:00 2001
From: engineer1109 <jialiang.wang@xdxct.com>
Date: Wed, 1 Mar 2023 10:24:45 +0800
Subject: [PATCH] fix custom plugin include headers error (#51013)

---
 paddle/phi/core/tensor_utils.cc | 36 +++++++++++++++++++++++++++++++++
 paddle/phi/core/tensor_utils.h  | 36 +--------------------------------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/paddle/phi/core/tensor_utils.cc b/paddle/phi/core/tensor_utils.cc
index 7ba4cd55183..65b90c88085 100644
--- a/paddle/phi/core/tensor_utils.cc
+++ b/paddle/phi/core/tensor_utils.cc
@@ -912,4 +912,40 @@ template phi::dtype::complex<float> GetValue(const phi::DenseTensor* x);
 
 template phi::dtype::complex<double> GetValue(const phi::DenseTensor* x);
 
+template <typename T>
+std::vector<T> GetVectorFromTensor(const phi::DenseTensor* x) {
+  std::vector<T> vec_new_data;
+  if (phi::TransToProtoVarType(x->dtype()) == ProtoDataType::INT32) {
+    auto* data = x->data<int>();
+    phi::DenseTensor cpu_attr_tensor;
+    if (x->place().GetType() != phi::AllocationType::CPU) {
+      phi::DeviceContextPool& pool = phi::DeviceContextPool::Instance();
+      auto dev_ctx = pool.Get(x->place());
+      phi::Copy(*dev_ctx, *x, CPUPlace(), true, &cpu_attr_tensor);
+      data = cpu_attr_tensor.data<int>();
+    }
+    vec_new_data = std::vector<T>(data, data + x->numel());
+  } else if (phi::TransToProtoVarType(x->dtype()) == ProtoDataType::INT64) {
+    auto* data = x->data<int64_t>();
+    phi::DenseTensor cpu_attr_tensor;
+    if (x->place().GetType() != phi::AllocationType::CPU) {
+      phi::DeviceContextPool& pool = phi::DeviceContextPool::Instance();
+      auto dev_ctx = pool.Get(x->place());
+      phi::Copy(*dev_ctx, *x, CPUPlace(), true, &cpu_attr_tensor);
+      data = cpu_attr_tensor.data<int64_t>();
+    }
+    // NOTE: Converting int64 to int32 may cause data overflow.
+    vec_new_data = std::vector<T>(data, data + x->numel());
+  } else {
+    PADDLE_THROW(phi::errors::InvalidArgument(
+        "The dtype of Tensor must be int32 or int64, but received: %s",
+        phi::TransToProtoVarType(x->dtype())));
+  }
+  return vec_new_data;
+}
+
+template std::vector<int32_t> GetVectorFromTensor(const phi::DenseTensor* x);
+
+template std::vector<int64_t> GetVectorFromTensor(const phi::DenseTensor* x);
+
 }  // namespace phi
diff --git a/paddle/phi/core/tensor_utils.h b/paddle/phi/core/tensor_utils.h
index 92036219319..e122cdb9546 100644
--- a/paddle/phi/core/tensor_utils.h
+++ b/paddle/phi/core/tensor_utils.h
@@ -14,17 +14,12 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/phi/backends/all_context.h"
-#include "paddle/phi/backends/cpu/cpu_context.h"
-#include "paddle/phi/common/place.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/device_context.h"
 #include "paddle/phi/core/selected_rows.h"
 #include "paddle/phi/core/sparse_coo_tensor.h"
 #include "paddle/phi/core/sparse_csr_tensor.h"
 #include "paddle/phi/core/tensor_meta.h"
-#include "paddle/phi/core/utils/data_type.h"
-
 namespace phi {
 
 class DenseTensorUtils {
@@ -149,35 +144,6 @@ inline T GetValue(const Context& dev_ctx, const DenseTensor& x) {
 }
 
 template <typename T = int32_t>
-inline std::vector<T> GetVectorFromTensor(const phi::DenseTensor* x) {
-  std::vector<T> vec_new_data;
-  if (phi::TransToProtoVarType(x->dtype()) == ProtoDataType::INT32) {
-    auto* data = x->data<int>();
-    phi::DenseTensor cpu_attr_tensor;
-    if (!paddle::platform::is_cpu_place(x->place())) {
-      phi::DeviceContextPool& pool = phi::DeviceContextPool::Instance();
-      auto dev_ctx = pool.Get(x->place());
-      phi::Copy(*dev_ctx, *x, CPUPlace(), true, &cpu_attr_tensor);
-      data = cpu_attr_tensor.data<int>();
-    }
-    vec_new_data = std::vector<T>(data, data + x->numel());
-  } else if (phi::TransToProtoVarType(x->dtype()) == ProtoDataType::INT64) {
-    auto* data = x->data<int64_t>();
-    phi::DenseTensor cpu_attr_tensor;
-    if (!paddle::platform::is_cpu_place(x->place())) {
-      phi::DeviceContextPool& pool = phi::DeviceContextPool::Instance();
-      auto dev_ctx = pool.Get(x->place());
-      phi::Copy(*dev_ctx, *x, CPUPlace(), true, &cpu_attr_tensor);
-      data = cpu_attr_tensor.data<int64_t>();
-    }
-    // NOTE: Converting int64 to int32 may cause data overflow.
-    vec_new_data = std::vector<T>(data, data + x->numel());
-  } else {
-    PADDLE_THROW(phi::errors::InvalidArgument(
-        "The dtype of Tensor must be int32 or int64, but received: %s",
-        phi::TransToProtoVarType(x->dtype())));
-  }
-  return vec_new_data;
-}
+std::vector<T> GetVectorFromTensor(const phi::DenseTensor* x);
 
 }  // namespace phi
-- 
GitLab