Fix (#65836)

co63oc · web-flow · commit 4965c1f470d2 · 2024-07-10T09:39:14.000+08:00
diff --git a/paddle/fluid/pybind/custom_device_py.cc b/paddle/fluid/pybind/custom_device_py.cc
@@ -56,7 +56,7 @@ void BindCustomDevicePy(py::module *m_ptr) {
                             : device_id);
 
         return static_cast<const phi::CustomContext *>(
-                   paddle::platform::DeviceContextPool::Instance().Get(place))
+                   phi::DeviceContextPool::Instance().Get(place))
             ->GetStream();
 #else
         PADDLE_THROW(platform::errors::Unavailable(
@@ -78,7 +78,7 @@ void BindCustomDevicePy(py::module *m_ptr) {
             device_id == -1 ? phi::DeviceManager::GetDevice(device_type)
                             : device_id);
         static_cast<phi::CustomContext *>(
-            paddle::platform::DeviceContextPool::Instance().Get(place))
+            phi::DeviceContextPool::Instance().Get(place))
             ->SetStream(stream);
         return stream;
 #else
@@ -460,11 +460,11 @@ void BindCustomDevicePy(py::module *m_ptr) {
           [](phi::event::Event &self, phi::stream::Stream *stream) {
 #ifdef PADDLE_WITH_CUSTOM_DEVICE
             if (stream == nullptr) {
-              stream = static_cast<const phi::CustomContext *>(
-                           paddle::platform::DeviceContextPool::Instance().Get(
-                               self.GetPlace()))
-                           ->GetStream()
-                           .get();
+              stream =
+                  static_cast<const phi::CustomContext *>(
+                      phi::DeviceContextPool::Instance().Get(self.GetPlace()))
+                      ->GetStream()
+                      .get();
             }
             self.Record(stream);
 #else
diff --git a/paddle/fluid/pybind/eager_method.cc b/paddle/fluid/pybind/eager_method.cc
@@ -892,7 +892,7 @@ static PyObject* tensor_clear_gradient(TensorObject* self,
         }
         if (set_to_zero) {
           auto* dev_ctx =
-              platform::DeviceContextPool::Instance().Get(grad_t->place());
+              phi::DeviceContextPool::Instance().Get(grad_t->place());
           phi::funcs::set_constant(*dev_ctx, grad_t, 0.0);
           if (is_leaf) {
             std::static_pointer_cast<egr::GradNodeAccumulation>(
@@ -937,7 +937,7 @@ static PyObject* tensor__zero_grads(TensorObject* self,
           t = static_cast<phi::distributed::DistTensor*>(grad->impl().get())
                   ->unsafe_mutable_value();
         }
-        auto* dev_ctx = platform::DeviceContextPool::Instance().Get(t->place());
+        auto* dev_ctx = phi::DeviceContextPool::Instance().Get(t->place());
         phi::funcs::set_constant(*dev_ctx, t, 0.0);
       } else {
         grad->set_impl(paddle::experimental::zeros_like(*(grad)).impl());
@@ -957,7 +957,7 @@ static PyObject* tensor__zero_grads(TensorObject* self,
                   meta->MutableGrad()->impl().get())
                   ->unsafe_mutable_value();
         }
-        auto* dev_ctx = platform::DeviceContextPool::Instance().Get(t->place());
+        auto* dev_ctx = phi::DeviceContextPool::Instance().Get(t->place());
         phi::funcs::set_constant(*dev_ctx, t, 0.0);
       } else {
         meta->MutableGrad()->set_impl(
diff --git a/paddle/fluid/pybind/imperative.cc b/paddle/fluid/pybind/imperative.cc
@@ -435,10 +435,10 @@ static void VarBaseCopy(std::shared_ptr<imperative::VarBase> &src,  // NOLINT
         dst_tensor->set_lod(src_tensor.lod());
         framework::TensorCopy(src_tensor, dst_device, dst_tensor);
         if (blocking) {
-          platform::DeviceContextPool::Instance().Get(dst_device)->Wait();
+          phi::DeviceContextPool::Instance().Get(dst_device)->Wait();
           auto src_device = src_tensor.place();
           if (!(src_device == dst_device)) {
-            platform::DeviceContextPool::Instance().Get(src_device)->Wait();
+            phi::DeviceContextPool::Instance().Get(src_device)->Wait();
           }
         }
       } else if (src->Var().IsType<phi::SelectedRows>()) {
@@ -451,10 +451,10 @@ static void VarBaseCopy(std::shared_ptr<imperative::VarBase> &src,  // NOLINT
                               dst_device,
                               dst_selected_rows->mutable_value());
         if (blocking) {
-          platform::DeviceContextPool::Instance().Get(dst_device)->Wait();
+          phi::DeviceContextPool::Instance().Get(dst_device)->Wait();
           auto src_device = src_selected_rows.value().place();
           if (!(src_device == dst_device)) {
-            platform::DeviceContextPool::Instance().Get(src_device)->Wait();
+            phi::DeviceContextPool::Instance().Get(src_device)->Wait();
           }
         }
       }
diff --git a/paddle/fluid/pybind/pybind.cc b/paddle/fluid/pybind/pybind.cc
@@ -1236,7 +1236,7 @@ PYBIND11_MODULE(libpaddle, m) {
 #endif
 
   m.def("wait_device", [](const phi::Place &place) {
-    platform::DeviceContextPool::Instance().Get(place)->Wait();
+    phi::DeviceContextPool::Instance().Get(place)->Wait();
   });
 
   m.def("from_dlpack", [](py::capsule *dltensor) {
@@ -2381,7 +2381,7 @@ All parameter, weight, gradient are variables in Paddle.
   m.def("is_compiled_with_brpc", IsCompiledWithBrpc);
   m.def("is_compiled_with_dist", IsCompiledWithDIST);
   m.def("_cuda_synchronize", [](const phi::GPUPlace &place) {
-    platform::DeviceContextPool::Instance().Get(place)->Wait();
+    phi::DeviceContextPool::Instance().Get(place)->Wait();
   });
   m.def("_set_warmup", [](bool warmup) {
 #if defined(PADDLE_WITH_CUDA)
@@ -2650,8 +2650,8 @@ All parameter, weight, gradient are variables in Paddle.
   m.def("get_cuda_current_device_id", &platform::GetCurrentDeviceId);
   m.def("cuda_empty_cache", [] {
     for (int dev_id : platform::GetSelectedDevices()) {
-      auto *dev_ctx = platform::DeviceContextPool::Instance().GetByPlace(
-          phi::GPUPlace(dev_id));
+      auto *dev_ctx =
+          phi::DeviceContextPool::Instance().GetByPlace(phi::GPUPlace(dev_id));
       dev_ctx->cudnn_workspace_handle().ResetWorkspace();
     }
     platform::EmptyCache();
diff --git a/paddle/fluid/pybind/slice_utils.h b/paddle/fluid/pybind/slice_utils.h
@@ -46,7 +46,7 @@ inline T GetDenseTensorValue(const phi::DenseTensor* x) {
     phi::DenseTensor cpu_x;
     framework::TensorCopy(*x, phi::CPUPlace(), &cpu_x);
 #if defined(PADDLE_WITH_CUSTOM_DEVICE)
-    platform::DeviceContextPool& pool = platform::DeviceContextPool::Instance();
+    phi::DeviceContextPool& pool = phi::DeviceContextPool::Instance();
     const platform::DeviceContext* dev_ctx = pool.Get(x->place());
     dev_ctx->Wait();
 #endif
diff --git a/paddle/fluid/pybind/tensor_py.h b/paddle/fluid/pybind/tensor_py.h
@@ -482,7 +482,7 @@ void SetTensorFromPyArrayT(
         reinterpret_cast<void *>(dst),
         const_cast<void *>(reinterpret_cast<const void *>(array.data())),
         array.nbytes());
-    platform::DeviceContextPool &pool = platform::DeviceContextPool::Instance();
+    phi::DeviceContextPool &pool = phi::DeviceContextPool::Instance();
     auto &ctx = *pool.Get(place);
     ctx.Wait();
 #else
@@ -1117,8 +1117,7 @@ inline py::array TensorToPyArray(const phi::DenseTensor &tensor,
       tensor_out = npu_identity_ad_func(tensor_in, -1);
       auto dense_tensor =
           std::dynamic_pointer_cast<phi::DenseTensor>(tensor_out.impl());
-      platform::DeviceContextPool &pool =
-          platform::DeviceContextPool::Instance();
+      phi::DeviceContextPool &pool = phi::DeviceContextPool::Instance();
       auto &ctx = *pool.Get(tensor.place());
       auto p = dense_tensor->place();
       phi::DenseTensor cpu_tensor;
@@ -1149,7 +1148,7 @@ inline py::array TensorToPyArray(const phi::DenseTensor &tensor,
       return py_arr;
     }
 
-    platform::DeviceContextPool &pool = platform::DeviceContextPool::Instance();
+    phi::DeviceContextPool &pool = phi::DeviceContextPool::Instance();
     auto &ctx = *pool.Get(tensor.place());
     auto p = tensor.place();
     phi::DenseTensor cpu_tensor;
diff --git a/paddle/fluid/pybind/uva_utils.h b/paddle/fluid/pybind/uva_utils.h
@@ -31,7 +31,7 @@ namespace pybind {
 static void tensor_uva(phi::DenseTensor *self_tensor, int device_id) {
   VLOG(4) << "Running in _uva interface.";
 #if defined(PADDLE_WITH_CUDA)
-  platform::DeviceContextPool &pool = platform::DeviceContextPool::Instance();
+  phi::DeviceContextPool &pool = phi::DeviceContextPool::Instance();
   auto *dev_ctx = pool.Get(phi::GPUPlace(device_id));
   VLOG(4) << "Init the DeviceContext, and the place is " << dev_ctx->GetPlace();
   // Register the cpu memory as the cuda host memory
diff --git a/paddle/fluid/pybind/xpu_streams_py.cc b/paddle/fluid/pybind/xpu_streams_py.cc
@@ -39,7 +39,7 @@ void BindXpuStream(py::module *m_ptr) {
     paddle::platform::SetXPUDeviceId(device_id);
     auto place = phi::XPUPlace(device_id);
     auto *dev_ctx = static_cast<phi::XPUContext *>(
-        paddle::platform::DeviceContextPool::Instance().Get(place));
+        phi::DeviceContextPool::Instance().Get(place));
     dev_ctx->Wait();
     paddle::platform::SetXPUDeviceId(curr_device_id);
 #else

Original file line number	Diff line number	Diff line change
`@@ -435,10 +435,10 @@ static void VarBaseCopy(std::shared_ptr<imperative::VarBase> &src, // NOLINT`
`435`	`435`	`dst_tensor->set_lod(src_tensor.lod());`
`436`	`436`	`framework::TensorCopy(src_tensor, dst_device, dst_tensor);`
`437`	`437`	`if (blocking) {`
`438`		`- platform::DeviceContextPool::Instance().Get(dst_device)->Wait();`
	`438`	`+ phi::DeviceContextPool::Instance().Get(dst_device)->Wait();`
`439`	`439`	`auto src_device = src_tensor.place();`
`440`	`440`	`if (!(src_device == dst_device)) {`
`441`		`- platform::DeviceContextPool::Instance().Get(src_device)->Wait();`
	`441`	`+ phi::DeviceContextPool::Instance().Get(src_device)->Wait();`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`	`} else if (src->Var().IsType<phi::SelectedRows>()) {`
`@@ -451,10 +451,10 @@ static void VarBaseCopy(std::shared_ptr<imperative::VarBase> &src, // NOLINT`
`451`	`451`	`dst_device,`
`452`	`452`	`dst_selected_rows->mutable_value());`
`453`	`453`	`if (blocking) {`
`454`		`- platform::DeviceContextPool::Instance().Get(dst_device)->Wait();`
	`454`	`+ phi::DeviceContextPool::Instance().Get(dst_device)->Wait();`
`455`	`455`	`auto src_device = src_selected_rows.value().place();`
`456`	`456`	`if (!(src_device == dst_device)) {`
`457`		`- platform::DeviceContextPool::Instance().Get(src_device)->Wait();`
	`457`	`+ phi::DeviceContextPool::Instance().Get(src_device)->Wait();`
`458`	`458`	`}`
`459`	`459`	`}`
`460`	`460`	`}`