PaddlePaddle
diff --git a/‎paddle/fluid/platform/device/custom/custom_device_resource_pool.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎paddle/fluid/platform/device/custom/custom_device_resource_pool.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎paddle/fluid/platform/device_context.cc
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions b/‎paddle/fluid/platform/device_context.cc
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions
diff --git a/‎paddle/fluid/platform/device_context_test.cu
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/platform/device_context_test.cu
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/platform/device_context_test_cuda_graph.cu
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/platform/device_context_test_cuda_graph.cu
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/platform/device_context_xpu_test.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/platform/device_context_xpu_test.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/platform/device_event_cpu.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/platform/device_event_cpu.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/platform/device_event_custom_device.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/platform/device_event_custom_device.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/platform/device_event_gpu.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/platform/device_event_gpu.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/platform/device_event_test.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/platform/device_event_test.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/platform/init_test.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/platform/init_test.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
@@ -21,7 +21,7 @@ namespace platform {
 CustomDeviceStreamResourcePool::CustomDeviceStreamResourcePool(
     const paddle::Place& place) {
   PADDLE_ENFORCE_EQ(
-      platform::is_custom_place(place),
+      phi::is_custom_place(place),
       true,
       phi::errors::PreconditionNotMet(
           "Required device shall be CustomPlace, but received %d. ", place));
@@ -74,7 +74,7 @@ CustomDeviceStreamResourcePool& CustomDeviceStreamResourcePool::Instance(
     const paddle::Place& place) {
   auto& pool = GetMap();
   PADDLE_ENFORCE_EQ(
-      platform::is_custom_place(place),
+      phi::is_custom_place(place),
       true,
       phi::errors::PreconditionNotMet(
           "Required device shall be CustomPlace, but received %d. ", place));
@@ -119,7 +119,7 @@ std::shared_ptr<CustomDeviceStreamObject> CustomDeviceStreamResourcePool::New(
 CustomDeviceEventResourcePool::CustomDeviceEventResourcePool(
     const paddle::Place& place) {
   PADDLE_ENFORCE_EQ(
-      platform::is_custom_place(place),
+      phi::is_custom_place(place),
       true,
       phi::errors::PreconditionNotMet(
           "Required device shall be CustomPlace, but received %d. ", place));
@@ -172,7 +172,7 @@ CustomDeviceEventResourcePool& CustomDeviceEventResourcePool::Instance(
     const phi::Place& place) {
   auto& pool = GetMap();
   PADDLE_ENFORCE_EQ(
-      platform::is_custom_place(place),
+      phi::is_custom_place(place),
       true,
       phi::errors::PreconditionNotMet(
           "Required device shall be CustomPlace, but received %d. ", place));
 
@@ -37,15 +37,15 @@ namespace paddle {
 namespace platform {
 
 DeviceType Place2DeviceType(const phi::Place& place) {
-  if (platform::is_cpu_place(place)) {
+  if (phi::is_cpu_place(place)) {
     return platform::DeviceType::CPU;
-  } else if (platform::is_gpu_place(place)) {
+  } else if (phi::is_gpu_place(place)) {
     return platform::DeviceType::CUDA;
-  } else if (platform::is_xpu_place(place)) {
+  } else if (phi::is_xpu_place(place)) {
     return platform::DeviceType::XPU;
-  } else if (platform::is_ipu_place(place)) {
+  } else if (phi::is_ipu_place(place)) {
     return platform::DeviceType::IPU;
-  } else if (platform::is_custom_place(place)) {
+  } else if (phi::is_custom_place(place)) {
     return platform::DeviceType::CUSTOM_DEVICE;
   } else {
     PADDLE_THROW(phi::errors::Unavailable(
@@ -220,7 +220,7 @@ void EmplaceDeviceContexts(
           "WITH_CUSTOM_DEVICE "
           "option."));
 #endif
-    } else if (platform::is_cuda_pinned_place(place)) {
+    } else if (phi::is_cuda_pinned_place(place)) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
       EmplaceDeviceContext<CUDAPinnedDeviceContext>(
           place_to_device_context,
@@ -232,7 +232,7 @@ void EmplaceDeviceContexts(
           "CUDAPlace is not supported. Please re-compile with WITH_GPU "
           "option."));
 #endif
-    } else if (platform::is_ipu_place(place)) {
+    } else if (phi::is_ipu_place(place)) {
 #ifdef PADDLE_WITH_IPU
       EmplaceDeviceContext<IPUDeviceContext>(
           place_to_device_context,
 
@@ -141,8 +141,8 @@ TEST(Device, HostZeroAllocator) {
 }
 
 TEST(Device, DeviceContextPool) {
-  using paddle::platform::DeviceContextPool;
   using phi::CPUPlace;
+  using phi::DeviceContextPool;
   using phi::GPUContext;
   using phi::GPUPlace;
   using phi::Place;
 
@@ -21,7 +21,7 @@ limitations under the License. */
 
 TEST(Device, DeviceContextWithCUDAGraph) {
   using paddle::platform::DeviceContext;
-  using paddle::platform::DeviceContextPool;
+  using phi::DeviceContextPool;
   using phi::GPUContext;
   using phi::GPUPlace;
   using phi::Place;
 
@@ -32,9 +32,9 @@ TEST(Device, Init) {
 }
 
 TEST(Device, DeviceContextPool) {
-  using paddle::platform::DeviceContextPool;
   using paddle::platform::XPUDeviceContext;
   using phi::CPUPlace;
+  using phi::DeviceContextPool;
   using phi::Place;
   using phi::XPUPlace;
 
 
@@ -26,7 +26,7 @@ struct CPUDeviceEventWrapper {
   explicit CPUDeviceEventWrapper(const phi::Place& place, unsigned int flag = 0)
       : status_(EventStatus::INITIALIZED) {
     PADDLE_ENFORCE_EQ(
-        platform::is_cpu_place(place),
+        phi::is_cpu_place(place),
         true,
         phi::errors::PreconditionNotMet(
             "Required device shall be CPUPlace, but received %d. ", place));
 
@@ -22,7 +22,7 @@ namespace platform {
 struct CustomDeviceEventWrapper {
   explicit CustomDeviceEventWrapper(const phi::Place& place) {
     PADDLE_ENFORCE_EQ(
-        platform::is_custom_place(place),
+        phi::is_custom_place(place),
         true,
         phi::errors::PreconditionNotMet(
             "Required device shall be CustomPlace, but received %d. ", place));
 
@@ -22,7 +22,7 @@ struct CUDADeviceEventWrapper {
   CUDADeviceEventWrapper(const phi::Place& place, unsigned int flag)
       : inner_event_(flag) {
     PADDLE_ENFORCE_EQ(
-        platform::is_gpu_place(place),
+        phi::is_gpu_place(place),
         true,
         phi::errors::PreconditionNotMet(
             "Required device shall be CUDAPlace, but received %d. ", place));
 
@@ -21,8 +21,8 @@
 using ::paddle::platform::kCPU;
 using ::paddle::platform::kCUDA;
 
-using paddle::platform::DeviceContextPool;
 using paddle::platform::DeviceEvent;
+using phi::DeviceContextPool;
 
 #ifdef PADDLE_WITH_CUDA
 #include <cuda_runtime.h>
 
@@ -18,7 +18,7 @@ limitations under the License. */
 
 TEST(InitDevices, CPU) {
   using paddle::framework::InitDevices;
-  using paddle::platform::DeviceContextPool;
+  using phi::DeviceContextPool;
 
 #if !defined(PADDLE_WITH_CUDA) && !defined(PADDLE_WITH_XPU) && \
     !defined(PADDLE_WITH_HIP)
@@ -30,7 +30,7 @@ TEST(InitDevices, CPU) {
 
 TEST(InitDevices, CUDA) {
   using paddle::framework::InitDevices;
-  using paddle::platform::DeviceContextPool;
+  using phi::DeviceContextPool;
 
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
   int count = paddle::platform::GetGPUDeviceCount();
@@ -42,7 +42,7 @@ TEST(InitDevices, CUDA) {
 
 TEST(InitDevices, XPU) {
   using paddle::framework::InitDevices;
-  using paddle::platform::DeviceContextPool;
+  using phi::DeviceContextPool;
 
 #ifdef PADDLE_WITH_XPU
   int count = paddle::platform::GetXPUDeviceCount();
Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,8 @@ TEST(Device, HostZeroAllocator) {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`TEST(Device, DeviceContextPool) {`
`144`		`- using paddle::platform::DeviceContextPool;`
`145`	`144`	`using phi::CPUPlace;`
	`145`	`+ using phi::DeviceContextPool;`
`146`	`146`	`using phi::GPUContext;`
`147`	`147`	`using phi::GPUPlace;`
`148`	`148`	`using phi::Place;`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ TEST(Device, Init) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`TEST(Device, DeviceContextPool) {`
`35`		`- using paddle::platform::DeviceContextPool;`
`36`	`35`	`using paddle::platform::XPUDeviceContext;`
`37`	`36`	`using phi::CPUPlace;`
	`37`	`+ using phi::DeviceContextPool;`
`38`	`38`	`using phi::Place;`
`39`	`39`	`using phi::XPUPlace;`
`40`	`40`