Replace platform::DeviceContext [fluid_ops] part3 (#66087)

co63oc · web-flow · commit 27472eed0a57 · 2024-07-17T14:41:07.000+08:00
diff --git a/paddle/fluid/distributed/collective/reducer.cc b/paddle/fluid/distributed/collective/reducer.cc
@@ -423,7 +423,7 @@ void EagerGroup::ConcatTensors(const phi::Place &place) {
   }
 }
 
-void EagerGroup::SplitTensors(const platform::DeviceContext &context) {
+void EagerGroup::SplitTensors(const phi::DeviceContext &context) {
   auto place = context.GetPlace();
   if (phi::is_gpu_place(place)) {
 #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL)
diff --git a/paddle/fluid/distributed/fleet_executor/carrier.h b/paddle/fluid/distributed/fleet_executor/carrier.h
@@ -111,7 +111,7 @@ class Carrier final {
   framework::Scope* root_scope_{nullptr};
   framework::Scope* minibatch_scope_{nullptr};
   phi::Place place_;
-  paddle::platform::DeviceContext* dev_ctx_{nullptr};
+  phi::DeviceContext* dev_ctx_{nullptr};
   int64_t rank_;
   std::string carrier_id_;
   std::unordered_map<int64_t, TaskNode*> interceptor_id_to_node_;
diff --git a/paddle/fluid/distributed/ps/service/brpc_utils.cc b/paddle/fluid/distributed/ps/service/brpc_utils.cc
@@ -53,7 +53,7 @@ void SerializeToMultiVarMsgAndIOBuf(
     const std::string& message_name,
     const std::vector<std::string>& send_var_name_val,
     const std::vector<std::string>& recv_var_name_val,
-    const platform::DeviceContext& ctx,
+    const phi::DeviceContext& ctx,
     const framework::Scope* scope,
     MultiVarMsg* request,
     butil::IOBuf* iobuf) {
@@ -86,7 +86,7 @@ void SerializeToMultiVarMsgAndIOBuf(
 }
 
 void SerializeLodTensor(framework::Variable* var,
-                        const platform::DeviceContext& ctx,
+                        const phi::DeviceContext& ctx,
                         VarMsg* var_msg,
                         butil::IOBuf* iobuf) {
   auto* tensor = var->GetMutable<phi::DenseTensor>();
@@ -133,7 +133,7 @@ void SerializeLodTensor(framework::Variable* var,
 }
 
 void SerializeSelectedRows(framework::Variable* var,
-                           const platform::DeviceContext& ctx,
+                           const phi::DeviceContext& ctx,
                            VarMsg* var_msg,
                            butil::IOBuf* iobuf) {
   phi::SelectedRows* slr = var->GetMutable<phi::SelectedRows>();
@@ -181,7 +181,7 @@ void SerializeSelectedRows(framework::Variable* var,
 
 void DeserializeFromMultiVarMsgAndIOBuf(const MultiVarMsg& multi_msg,
                                         const butil::IOBuf* iobuf,
-                                        const platform::DeviceContext& ctx,
+                                        const phi::DeviceContext& ctx,
                                         framework::Scope* scope) {
   butil::IOBufBytesIterator io_buffer_itr(*iobuf);
   // size_t shard_buffer_remain = res_io_buffer.size();
@@ -199,7 +199,7 @@ void DeserializeFromMultiVarMsgAndIOBuf(const MultiVarMsg& multi_msg,
 
 void DeserializeFromMultiVarMsgAndIOBuf(const MultiVarMsg& multi_msg,
                                         const butil::IOBuf* iobuf,
-                                        const platform::DeviceContext& ctx,
+                                        const phi::DeviceContext& ctx,
                                         const framework::Scope* scope) {
   butil::IOBufBytesIterator io_buffer_itr(*iobuf);
   // size_t shard_buffer_remain = res_io_buffer.size();
@@ -222,7 +222,7 @@ void DeserializeFromMultiVarMsgAndIOBuf(const MultiVarMsg& multi_msg,
 void DeserializeLodTensor(framework::Variable* var,
                           const VarMsg& msg,
                           butil::IOBufBytesIterator& io_buffer_itr,  // NOLINT
-                          const platform::DeviceContext& ctx) {
+                          const phi::DeviceContext& ctx) {
   const auto place = ctx.GetPlace();
   phi::DenseTensor* tensor = var->GetMutable<phi::DenseTensor>();
   std::vector<int> vec_dim;
@@ -273,7 +273,7 @@ void DeserializeSelectedRows(
     framework::Variable* var,
     const VarMsg& msg,
     butil::IOBufBytesIterator& io_buffer_itr,  // NOLINT
-    const platform::DeviceContext& ctx) {
+    const phi::DeviceContext& ctx) {
   const auto place = ctx.GetPlace();
   auto* slr = var->GetMutable<phi::SelectedRows>();
   phi::DenseTensor* tensor = slr->mutable_value();
diff --git a/paddle/fluid/distributed/ps/service/brpc_utils.h b/paddle/fluid/distributed/ps/service/brpc_utils.h
@@ -55,42 +55,42 @@ void SerializeToMultiVarMsgAndIOBuf(
     const std::string& message_name,
     const std::vector<std::string>& send_var_name_val,
     const std::vector<std::string>& recv_var_name_val,
-    const platform::DeviceContext& ctx,
+    const phi::DeviceContext& ctx,
     const framework::Scope* scope,
     MultiVarMsg* var_msg,
     butil::IOBuf* iobuf);
 
 void SerializeLodTensor(framework::Variable* var,
-                        const platform::DeviceContext& ctx,
+                        const phi::DeviceContext& ctx,
                         VarMsg* var_msg,
                         butil::IOBuf* iobuf);
 
 void SerializeSelectedRows(framework::Variable* var,
-                           const platform::DeviceContext& ctx,
+                           const phi::DeviceContext& ctx,
                            VarMsg* request,
                            butil::IOBuf* iobuf);
 
 // Deserialize for Server
 void DeserializeFromMultiVarMsgAndIOBuf(const MultiVarMsg& multi_msg,
                                         const butil::IOBuf* iobuf,
-                                        const platform::DeviceContext& ctx,
+                                        const phi::DeviceContext& ctx,
                                         framework::Scope* scope);
 
 // Deserialize for Client
 void DeserializeFromMultiVarMsgAndIOBuf(const MultiVarMsg& multi_msg,
                                         const butil::IOBuf* iobuf,
-                                        const platform::DeviceContext& ctx,
+                                        const phi::DeviceContext& ctx,
                                         const framework::Scope* scope);
 
 void DeserializeLodTensor(framework::Variable* var,
                           const VarMsg& msg,
                           butil::IOBufBytesIterator& iobuf,  // NOLINT
-                          const platform::DeviceContext& ctx);
+                          const phi::DeviceContext& ctx);
 
 void DeserializeSelectedRows(framework::Variable* var,
                              const VarMsg& msg,
                              butil::IOBufBytesIterator& iobuf,  // NOLINT
-                             const platform::DeviceContext& ctx);
+                             const phi::DeviceContext& ctx);
 
 std::string GetIntTypeEndpoint(const std::string& ip, const uint32_t& port);
 
diff --git a/paddle/fluid/distributed/ps/service/heter_client.cc b/paddle/fluid/distributed/ps/service/heter_client.cc
@@ -26,8 +26,7 @@ std::shared_ptr<HeterClient> HeterClient::s_instance_ = nullptr;
 std::mutex HeterClient::mtx_;
 std::shared_ptr<HeterClient> HeterClient::switch_s_instance_ = nullptr;
 
-int GetMicroId(const platform::DeviceContext& ctx,
-               const framework::Scope* scope) {
+int GetMicroId(const phi::DeviceContext& ctx, const framework::Scope* scope) {
   framework::Variable* var = scope->FindVar("microbatch_id");
   PADDLE_ENFORCE_EQ(var->IsType<phi::DenseTensor>(),
                     true,
@@ -113,7 +112,7 @@ void HeterClient::CreateClient2XpuConnection() {
 }
 
 void HeterClient::SendAndRecvAsync(
-    const platform::DeviceContext& ctx,
+    const phi::DeviceContext& ctx,
     const framework::Scope& scope,
     const std::string& message_name,
     const std::vector<std::string>& send_var_name,
@@ -122,7 +121,7 @@ void HeterClient::SendAndRecvAsync(
   platform::RecordEvent record_event("HeterClient->SendAndRecvAsync",
                                      platform::TracerEventType::Communication,
                                      1);
-  const platform::DeviceContext* p_ctx = &ctx;
+  const phi::DeviceContext* p_ctx = &ctx;
   const framework::Scope* p_scope = &scope;
   const std::vector<std::string> send_var_name_val = send_var_name;
   const std::vector<std::string> recv_var_name_val = recv_var_name;
@@ -213,7 +212,7 @@ std::future<int32_t> HeterClient::SendCmd(
   return fut;
 }
 
-int HeterClient::Send(const platform::DeviceContext& ctx,
+int HeterClient::Send(const phi::DeviceContext& ctx,
                       const framework::Scope& scope,
                       const std::string& message_name,
                       const std::vector<std::string>& send_var_names) {
@@ -324,7 +323,7 @@ int HeterClient::Send(int group_id,
   return 0;
 }
 
-int HeterClient::Recv(const platform::DeviceContext& ctx,
+int HeterClient::Recv(const phi::DeviceContext& ctx,
                       framework::Scope& recv_scope,  // NOLINT
                       const std::string& message_name,
                       const std::vector<std::string>& recv_var_names) {
diff --git a/paddle/fluid/distributed/ps/service/heter_client.h b/paddle/fluid/distributed/ps/service/heter_client.h
@@ -132,7 +132,7 @@ class HeterClient {
 
   void CreateClient2XpuConnection();
 
-  void SendAndRecvAsync(const platform::DeviceContext& ctx,
+  void SendAndRecvAsync(const phi::DeviceContext& ctx,
                         const framework::Scope& scope,
                         const std::string& message_name,
                         const std::vector<std::string>& send_var_name,
@@ -145,7 +145,7 @@ class HeterClient {
            void* data_ptr,
            int64_t data_size);
 
-  int Send(const platform::DeviceContext& ctx,
+  int Send(const phi::DeviceContext& ctx,
            const framework::Scope& scope,
            const std::string& message_name,
            const std::vector<std::string>& send_var_names);
@@ -155,7 +155,7 @@ class HeterClient {
            void* data_ptr,
            int64_t data_size);
 
-  int Recv(const platform::DeviceContext& ctx,
+  int Recv(const phi::DeviceContext& ctx,
            framework::Scope& recv_scope,  // NOLINT
            const std::string& message_name,
            const std::vector<std::string>& recv_var_names);
diff --git a/paddle/fluid/distributed/ps/service/heter_server.h b/paddle/fluid/distributed/ps/service/heter_server.h
@@ -80,14 +80,14 @@ class ServiceHandlerBase {
   virtual ~ServiceHandlerBase() {}
 
   void SetScope(const framework::Scope* scope) { scope_ = scope; }
-  void SetDevCtx(const platform::DeviceContext* dev_ctx) { dev_ctx_ = dev_ctx; }
+  void SetDevCtx(const phi::DeviceContext* dev_ctx) { dev_ctx_ = dev_ctx; }
 
   virtual int Handle(const MultiVarMsg* request,
                      MultiVarMsg* response,
                      brpc::Controller* cntl) = 0;
 
  protected:
-  const platform::DeviceContext* dev_ctx_;
+  const phi::DeviceContext* dev_ctx_;
   const framework::Scope* scope_;
 };
 
diff --git a/paddle/fluid/distributed/test/brpc_utils_test.cc b/paddle/fluid/distributed/test/brpc_utils_test.cc
@@ -28,7 +28,7 @@ namespace platform = paddle::platform;
 
 void CreateVarsOnScope(framework::Scope* scope,
                        phi::Place* place,
-                       const platform::DeviceContext& ctx) {
+                       const phi::DeviceContext& ctx) {
   // var 1
   framework::Variable* var1 = scope->Var("x1");
   auto* tensor1 = var1->GetMutable<phi::DenseTensor>();
diff --git a/paddle/fluid/operators/assign_op.h b/paddle/fluid/operators/assign_op.h
@@ -33,8 +33,7 @@ namespace paddle {
 namespace operators {
 class AssignFunctor {
  public:
-  AssignFunctor(framework::Variable *out,
-                const platform::DeviceContext &dev_ctx)
+  AssignFunctor(framework::Variable *out, const phi::DeviceContext &dev_ctx)
       : out_(out), dev_ctx_(dev_ctx) {}
 
   void operator()(const phi::DenseTensor &lod_tensor) const {
@@ -78,7 +77,7 @@ class AssignFunctor {
   }
 
   framework::Variable *out_;
-  const platform::DeviceContext &dev_ctx_;
+  const phi::DeviceContext &dev_ctx_;
 };
 
 }  // namespace operators
diff --git a/paddle/fluid/operators/controlflow/control_flow_op_helper.h b/paddle/fluid/operators/controlflow/control_flow_op_helper.h
@@ -66,7 +66,7 @@ static void AssignZeroToOutsideTensor(const phi::Place &place,
   VLOG(4) << "Assigning zero to " << outside_tensor;
   outside_tensor->Resize(input_tensor.dims());
   outside_tensor->mutable_data(place, input_tensor.dtype());
-  const platform::DeviceContext *dev_ctx =
+  const phi::DeviceContext *dev_ctx =
       phi::DeviceContextPool::Instance().Get(place);
   phi::funcs::set_constant(*dev_ctx, outside_tensor, 0.0f);
   outside_tensor->set_lod(input_tensor.lod());
@@ -165,8 +165,7 @@ static void AssignLocalGradientToParentScope(
       assign_zero_inputs.emplace_back(inputs[i]);
       continue;
     }
-    platform::DeviceContext *dev_ctx =
-        phi::DeviceContextPool::Instance().Get(place);
+    phi::DeviceContext *dev_ctx = phi::DeviceContextPool::Instance().Get(place);
     framework::VisitVarType(*inside_var, AssignFunctor(outside_var, *dev_ctx));
   }
   // Assign zero to the grad_vars that are in outside_grads but not in
diff --git a/paddle/fluid/operators/controlflow/while_op_helper.cc b/paddle/fluid/operators/controlflow/while_op_helper.cc
@@ -253,7 +253,7 @@ bool StrInVariableNameMap(const std::string &name,
 void TransferVariablePlace(const framework::Scope *scope,
                            const std::string &var_name,
                            const phi::Place &dst_place,
-                           const platform::DeviceContext &dev_ctx) {
+                           const phi::DeviceContext &dev_ctx) {
   framework::Variable *var = scope->FindVar(var_name);
   if (var == nullptr) {
     VLOG(4) << "[TransferVariablePlace]"
diff --git a/paddle/fluid/operators/controlflow/while_op_helper.h b/paddle/fluid/operators/controlflow/while_op_helper.h
@@ -62,7 +62,7 @@ bool StrInVariableNameMap(const std::string &,
 void TransferVariablePlace(const framework::Scope *scope,
                            const std::string &var_name,
                            const phi::Place &dst_place,
-                           const platform::DeviceContext &dev_ctx);
+                           const phi::DeviceContext &dev_ctx);
 
 }  // namespace operators
 }  // namespace paddle
diff --git a/paddle/fluid/operators/memcpy_d2h_op.h b/paddle/fluid/operators/memcpy_d2h_op.h
@@ -32,7 +32,7 @@ namespace operators {
 class MemcpyD2HFunctor {
  public:
   MemcpyD2HFunctor(framework::Variable *out,
-                   const platform::DeviceContext &dev_ctx,
+                   const phi::DeviceContext &dev_ctx,
                    const int dst_place_type)
       : out_(out), dev_ctx_(dev_ctx), dst_place_type_(dst_place_type) {}
 
@@ -90,7 +90,7 @@ class MemcpyD2HFunctor {
   }
 
   framework::Variable *out_;
-  const platform::DeviceContext &dev_ctx_;
+  const phi::DeviceContext &dev_ctx_;
   const int dst_place_type_;
 };
 
diff --git a/paddle/fluid/operators/memcpy_h2d_op.h b/paddle/fluid/operators/memcpy_h2d_op.h
@@ -33,7 +33,7 @@ namespace operators {
 class MemcpyH2DFunctor {
  public:
   MemcpyH2DFunctor(framework::Variable *out,
-                   const platform::DeviceContext &dev_ctx,
+                   const phi::DeviceContext &dev_ctx,
                    const int dst_place_type)
       : out_(out), dev_ctx_(dev_ctx), dst_place_type_(dst_place_type) {}
 
@@ -76,7 +76,7 @@ class MemcpyH2DFunctor {
 
  private:
   framework::Variable *out_;
-  const platform::DeviceContext &dev_ctx_;
+  const phi::DeviceContext &dev_ctx_;
   const int dst_place_type_;
 };
 
diff --git a/paddle/fluid/operators/memcpy_op.h b/paddle/fluid/operators/memcpy_op.h
@@ -44,7 +44,7 @@ class MemcpyFunctor {
 
  public:
   MemcpyFunctor(framework::Variable *out,
-                const platform::DeviceContext &dev_ctx,
+                const phi::DeviceContext &dev_ctx,
                 const int dst_place_type)
       : out_(out), dev_ctx_(dev_ctx), dst_place_type_(dst_place_type) {}
 
@@ -89,7 +89,7 @@ class MemcpyFunctor {
 
  private:
   framework::Variable *out_;
-  const platform::DeviceContext &dev_ctx_;
+  const phi::DeviceContext &dev_ctx_;
   const int dst_place_type_;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ void EagerGroup::ConcatTensors(const phi::Place &place) {`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`
`426`		`-void EagerGroup::SplitTensors(const platform::DeviceContext &context) {`
	`426`	`+void EagerGroup::SplitTensors(const phi::DeviceContext &context) {`
`427`	`427`	`auto place = context.GetPlace();`
`428`	`428`	`if (phi::is_gpu_place(place)) {`
`429`	`429`	`#if defined(PADDLE_WITH_NCCL) \|\| defined(PADDLE_WITH_RCCL)`