PaddlePaddle
diff --git a/‎paddle/fluid/pybind/cuda_streams_py.cc
Copy file name to clipboard
+7-8Lines changed: 7 additions & 8 deletions b/‎paddle/fluid/pybind/cuda_streams_py.cc
Copy file name to clipboard
+7-8Lines changed: 7 additions & 8 deletions
diff --git a/‎paddle/fluid/pybind/custom_device_py.cc
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions b/‎paddle/fluid/pybind/custom_device_py.cc
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions
diff --git a/‎paddle/fluid/pybind/data_set_py.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/pybind/data_set_py.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/pybind/distributed_py.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/pybind/distributed_py.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/pybind/eager.cc
Copy file name to clipboard
+29-37Lines changed: 29 additions & 37 deletions b/‎paddle/fluid/pybind/eager.cc
Copy file name to clipboard
+29-37Lines changed: 29 additions & 37 deletions
diff --git a/‎paddle/fluid/pybind/eager_functions.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/pybind/eager_functions.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/pybind/eager_math_op_patch.cc
Copy file name to clipboard
+7-9Lines changed: 7 additions & 9 deletions b/‎paddle/fluid/pybind/eager_math_op_patch.cc
Copy file name to clipboard
+7-9Lines changed: 7 additions & 9 deletions
@@ -241,14 +241,13 @@ void BindCudaStream(py::module *m_ptr) {
                   >>> print(ptr)
 
           )DOC")
-      .def_property_readonly("place",
-                             [](phi::CUDAStream &self) {
-                               return platform::CUDAPlace(self.place());
-                             })
+      .def_property_readonly(
+          "place",
+          [](phi::CUDAStream &self) { return phi::GPUPlace(self.place()); })
 #endif
       .def(
           "__init__",
-          [](phi::CUDAStream &self, platform::CUDAPlace *place, int priority) {
+          [](phi::CUDAStream &self, phi::GPUPlace *place, int priority) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
             if (priority != 1 && priority != 2) {
               PADDLE_THROW(platform::errors::InvalidArgument(
@@ -258,7 +257,7 @@ void BindCudaStream(py::module *m_ptr) {
             auto stream_flag = phi::CUDAStream::StreamFlag::kStreamNonBlocking;
             if (place == nullptr) {
               int curr_device_id = platform::GetCurrentDeviceId();
-              auto place_tmp = platform::CUDAPlace(curr_device_id);
+              auto place_tmp = phi::GPUPlace(curr_device_id);
               new (&self) phi::CUDAStream(place_tmp, priority - 2, stream_flag);
             } else {
               // setting priority 1(high) and 2(normal) correspond to the actual
@@ -296,7 +295,7 @@ void BindCudaStream(py::module *m_ptr) {
             // setting priority 1(high) and 2(normal) correspond to the actual
             // cuda stream priority -1 and 0.
             new (&self) phi::CUDAStream(
-                platform::CUDAPlace(device), priority - 2, stream_flag);
+                phi::GPUPlace(device), priority - 2, stream_flag);
 #else
             PADDLE_THROW(platform::errors::Unavailable(
         "Class CUDAStream can only be initialized on the GPU platform."));
@@ -309,7 +308,7 @@ void BindCudaStream(py::module *m_ptr) {
         int device_id = platform::GetCurrentDeviceId();
         auto stream_flag = phi::CUDAStream::StreamFlag::kStreamNonBlocking;
         new (&self) phi::CUDAStream(
-            platform::CUDAPlace(device_id), /*priority=*/0, stream_flag);
+            phi::GPUPlace(device_id), /*priority=*/0, stream_flag);
 #else
             PADDLE_THROW(platform::errors::Unavailable(
         "Class CUDAStream can only be initialized on the GPU platform."));
 
@@ -30,13 +30,13 @@ void BindCustomDevicePy(py::module *m_ptr) {
   auto &m = *m_ptr;
   // Bind Methods
   m.def("_get_device_min_chunk_size", [](const std::string &device_type) {
-    auto place = paddle::platform::CustomPlace(device_type);
+    auto place = phi::CustomPlace(device_type);
     return phi::DeviceManager::GetMinChunkSize(place);
   });
   m.def(
       "_get_device_total_memory",
       [](const std::string &device_type, int device_id) {
-        auto place = paddle::platform::CustomPlace(
+        auto place = phi::CustomPlace(
             device_type,
             device_id == -1 ? phi::DeviceManager::GetDevice(device_type)
                             : device_id);
@@ -50,7 +50,7 @@ void BindCustomDevicePy(py::module *m_ptr) {
       "_get_current_custom_device_stream",
       [](const std::string &device_type, int device_id) {
 #ifdef PADDLE_WITH_CUSTOM_DEVICE
-        auto place = paddle::platform::CustomPlace(
+        auto place = phi::CustomPlace(
             device_type,
             device_id == -1 ? phi::DeviceManager::GetDevice(device_type)
                             : device_id);
@@ -73,7 +73,7 @@ void BindCustomDevicePy(py::module *m_ptr) {
          int device_id,
          std::shared_ptr<phi::stream::Stream> stream) {
 #ifdef PADDLE_WITH_CUSTOM_DEVICE
-        auto place = paddle::platform::CustomPlace(
+        auto place = phi::CustomPlace(
             device_type,
             device_id == -1 ? phi::DeviceManager::GetDevice(device_type)
                             : device_id);
@@ -93,7 +93,7 @@ void BindCustomDevicePy(py::module *m_ptr) {
   m.def("_synchronize_custom_device",
         [](const std::string &device_type, int device_id) {
 #ifdef PADDLE_WITH_CUSTOM_DEVICE
-          auto place = paddle::platform::CustomPlace(
+          auto place = phi::CustomPlace(
               device_type,
               device_id == -1 ? phi::DeviceManager::GetDevice(device_type)
                               : device_id);
@@ -133,7 +133,7 @@ void BindCustomDevicePy(py::module *m_ptr) {
       .def(
           "__init__",
           [](phi::stream::Stream &self,
-             const platform::CustomPlace &place,
+             const phi::CustomPlace &place,
              int priority,
              bool blocking) {
 #ifdef PADDLE_WITH_CUSTOM_DEVICE
@@ -391,7 +391,7 @@ void BindCustomDevicePy(py::module *m_ptr) {
       .def(
           "__init__",
           [](phi::event::Event &self,
-             const platform::CustomPlace &place,
+             const phi::CustomPlace &place,
              bool enable_timing,
              bool blocking,
              bool interprocess) {
 
@@ -102,7 +102,7 @@ class IterableDatasetWrapper {
                           "Device number does not match reader number"));
     for (size_t i = 0; i < places_.size(); ++i) {
       data_feeds_[i]->AssignFeedVar(*scopes_[i]);
-      data_feeds_[i]->SetPlace(platform::CPUPlace());
+      data_feeds_[i]->SetPlace(phi::CPUPlace());
       PADDLE_ENFORCE_EQ(data_feeds_[i]->Start(),
                         true,
                         platform::errors::Unavailable(
 
@@ -563,7 +563,7 @@ void BindDistributed(py::module *m) {
                     self.GetDeviceContext(in_tensor.place(), use_calc_stream);
                 SplitTensor(*dev_ctx, *out_dense, &out_tensor_list);
                 if (!use_calc_stream &&
-                    dev_ctx->GetPlace() != platform::CPUPlace()) {
+                    dev_ctx->GetPlace() != phi::CPUPlace()) {
                   // calculate stream will wait comm stream
                   task->UpdateWaitChain(*dev_ctx);
                 }
 
@@ -76,7 +76,7 @@ PyObject* TensorNew(PyTypeObject* type, PyObject* args, PyObject* kwargs) {
 // TODO(jiabin): Overload this once we need more constructor in Python
 void EmptyTensorInitializer(TensorObject* self,
                             const std::string& name,
-                            const paddle::platform::Place& place,
+                            const phi::Place& place,
                             bool persistable = false,
                             int stop_gradient = -1,
                             framework::proto::VarType::Type dtype =
@@ -141,12 +141,12 @@ void EmptyTensorInitializer(TensorObject* self,
 
 void EmptyStringTensorInitializer(TensorObject* self,
                                   const std::string& name,
-                                  const paddle::platform::Place& place,
+                                  const phi::Place& place,
                                   const std::vector<int>& dims = {}) {
   auto ddims = common::make_ddim(dims);
   self->tensor.set_name(name);
   // Note(zhoushunjie): Only support CPUPlace when create StringTensor
-  auto actual_place = platform::CPUPlace();
+  auto actual_place = phi::CPUPlace();
   // Allocate memory
   paddle::experimental::DefaultAllocator string_allocator(actual_place);
   std::shared_ptr<phi::StringTensor> string_tensor =
@@ -160,7 +160,7 @@ void EmptyStringTensorInitializer(TensorObject* self,
 
 void InitTensorWithNumpyValue(TensorObject* self,
                               const py::object& array,
-                              const paddle::platform::Place& place,
+                              const phi::Place& place,
                               bool zero_copy = false) {
   PADDLE_ENFORCE_EQ(
       self->tensor.defined(),
@@ -174,7 +174,7 @@ void InitTensorWithNumpyValue(TensorObject* self,
   phi::DenseTensor* impl_ptr =
       static_cast<phi::DenseTensor*>(self->tensor.impl().get());
   if (platform::is_cpu_place(place)) {
-    SetTensorFromPyArray<platform::CPUPlace>(impl_ptr, array, place, zero_copy);
+    SetTensorFromPyArray<phi::CPUPlace>(impl_ptr, array, place, zero_copy);
   } else if (platform::is_xpu_place(place)) {
 #if defined(PADDLE_WITH_XPU)
     phi::backends::xpu::SetXPUDeviceId(place.device);
@@ -185,7 +185,7 @@ void InitTensorWithNumpyValue(TensorObject* self,
     PADDLE_THROW(paddle::platform::errors::PreconditionNotMet(
         "PaddlePaddle should compile with XPU if use XPUPlace."));
 #endif
-    SetTensorFromPyArray<platform::XPUPlace>(impl_ptr, array, place, zero_copy);
+    SetTensorFromPyArray<phi::XPUPlace>(impl_ptr, array, place, zero_copy);
   } else if (platform::is_gpu_place(place)) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
     phi::backends::gpu::SetDeviceId(place.device);
@@ -195,10 +195,9 @@ void InitTensorWithNumpyValue(TensorObject* self,
     PADDLE_THROW(paddle::platform::errors::PreconditionNotMet(
         "PaddlePaddle should compile with GPU if use CUDAPlace."));
 #endif
-    SetTensorFromPyArray<platform::CUDAPlace>(
-        impl_ptr, array, place, zero_copy);
+    SetTensorFromPyArray<phi::GPUPlace>(impl_ptr, array, place, zero_copy);
   } else if (platform::is_cuda_pinned_place(place)) {
-    SetTensorFromPyArray<platform::CUDAPinnedPlace>(
+    SetTensorFromPyArray<phi::GPUPinnedPlace>(
         impl_ptr, array, place, zero_copy);
   } else if (platform::is_custom_place(place)) {
 #if defined(PADDLE_WITH_CUSTOM_DEVICE)
@@ -210,8 +209,7 @@ void InitTensorWithNumpyValue(TensorObject* self,
     PADDLE_THROW(paddle::platform::errors::PreconditionNotMet(
         "PaddlePaddle should compile with CUSTOM_DEVICE if use CustomPlace."));
 #endif
-    SetTensorFromPyArray<platform::CustomPlace>(
-        impl_ptr, array, place, zero_copy);
+    SetTensorFromPyArray<phi::CustomPlace>(impl_ptr, array, place, zero_copy);
   } else {
     PADDLE_THROW(platform::errors::InvalidArgument(
         "Place should be one of "
@@ -231,10 +229,10 @@ void InitStringTensorWithNumpyValue(TensorObject* self, const py::object& obj) {
           "eager tensor before init it with NumPy."));
   phi::StringTensor* impl_ptr =
       static_cast<phi::StringTensor*>(self->tensor.impl().get());
-  paddle::platform::Place place = impl_ptr->place();
+  phi::Place place = impl_ptr->place();
   auto array = obj.cast<py::array>();
   if (platform::is_cpu_place(place)) {
-    SetStringTensorFromPyArray<platform::CPUPlace>(impl_ptr, array, place);
+    SetStringTensorFromPyArray<phi::CPUPlace>(impl_ptr, array, place);
   } else {
     PADDLE_THROW(platform::errors::InvalidArgument(
         "StringTensor only support CPUPlace now, but receive %s",
@@ -244,7 +242,7 @@ void InitStringTensorWithNumpyValue(TensorObject* self, const py::object& obj) {
 
 void InitDistTensorWithTensor(TensorObject* self,
                               const paddle::Tensor& src,
-                              const paddle::platform::Place& place,
+                              const phi::Place& place,
                               const std::string& name,
                               const ProcessMesh& process_mesh,
                               const Placements& placements) {
@@ -296,7 +294,7 @@ void InitDistTensorWithTensor(TensorObject* self,
 void InitDistTensorWithTensor(TensorObject* self,
                               const paddle::Tensor& local_tensor,
                               const std::vector<int>& global_dims,
-                              const paddle::platform::Place& place,
+                              const phi::Place& place,
                               const std::string& name,
                               const ProcessMesh& process_mesh,
                               const Placements& placements) {
@@ -339,7 +337,7 @@ void InitDistTensorWithTensor(TensorObject* self,
 
 void InitTensorWithTensor(TensorObject* self,
                           const paddle::Tensor& src,
-                          const paddle::platform::Place& place,
+                          const phi::Place& place,
                           const std::string& name) {
   self->tensor.set_name(name);
   if (place == src.place()) {
@@ -360,7 +358,7 @@ void InitTensorWithTensor(TensorObject* self,
 
 void InitTensorWithFrameworkTensor(TensorObject* self,
                                    const phi::DenseTensor& src,
-                                   const paddle::platform::Place& place,
+                                   const phi::Place& place,
                                    const std::string& name) {
   self->tensor.set_name(name);
   if (place == src.place()) {
@@ -376,7 +374,7 @@ void InitTensorWithFrameworkTensor(TensorObject* self,
 
 void InitStringTensorWithStringTensor(TensorObject* self,
                                       const paddle::Tensor& src,
-                                      const paddle::platform::Place& place,
+                                      const phi::Place& place,
                                       const std::string& name) {
   self->tensor.set_name(name);
   auto impl = std::static_pointer_cast<phi::StringTensor>(src.impl());
@@ -413,14 +411,12 @@ py::object ParsePyArray(
   return numpy_value;
 }
 
-paddle::platform::Place ParsePlace(
-    std::unordered_map<std::string, PyObject*> kws_map,
-    std::unordered_map<std::string, Py_ssize_t> kw_order_map,
-    PyObject* args,
-    bool flag_kwargs,
-    Py_ssize_t args_num) {
-  paddle::platform::Place place =
-      egr::Controller::Instance().GetExpectedPlace();
+phi::Place ParsePlace(std::unordered_map<std::string, PyObject*> kws_map,
+                      std::unordered_map<std::string, Py_ssize_t> kw_order_map,
+                      PyObject* args,
+                      bool flag_kwargs,
+                      Py_ssize_t args_num) {
+  phi::Place place = egr::Controller::Instance().GetExpectedPlace();
 
   if (kw_order_map["place"] <= args_num) {
     place = CastPyArg2Place(PyTuple_GET_ITEM(args, kw_order_map["place"] - 1),
@@ -565,8 +561,7 @@ void AutoInitTensorByPyArray(TensorObject* py_tensor_ptr,
       {"stop_gradient", 6}};
 
   py::object numpy_value = py::object();
-  paddle::platform::Place place =
-      egr::Controller::Instance().GetExpectedPlace();
+  phi::Place place = egr::Controller::Instance().GetExpectedPlace();
   bool persistable = false;
   bool zero_copy = false;
   std::string act_name = "";
@@ -614,8 +609,7 @@ void AutoInitTensorByTensor(TensorObject* py_tensor_ptr,
                                                            {"process_mesh", 5},
                                                            {"placements", 6}};
 
-  paddle::platform::Place place =
-      egr::Controller::Instance().GetExpectedPlace();
+  phi::Place place = egr::Controller::Instance().GetExpectedPlace();
   std::string act_name = "";
 
   place = ParsePlace(kws_map, kw_order_map, args, flag_kwargs, args_num);
@@ -707,8 +701,7 @@ void AutoInitStringTensorByPyArray(
   std::unordered_map<std::string, Py_ssize_t> kw_order_map{{"value", 1},
                                                            {"name", 2}};
   py::object numpy_value = py::object();
-  paddle::platform::Place place =
-      egr::Controller::Instance().GetExpectedPlace();
+  phi::Place place = egr::Controller::Instance().GetExpectedPlace();
   std::string act_name = "";
 
   numpy_value =
@@ -738,8 +731,7 @@ void AutoInitStringTensorByStringTensor(
   std::unordered_map<std::string, Py_ssize_t> kw_order_map{{"value", 1},
                                                            {"name", 2}};
 
-  paddle::platform::Place place =
-      egr::Controller::Instance().GetExpectedPlace();
+  phi::Place place = egr::Controller::Instance().GetExpectedPlace();
   std::string act_name = "";
 
   act_name = ParseName(kws_map,
@@ -801,7 +793,7 @@ Tensor is the basic data structure in PaddlePaddle. There are some ways to creat
  * parameter equals to case 1)
  * def __init__ (
  * ** value: ndarray,
- * ** place: paddle::platform::Place,
+ * ** place: phi::Place,
  * ** persistable: bool,
  * ** zero_copy: bool,
  * ** name: std::string,
@@ -817,7 +809,7 @@ Tensor is the basic data structure in PaddlePaddle. There are some ways to creat
  * parameter equals to case 1.)
  * def __init__ (
  * ** global_tensor: Tensor,
- * ** place: paddle::platform::Place,
+ * ** place: phi::Place,
  * ** name: std::string,
  * ** process_mesh: phi::distributed::ProcessMesh,
  * ** placements: std::vector<Placement>)
@@ -834,7 +826,7 @@ Tensor is the basic data structure in PaddlePaddle. There are some ways to creat
  * to case 5, zero parameter equals to case 1.)
  * def __init__ (
  * ** tensor: FrameworkTensor,
- * ** place: paddle::platform::Place,
+ * ** place: phi::Place,
  * ** name: std::string)
  *  **/
 int TensorInit(PyObject* self, PyObject* args, PyObject* kwargs) {
 
@@ -99,7 +99,7 @@ class EagerNumpyAllocation : public phi::Allocation {
       : Allocation(
             static_cast<void*>(pybind11::detail::array_proxy(numpy_data)->data),
             phi::SizeOf(dtype) * PyArray_Size_(numpy_data),
-            paddle::platform::CPUPlace()),
+            phi::CPUPlace()),
         arr_(numpy_data) {
     PADDLE_ENFORCE_NOT_NULL(
         arr_,
 
@@ -79,7 +79,7 @@ static bool IsNumpyArray(PyObject* obj) {
 }
 
 void InitTensorWithNumpyValue(const py::object& array,
-                              const paddle::platform::Place& place,
+                              const phi::Place& place,
                               Tensor* self,
                               bool zero_copy = false) {
   PADDLE_ENFORCE_EQ(
@@ -93,18 +93,16 @@ void InitTensorWithNumpyValue(const py::object& array,
   phi::DenseTensor* impl_ptr =
       static_cast<phi::DenseTensor*>(self->impl().get());
   if (platform::is_cpu_place(place)) {
-    SetTensorFromPyArray<platform::CPUPlace>(impl_ptr, array, place, zero_copy);
+    SetTensorFromPyArray<phi::CPUPlace>(impl_ptr, array, place, zero_copy);
   } else if (platform::is_xpu_place(place)) {
-    SetTensorFromPyArray<platform::XPUPlace>(impl_ptr, array, place, zero_copy);
+    SetTensorFromPyArray<phi::XPUPlace>(impl_ptr, array, place, zero_copy);
   } else if (platform::is_gpu_place(place)) {
-    SetTensorFromPyArray<platform::CUDAPlace>(
-        impl_ptr, array, place, zero_copy);
+    SetTensorFromPyArray<phi::GPUPlace>(impl_ptr, array, place, zero_copy);
   } else if (platform::is_cuda_pinned_place(place)) {
-    SetTensorFromPyArray<platform::CUDAPinnedPlace>(
+    SetTensorFromPyArray<phi::GPUPinnedPlace>(
         impl_ptr, array, place, zero_copy);
   } else if (platform::is_custom_place(place)) {
-    SetTensorFromPyArray<platform::CustomPlace>(
-        impl_ptr, array, place, zero_copy);
+    SetTensorFromPyArray<phi::CustomPlace>(impl_ptr, array, place, zero_copy);
   } else {
     PADDLE_THROW(platform::errors::InvalidArgument(
         "Place should be one of "
@@ -136,7 +134,7 @@ std::set<phi::DataType> _complex_dtypes{
 //     '__rtruediv__',
 //     '__matmul__',
 
-void SetDevice(paddle::platform::Place place) {
+void SetDevice(phi::Place place) {
   if (paddle::platform::is_gpu_place(place)) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
     phi::backends::gpu::SetDeviceId(place.device);
Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ void BindDistributed(py::module *m) {`
`563`	`563`	`self.GetDeviceContext(in_tensor.place(), use_calc_stream);`
`564`	`564`	`SplitTensor(dev_ctx, out_dense, &out_tensor_list);`
`565`	`565`	`if (!use_calc_stream &&`
`566`		`- dev_ctx->GetPlace() != platform::CPUPlace()) {`
	`566`	`+ dev_ctx->GetPlace() != phi::CPUPlace()) {`
`567`	`567`	`// calculate stream will wait comm stream`
`568`	`568`	`task->UpdateWaitChain(*dev_ctx);`
`569`	`569`	`}`