Fix (#65863)

co63oc · web-flow · commit 495a0a34cdd4 · 2024-07-10T14:26:02.000+08:00
diff --git a/paddle/fluid/inference/api/analysis_predictor.cc b/paddle/fluid/inference/api/analysis_predictor.cc
@@ -296,22 +296,22 @@ bool PaddleTensorToDenseTensor(const PaddleTensor &pt,
             "The data contained in the input PaddleTensor had wrong length."));
   }
 
-  if (platform::is_cpu_place(place)) {
+  if (phi::is_cpu_place(place)) {
     // TODO(panyx0718): Init LoDTensor from existing memcpy to save a copy.
     if (input_ptr != nullptr) {
       std::memcpy(
           static_cast<void *>(input_ptr), pt.data.data(), pt.data.length());
     }
-  } else if (platform::is_ipu_place(place)) {
+  } else if (phi::is_ipu_place(place)) {
 #ifdef PADDLE_WITH_IPU
     std::memcpy(
         static_cast<void *>(input_ptr), pt.data.data(), pt.data.length());
 #else
     PADDLE_THROW(paddle::platform::errors::Fatal(
         "Not compile with WITH_IPU, should not reach here."));
 #endif
-  } else if (platform::is_gpu_place(place)) {
-    PADDLE_ENFORCE_EQ(platform::is_xpu_place(place),
+  } else if (phi::is_gpu_place(place)) {
+    PADDLE_ENFORCE_EQ(phi::is_xpu_place(place),
                       false,
                       platform::errors::InvalidArgument(
                           "Only one choice can be made between CPU and XPU."));
@@ -329,7 +329,7 @@ bool PaddleTensorToDenseTensor(const PaddleTensor &pt,
     PADDLE_THROW(paddle::platform::errors::Fatal(
         "Not compile with CUDA, should not reach here."));
 #endif
-  } else if (platform::is_xpu_place(place)) {
+  } else if (phi::is_xpu_place(place)) {
 #ifdef PADDLE_WITH_XPU
     auto dst_xpu_place = place;
     memory::Copy(dst_xpu_place,
@@ -341,7 +341,7 @@ bool PaddleTensorToDenseTensor(const PaddleTensor &pt,
     PADDLE_THROW(paddle::platform::errors::Fatal(
         "Not compile with XPU, should not reach here."));
 #endif
-  } else if (platform::is_custom_place(place)) {
+  } else if (phi::is_custom_place(place)) {
 #ifdef PADDLE_WITH_CUSTOM_DEVICE
     paddle::platform::DeviceContextPool &pool =
         paddle::platform::DeviceContextPool::Instance();
@@ -2606,16 +2606,16 @@ std::unique_ptr<ZeroCopyTensor> AnalysisPredictor::GetInputTensor(
       static_cast<void *>(scope), this->GetDeviceContexts()));
   res->input_or_output_ = true;
   res->SetName(name);
-  if (platform::is_cpu_place(place_)) {  // NOLINT
+  if (phi::is_cpu_place(place_)) {  // NOLINT
     res->SetPlace(PaddlePlace::kCPU);
-  } else if (platform::is_ipu_place(place_)) {
+  } else if (phi::is_ipu_place(place_)) {
     // Currently, IPUPlace's tensor copy between cpu and ipu has been set in
     // IpuBackend.
     res->SetPlace(PaddlePlace::kCPU);
-  } else if (platform::is_xpu_place(place_)) {
+  } else if (phi::is_xpu_place(place_)) {
     auto xpu_place = place_;
     res->SetPlace(PaddlePlace::kXPU, xpu_place.GetDeviceId());
-  } else if (platform::is_custom_place(place_)) {
+  } else if (phi::is_custom_place(place_)) {
     auto custom_place = place_;
     res->SetPlace(PaddlePlace::kCUSTOM,
                   custom_place.GetDeviceId(),
@@ -2648,16 +2648,16 @@ std::unique_ptr<ZeroCopyTensor> AnalysisPredictor::GetOutputTensor(
       static_cast<void *>(scope), this->GetDeviceContexts()));
   res->input_or_output_ = false;
   res->SetName(name);
-  if (platform::is_cpu_place(place_)) {  // NOLINT
+  if (phi::is_cpu_place(place_)) {  // NOLINT
     res->SetPlace(PaddlePlace::kCPU);
-  } else if (platform::is_ipu_place(place_)) {
+  } else if (phi::is_ipu_place(place_)) {
     // Currently, IPUPlace's tensor copy between cpu and ipu has been set in
     // IpuBackend.
     res->SetPlace(PaddlePlace::kCPU);
-  } else if (platform::is_xpu_place(place_)) {
+  } else if (phi::is_xpu_place(place_)) {
     auto xpu_place = place_;
     res->SetPlace(PaddlePlace::kXPU, xpu_place.GetDeviceId());
-  } else if (platform::is_custom_place(place_)) {
+  } else if (phi::is_custom_place(place_)) {
     auto custom_place = place_;
     res->SetPlace(PaddlePlace::kCUSTOM,
                   custom_place.GetDeviceId(),
@@ -2870,7 +2870,7 @@ void AnalysisPredictor::HookCollectShapeRangeInfo() {
         is_shape_tensor) {
       std::vector<int> int32_host(tensor->numel());
 
-      if (platform::is_cpu_place(tensor->place())) {
+      if (phi::is_cpu_place(tensor->place())) {
         auto &int32_tensor = *tensor;
         if (tensor->dtype() == phi::DataType::INT64) {
           auto *cpu_ctx = pool.Get(phi::CPUPlace());
@@ -2884,7 +2884,7 @@ void AnalysisPredictor::HookCollectShapeRangeInfo() {
                              phi::CPUPlace(),
                              int32_tensor.data<int>(),
                              int32_tensor.numel() * sizeof(int));
-      } else if (platform::is_gpu_place(tensor->place())) {
+      } else if (phi::is_gpu_place(tensor->place())) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
         auto *dev_ctx = pool.Get(tensor->place());
         auto &int32_tensor = *tensor;
diff --git a/paddle/fluid/inference/api/api_impl.cc b/paddle/fluid/inference/api/api_impl.cc
@@ -241,14 +241,14 @@ bool NativePaddlePredictor::SetFeed(const std::vector<PaddleTensor> &inputs,
         paddle::platform::errors::InvalidArgument(
             "The data contained in the input PaddleTensor had wrong length."));
 
-    if (platform::is_cpu_place(place_)) {
+    if (phi::is_cpu_place(place_)) {
       // TODO(panyx0718): Init LoDTensor from existing memcpy to save a copy.
       std::memcpy(static_cast<void *>(input_ptr),
                   inputs[i].data.data(),
                   inputs[i].data.length());
-    } else if (platform::is_gpu_place(place_)) {
+    } else if (phi::is_gpu_place(place_)) {
       PADDLE_ENFORCE_EQ(
-          platform::is_xpu_place(place_),
+          phi::is_xpu_place(place_),
           false,
           platform::errors::InvalidArgument(
               "Only one choice can be made between CPU and XPU."));
@@ -267,7 +267,7 @@ bool NativePaddlePredictor::SetFeed(const std::vector<PaddleTensor> &inputs,
       PADDLE_THROW(platform::errors::Unavailable(
           "Not compile with CUDA, should not reach here."));
 #endif
-    } else if (platform::is_xpu_place(place_)) {
+    } else if (phi::is_xpu_place(place_)) {
 #ifdef PADDLE_WITH_XPU
       auto dst_xpu_place = place_;
       memory::Copy(dst_xpu_place,
diff --git a/paddle/fluid/inference/api/details/zero_copy_tensor.cc b/paddle/fluid/inference/api/details/zero_copy_tensor.cc
@@ -144,13 +144,13 @@ T *Tensor::data(PlaceType *place, int *size) const {
   EAGER_GET_TENSOR(phi::DenseTensor);
   auto *res = tensor->data<T>();
 
-  if (paddle::platform::is_cpu_place(tensor->place())) {
+  if (phi::is_cpu_place(tensor->place())) {
     *place = PlaceType::kCPU;
-  } else if (paddle::platform::is_gpu_place(tensor->place())) {
+  } else if (phi::is_gpu_place(tensor->place())) {
     *place = PlaceType::kGPU;
-  } else if (paddle::platform::is_xpu_place(tensor->place())) {
+  } else if (phi::is_xpu_place(tensor->place())) {
     *place = PlaceType::kXPU;
-  } else if (paddle::platform::is_custom_place(tensor->place())) {
+  } else if (phi::is_custom_place(tensor->place())) {
     *place = PlaceType::kCUSTOM;
   } else {
     *place = PlaceType::kUNK;
@@ -389,7 +389,7 @@ void Tensor::CopyToCpuImpl(T *data,
   auto *t_data = tensor->data<T>();
   auto t_place = tensor->place();
 
-  if (paddle::platform::is_cpu_place(t_place)) {
+  if (phi::is_cpu_place(t_place)) {
 #ifdef PADDLE_WITH_DNNL
     if (tensor->layout() == phi::DataLayout::ONEDNN) {
       phi::DenseTensor out;
@@ -410,7 +410,7 @@ void Tensor::CopyToCpuImpl(T *data,
 #else
     std::memcpy(static_cast<void *>(data), t_data, ele_num * sizeof(T));
 #endif
-  } else if (paddle::platform::is_ipu_place(t_place)) {
+  } else if (phi::is_ipu_place(t_place)) {
 #ifdef PADDLE_WITH_IPU
     std::memcpy(static_cast<void *>(data), t_data, ele_num * sizeof(T));
 #else
@@ -904,7 +904,7 @@ void InternalUtils::CopyToCpuWithIoStream(paddle_infer::Tensor *t,
   auto *t_data = tensor->data<T>();
   auto t_place = tensor->place();
 
-  if (paddle::platform::is_cpu_place(t_place)) {
+  if (phi::is_cpu_place(t_place)) {
 #ifdef PADDLE_WITH_DNNL
     if (tensor->layout() == phi::DataLayout::ONEDNN) {
       phi::DenseTensor out;
diff --git a/paddle/fluid/inference/api/onnxruntime_predictor.cc b/paddle/fluid/inference/api/onnxruntime_predictor.cc
@@ -270,7 +270,7 @@ std::unique_ptr<ZeroCopyTensor> ONNXRuntimePredictor::GetInputTensor(
       new ZeroCopyTensor(static_cast<void *>(scope_.get()), this));
   res->input_or_output_ = true;
   res->SetName(name);
-  if (platform::is_cpu_place(place_)) {
+  if (phi::is_cpu_place(place_)) {
     res->SetPlace(PaddlePlace::kCPU);
   } else {
     auto gpu_place = place_;
@@ -290,7 +290,7 @@ std::unique_ptr<ZeroCopyTensor> ONNXRuntimePredictor::GetOutputTensor(
   std::unique_ptr<ZeroCopyTensor> res(new ZeroCopyTensor(nullptr, this));
   res->input_or_output_ = false;
   res->SetName(name);
-  if (platform::is_cpu_place(place_)) {
+  if (phi::is_cpu_place(place_)) {
     res->SetPlace(PaddlePlace::kCPU);
   } else {
     auto gpu_place = place_;
@@ -335,7 +335,7 @@ bool ONNXRuntimePredictor::Run(const std::vector<PaddleTensor> &inputs,
 
 bool ONNXRuntimePredictor::ZeroCopyRun(bool switch_stream) {
   try {
-    const char *device_name = platform::is_cpu_place(place_) ? "Cpu" : "Cuda";
+    const char *device_name = phi::is_cpu_place(place_) ? "Cpu" : "Cuda";
     std::vector<Ort::Value> inputs;
     inputs.reserve(input_desc_.size());
     for (auto desc : input_desc_) {
diff --git a/paddle/fluid/inference/tensorrt/convert/io_converter.cc b/paddle/fluid/inference/tensorrt/convert/io_converter.cc
@@ -22,8 +22,8 @@ namespace paddle {
 namespace inference {
 namespace tensorrt {
 
-using platform::is_cpu_place;
-using platform::is_gpu_place;
+using phi::is_cpu_place;
+using phi::is_gpu_place;
 
 class DefaultIOConverter : public EngineIOConverter {
  public:
