PaddlePaddle
diff --git a/‎paddle/fluid/framework/details/all_reduce_op_handle.cc
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎paddle/fluid/framework/details/all_reduce_op_handle.cc
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎paddle/fluid/framework/details/broadcast_op_handle.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎paddle/fluid/framework/details/broadcast_op_handle.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎paddle/fluid/framework/details/eager_deletion_op_handle.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/framework/details/eager_deletion_op_handle.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/framework/details/fused_all_reduce_op_handle.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎paddle/fluid/framework/details/fused_all_reduce_op_handle.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎paddle/fluid/framework/details/nan_inf_utils_detail.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/framework/details/nan_inf_utils_detail.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/framework/details/nan_inf_utils_detail.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/details/nan_inf_utils_detail.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/details/op_handle_base.cc
Copy file name to clipboard
+8-9Lines changed: 8 additions & 9 deletions b/‎paddle/fluid/framework/details/op_handle_base.cc
Copy file name to clipboard
+8-9Lines changed: 8 additions & 9 deletions
diff --git a/‎paddle/fluid/framework/details/reduce_op_handle.cc
Copy file name to clipboard
+6-7Lines changed: 6 additions & 7 deletions b/‎paddle/fluid/framework/details/reduce_op_handle.cc
Copy file name to clipboard
+6-7Lines changed: 6 additions & 7 deletions
diff --git a/‎paddle/fluid/framework/details/scale_loss_grad_op_handle.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/framework/details/scale_loss_grad_op_handle.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/framework/details/sparse_all_reduce_op_handle.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/framework/details/sparse_all_reduce_op_handle.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -143,9 +143,9 @@ void AllReduceOpHandle::AllReduceImpl(
               in_var_handles[i]->name(),
               numel));
       dtype = framework::TransToProtoVarType(lod_tensor.dtype());
-      is_gpu_place = platform::is_gpu_place(lod_tensor.place());
+      is_gpu_place = phi::is_gpu_place(lod_tensor.place());
 #if defined(PADDLE_WITH_XPU_BKCL)
-      is_xpu_place = platform::is_xpu_place(lod_tensor.place());
+      is_xpu_place = phi::is_xpu_place(lod_tensor.place());
 #endif
     }
     PADDLE_ENFORCE_EQ(
@@ -162,13 +162,13 @@ void AllReduceOpHandle::AllReduceImpl(
             "scopes should be equal."));
 #if defined(PADDLE_WITH_XPU_BKCL)
     PADDLE_ENFORCE_EQ(is_xpu_place,
-                      platform::is_xpu_place(lod_tensor.place()),
+                      phi::is_xpu_place(lod_tensor.place()),
                       platform::errors::PreconditionNotMet(
                           "The place type of tensors of the same variable "
                           "in different local scopes should be equal."));
 #endif
     PADDLE_ENFORCE_EQ(is_gpu_place,
-                      platform::is_gpu_place(lod_tensor.place()),
+                      phi::is_gpu_place(lod_tensor.place()),
                       platform::errors::PreconditionNotMet(
                           "The place type of tensors of the same variable "
                           "in different local scopes should be equal."));
@@ -204,7 +204,7 @@ void AllReduceOpHandle::AllReduceFunc(
     int64_t numel,
     const std::vector<phi::Place> &places,
     const std::vector<std::string> &out_var_names) {
-  if (platform::is_gpu_place(places[0])) {
+  if (phi::is_gpu_place(places[0])) {
 #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
     PADDLE_ENFORCE_NOT_NULL(nccl_ctxs_,
                             platform::errors::InvalidArgument(
@@ -223,7 +223,7 @@ void AllReduceOpHandle::AllReduceFunc(
     PADDLE_THROW(
         platform::errors::PreconditionNotMet("Not compiled with GPU."));
 #endif
-  } else if (platform::is_xpu_place(places[0])) {
+  } else if (phi::is_xpu_place(places[0])) {
 #if defined(PADDLE_WITH_XPU_BKCL)
     PADDLE_ENFORCE_NOT_NULL(bkcl_ctxs_,
                             platform::errors::InvalidArgument(
 
@@ -68,7 +68,7 @@ void BroadcastOpHandle::BroadcastOneVar(
 
   InitOutputValue(in_var_handle, out_var_handles);
 
-  if (platform::is_cpu_place(in_tensor.place())) {
+  if (phi::is_cpu_place(in_tensor.place())) {
     WaitInputVarGenerated();
     for (auto *out_var_handle : out_var_handles) {
       if (out_var_handle->IsTheSameVar(in_var_handle)) {
@@ -85,7 +85,7 @@ void BroadcastOpHandle::BroadcastOneVar(
             &VariableVisitor::GetMutableTensor(out_var));
       });
     }
-  } else if (platform::is_gpu_place(in_tensor.place())) {
+  } else if (phi::is_gpu_place(in_tensor.place())) {
 #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
     VarHandle *out_handle = nullptr;
     int root_id = in_tensor.place().device;  // NOLINT
@@ -249,8 +249,8 @@ void BroadcastOpHandle::InitOutputValue(
         out_var,
         platform::errors::NotFound("Variable %s is not found in scopes.",
                                    out_var_handle->name()));
-    if (platform::is_gpu_place(in_tensor.place())) {
-      PADDLE_ENFORCE_EQ(platform::is_gpu_place(t_out_p),
+    if (phi::is_gpu_place(in_tensor.place())) {
+      PADDLE_ENFORCE_EQ(phi::is_gpu_place(t_out_p),
                         true,
                         platform::errors::PreconditionNotMet(
                             "Places of input and output must be all on GPU."));
 
@@ -42,9 +42,9 @@ EagerDeletionOpHandle::EagerDeletionOpHandle(
       gc_(gc),
       vars_() {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
-  if (platform::is_gpu_place(place)) {
+  if (phi::is_gpu_place(place)) {
     dev_ctx_ = reinterpret_cast<phi::GPUContext *>(
-        platform::DeviceContextPool::Instance().Get(place));
+        phi::DeviceContextPool::Instance().Get(place));
     if (dynamic_cast<StreamGarbageCollector *>(gc_)) {
       platform::CUDADeviceGuard guard(place.device);
 #ifdef PADDLE_WITH_HIP
 
@@ -91,7 +91,7 @@ void FusedAllReduceOpHandle::RunImpl() {
                       platform::errors::Unimplemented(
                           "FLAGS_allreduce_record_one_event=true is only valid "
                           "when using one GPU device per process."));
-    PADDLE_ENFORCE_EQ(platform::is_gpu_place(places_[0]),
+    PADDLE_ENFORCE_EQ(phi::is_gpu_place(places_[0]),
                       true,
                       platform::errors::Unimplemented(
                           "FLAGS_allreduce_record_one_event=true is only valid "
@@ -116,7 +116,7 @@ void FusedAllReduceOpHandle::RunImpl() {
   if (FLAGS_allreduce_record_one_event) {
     auto gpu_place = phi::GPUPlace(places_[0].GetDeviceId());
     compute_stream =
-        platform::DeviceContextPool::Instance().GetByPlace(gpu_place)->stream();
+        phi::DeviceContextPool::Instance().GetByPlace(gpu_place)->stream();
     auto flat_nccl_ctxs = nccl_ctxs_->GetFlatCtx(run_order_);
     auto &nccl_ctx = flat_nccl_ctxs->at(gpu_place.device);
     nccl_stream = nccl_ctx.stream();
@@ -320,7 +320,7 @@ bool FusedAllReduceOpHandle::InputIsInDifferentPlace(
           platform::errors::NotFound(
               "The variable '%s' is not found in local scope.", var_name));
       auto &lod_tensor = var->Get<phi::DenseTensor>();
-      if (!platform::is_same_place(lod_tensor.place(), places_.at(scope_idx))) {
+      if (!phi::is_same_place(lod_tensor.place(), places_.at(scope_idx))) {
         return true;
       }
     }
@@ -355,7 +355,7 @@ void FusedAllReduceOpHandle::GetGradLoDTensor(
     auto &lod_tensor = var->Get<phi::DenseTensor>();
 
     PADDLE_ENFORCE_EQ(
-        platform::is_same_place(lod_tensor.place(), places_.at(scope_idx)),
+        phi::is_same_place(lod_tensor.place(), places_.at(scope_idx)),
         true,
         platform::errors::InvalidArgument(
             "The variable '%s' at scope %d is not in the right place.",
 
@@ -182,7 +182,7 @@ void CheckVarHasNanOrInf(const std::string& op_type,
   VLOG(10) << "begin check " << op_type << " var_name:" << var_name
            << ", place:" << tensor->place() << ", numel:" << tensor->numel();
 
-  if (platform::is_gpu_place(tensor->place())) {
+  if (phi::is_gpu_place(tensor->place())) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
     tensor_check<phi::GPUContext>(op_type, var_name, *tensor, place);
 #else
@@ -192,7 +192,7 @@ void CheckVarHasNanOrInf(const std::string& op_type,
         var_name));
 #endif
     return;
-  } else if (platform::is_xpu_place(tensor->place())) {
+  } else if (phi::is_xpu_place(tensor->place())) {
 #ifdef PADDLE_WITH_XPU
     if (framework::TransToProtoVarType(tensor->dtype()) !=
         proto::VarType::FP32) {
 
@@ -59,7 +59,7 @@ struct TensorCheckerVisitor {
           std::is_same<T, ::paddle::platform::complex<double>>::value>::type* =
           0) const {
     auto* dev_ctx = reinterpret_cast<Context*>(
-        platform::DeviceContextPool::Instance().Get(tensor.place()));
+        phi::DeviceContextPool::Instance().Get(tensor.place()));
 
     phi::DenseTensor stats;
     phi::DenseTensor values;
 
@@ -79,7 +79,7 @@ void OpHandleBase::InitCUDA() {
       auto *out_var_handle = dynamic_cast<VarHandle *>(out_var);
       if (out_var_handle) {
         PADDLE_ENFORCE_EQ(
-            platform::is_same_place(place, out_var_handle->place()),
+            phi::is_same_place(place, out_var_handle->place()),
             true,
             platform::errors::InvalidArgument(
                 "The place of output(%s) is not consistent with the "
@@ -118,7 +118,7 @@ void OpHandleBase::InitXPU() {
       auto *out_var_handle = dynamic_cast<VarHandle *>(out_var);
       if (out_var_handle) {
         PADDLE_ENFORCE_EQ(
-            platform::is_same_place(place, out_var_handle->place()),
+            phi::is_same_place(place, out_var_handle->place()),
             true,
             platform::errors::InvalidArgument(
                 "The place of output(%s) is not consistent with the "
@@ -176,7 +176,7 @@ void OpHandleBase::RecordWaitEventOnCtx(platform::DeviceContext *waited_ctx) {
   PADDLE_ENFORCE_NOT_NULL(
       waited_ctx,
       platform::errors::InvalidArgument("Argument waited_ctx is NULL."));
-  if (platform::is_cpu_place(waited_ctx->GetPlace()) || events_.empty()) {
+  if (phi::is_cpu_place(waited_ctx->GetPlace()) || events_.empty()) {
     for (auto &dev_ctx : dev_ctxes_) {
       PADDLE_ENFORCE_NOT_NULL(
           dev_ctx.second,
@@ -220,7 +220,7 @@ void OpHandleBase::WaitInputVarGenerated(bool wait_for_feed) {
       auto *in_var_handle = dynamic_cast<VarHandle *>(in_var);
       if (in_var_handle) {
         auto &place = in_var_handle->place();
-        if (platform::is_gpu_place(place)) {
+        if (phi::is_gpu_place(place)) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
           auto stream =
               static_cast<phi::GPUContext *>(dev_ctxes_.at(place))->stream();
@@ -247,10 +247,9 @@ void OpHandleBase::WaitInputVarGenerated(bool wait_for_feed) {
         auto *in_var_handle = dynamic_cast<VarHandle *>(in_var);
         if (in_var_handle) {
           auto &place = in_var_handle->place();
-          if (platform::is_gpu_place(place)) {
+          if (phi::is_gpu_place(place)) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
-            platform::DeviceContextPool &pool =
-                platform::DeviceContextPool::Instance();
+            phi::DeviceContextPool &pool = phi::DeviceContextPool::Instance();
             auto stream =
                 static_cast<phi::GPUContext *>(pool.Get(place))->stream();
             platform::GpuStreamSync(stream);
@@ -272,7 +271,7 @@ void OpHandleBase::WaitInputVarGenerated(const phi::Place &place) {
       // so there doesn't add event for it.
       auto *in_var_handle = dynamic_cast<VarHandle *>(in_var);
       if (in_var_handle) {
-        if (platform::is_gpu_place(in_var_handle->place())) {
+        if (phi::is_gpu_place(in_var_handle->place())) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
           auto stream = static_cast<phi::GPUContext *>(
                             dev_ctxes_.at(in_var_handle->place()))
@@ -332,7 +331,7 @@ void OpHandleBase::RunAndRecordEvent(const std::function<void()> &callback) {
 void OpHandleBase::RunAndRecordEvent(phi::Place p,
                                      const std::function<void()> &callback) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
-  if (platform::is_cpu_place(p) || events_.empty()) {
+  if (phi::is_cpu_place(p) || events_.empty()) {
     callback();
   } else {
     auto *ctx = dev_ctxes_.at(p);
 
@@ -112,8 +112,8 @@ void ReduceOpHandle::RunImpl() {
   // CPU.
   auto in_p = VariableVisitor::GetMutableTensor(pre_in_var).place();
   phi::Place t_out_p;
-  if (platform::is_gpu_place(in_p)) {
-    PADDLE_ENFORCE_EQ(platform::is_gpu_place(out_var_handle->place()),
+  if (phi::is_gpu_place(in_p)) {
+    PADDLE_ENFORCE_EQ(phi::is_gpu_place(out_var_handle->place()),
                       true,
                       platform::errors::PreconditionNotMet(
                           "Places of input and output must be all on GPU."));
@@ -134,8 +134,7 @@ void ReduceOpHandle::RunImpl() {
 
       // TODO(gongwb): add cpu support
       if (collective_context.endpoints_.size() <= 1 ||
-          platform::is_cpu_place(in_places[0]) ||
-          platform::is_cpu_place(t_out_p)) {
+          phi::is_cpu_place(in_places[0]) || phi::is_cpu_place(t_out_p)) {
         GatherLocalSelectedRowsFunctor functor(
             in_selected_rows,
             in_places,
@@ -151,7 +150,7 @@ void ReduceOpHandle::RunImpl() {
     std::vector<const phi::DenseTensor *> lod_tensors =
         GetInputValues<phi::DenseTensor>(in_var_handles, var_scopes);
 
-    if (paddle::platform::is_cpu_place(lod_tensors[0]->place())) {
+    if (phi::is_cpu_place(lod_tensors[0]->place())) {
       WaitInputVarGenerated();
       this->RunAndRecordEvent([&] {
         // FIXME(zcd): The order of summing is important,
@@ -179,7 +178,7 @@ void ReduceOpHandle::RunImpl() {
           }
         }
       });
-    } else if (paddle::platform::is_gpu_place(lod_tensors[0]->place())) {
+    } else if (phi::is_gpu_place(lod_tensors[0]->place())) {
 #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
       auto pre_in = pre_in_var->Get<phi::DenseTensor>();
       VariableVisitor::ShareDimsAndLoD(*pre_in_var, out_var);
@@ -231,7 +230,7 @@ void ReduceOpHandle::RunImpl() {
       PADDLE_THROW(
           platform::errors::PreconditionNotMet("Not compiled with CUDA."));
 #endif
-    } else if (paddle::platform::is_xpu_place(lod_tensors[0]->place())) {
+    } else if (phi::is_xpu_place(lod_tensors[0]->place())) {
 #if defined(PADDLE_WITH_XPU_BKCL)
       auto pre_in = pre_in_var->Get<phi::DenseTensor>();
       VariableVisitor::ShareDimsAndLoD(*pre_in_var, out_var);
 
@@ -57,9 +57,9 @@ struct ScaleLossGradFunctor {
   template <typename OutT>
   void apply() const {
     auto *out_data = out_->mutable_data<OutT>(place_);
-    if (platform::is_cpu_place(place_)) {
+    if (phi::is_cpu_place(place_)) {
       *out_data = static_cast<OutT>(coeff_);
-    } else if (platform::is_xpu_place(place_)) {
+    } else if (phi::is_xpu_place(place_)) {
 #if defined(PADDLE_WITH_XPU)
       OutT cast_coeff = static_cast<OutT>(coeff_);
       memory::Copy(place_,
 
@@ -133,13 +133,13 @@ void SparseAllReduceOpHandle::RunImplEncoded() {
   }
 
   PADDLE_ENFORCE_EQ(
-      platform::is_gpu_place(ins[0]->place()),
+      phi::is_gpu_place(ins[0]->place()),
       true,
       platform::errors::InvalidArgument(
           "The place of input variable should be CUDAPlace, but got %s.",
           ins[0]->place()));
   PADDLE_ENFORCE_EQ(
-      platform::is_gpu_place(outs[0]->place()),
+      phi::is_gpu_place(outs[0]->place()),
       true,
       platform::errors::InvalidArgument(
           "The place of input variable should be CUDAPlace, but got %s.",