PaddlePaddle
diff --git a/‎paddle/fluid/framework/data_layout_transform.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/framework/data_layout_transform.h
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/framework/data_type_transform.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎paddle/fluid/framework/data_type_transform.cc
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎paddle/fluid/framework/details/op_handle_base.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/details/op_handle_base.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/details/op_handle_base.h
Copy file name to clipboard
+5-6Lines changed: 5 additions & 6 deletions b/‎paddle/fluid/framework/details/op_handle_base.h
Copy file name to clipboard
+5-6Lines changed: 5 additions & 6 deletions
diff --git a/‎paddle/fluid/framework/device_worker.h
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎paddle/fluid/framework/device_worker.h
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎paddle/fluid/framework/executor.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/executor.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/garbage_collector.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/garbage_collector.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/heter_section_worker.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/heter_section_worker.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/heterxpu_trainer.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/framework/heterxpu_trainer.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/framework/lod_tensor.cc
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎paddle/fluid/framework/lod_tensor.cc
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
@@ -30,15 +30,15 @@ namespace paddle {
 namespace framework {
 
 struct CastDataLayout {
-  CastDataLayout(const platform::DeviceContext* ctx,
+  CastDataLayout(const phi::DeviceContext* ctx,
                  const std::vector<int>& axis,
                  const phi::DenseTensor& in,
                  phi::DenseTensor* out)
       : in_(in), out_(out), ctx_(ctx), axis_(axis) {}
 
   const phi::DenseTensor in_;
   phi::DenseTensor* out_;
-  const platform::DeviceContext* ctx_;
+  const phi::DeviceContext* ctx_;
   const std::vector<int> axis_;
 
   template <typename T>
 
@@ -54,7 +54,7 @@ static void XPUTransDataType(
     const phi::DenseTensor& in,
     phi::DenseTensor* out,
     const paddle::framework::proto::VarType::Type& dst_type,
-    const platform::DeviceContext* ctx) {
+    const phi::DeviceContext* ctx) {
   auto* context = static_cast<const platform::XPUDeviceContext*>(ctx);
 
 #define XPUCastCallback(cpp_type, proto_type)          \
@@ -81,11 +81,11 @@ template <typename InType>
 struct CastDataType {
   CastDataType(const phi::DenseTensor& in,
                phi::DenseTensor* out,
-               const platform::DeviceContext* ctx)
+               const phi::DeviceContext* ctx)
       : in_(in), out_(out), ctx_(ctx) {}
   const phi::DenseTensor in_;
   phi::DenseTensor* out_;
-  const platform::DeviceContext* ctx_;
+  const phi::DeviceContext* ctx_;
 
   template <typename OutType>
   void apply() {
 
@@ -171,7 +171,7 @@ void OpHandleBase::Run(DeviceType use_device) {
   RunImpl();
 }
 
-void OpHandleBase::RecordWaitEventOnCtx(platform::DeviceContext *waited_ctx) {
+void OpHandleBase::RecordWaitEventOnCtx(phi::DeviceContext *waited_ctx) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
   PADDLE_ENFORCE_NOT_NULL(
       waited_ctx, phi::errors::InvalidArgument("Argument waited_ctx is NULL."));
 
@@ -71,8 +71,7 @@ class OpHandleBase {
 
   TEST_API void Run(DeviceType use_device);
 
-  TEST_API virtual void RecordWaitEventOnCtx(
-      platform::DeviceContext *waited_ctx);
+  TEST_API virtual void RecordWaitEventOnCtx(phi::DeviceContext *waited_ctx);
 
   TEST_API void AddInput(VarHandleBase *in);
 
@@ -89,15 +88,15 @@ class OpHandleBase {
   // will likely block other computations.
   virtual bool IsMultiDeviceTransfer() { return false; }
 
-  const platform::DeviceContext *DeviceContext(phi::Place place) {
+  const phi::DeviceContext *DeviceContext(phi::Place place) {
     auto it = dev_ctxes_.find(place);
     return it != dev_ctxes_.end() ? it->second : nullptr;
   }
-  const std::map<phi::Place, platform::DeviceContext *> &DeviceContext() {
+  const std::map<phi::Place, phi::DeviceContext *> &DeviceContext() {
     return dev_ctxes_;
   }
 
-  void SetDeviceContext(phi::Place place, platform::DeviceContext *ctx_) {
+  void SetDeviceContext(phi::Place place, phi::DeviceContext *ctx_) {
     dev_ctxes_[place] = ctx_;
   }
 
@@ -143,7 +142,7 @@ class OpHandleBase {
   ir::Node *node_;
   std::vector<VarHandleBase *> inputs_;
   std::vector<VarHandleBase *> outputs_;
-  std::map<phi::Place, platform::DeviceContext *> dev_ctxes_;
+  std::map<phi::Place, phi::DeviceContext *> dev_ctxes_;
 
   std::vector<Scope *> local_exec_scopes_;
   bool skip_running_ = false;
 
@@ -208,11 +208,11 @@ class DeviceWorker {
   virtual void SetReaderPlace(const phi::Place& place) {
     device_reader_->SetPlace(place);
   }
-  virtual void SetDeviceContext(platform::DeviceContext* dev_ctx) {
+  virtual void SetDeviceContext(phi::DeviceContext* dev_ctx) {
     dev_ctx_ = dev_ctx;
   }
 
-  virtual platform::DeviceContext* GetDeviceContext() { return dev_ctx_; }
+  virtual phi::DeviceContext* GetDeviceContext() { return dev_ctx_; }
 
   virtual void SetThreadNum(int thread_num) { thread_num_ = thread_num; }
 
@@ -247,7 +247,7 @@ class DeviceWorker {
   int dump_num_decimals_ = 9;
   ChannelWriter<std::string> writer_;
   const size_t tensor_iterator_thread_num = 16;
-  platform::DeviceContext* dev_ctx_ = nullptr;
+  phi::DeviceContext* dev_ctx_ = nullptr;
   int thread_num_;
 };
 
@@ -789,7 +789,7 @@ class SectionWorker : public DeviceWorker {
       unused_vars_;
   static uint64_t batch_id_;
 
-  platform::DeviceContext* dev_ctx_ = nullptr;
+  phi::DeviceContext* dev_ctx_ = nullptr;
 };
 #endif
 
@@ -873,7 +873,7 @@ class HeterSectionWorker : public DeviceWorker {
       thread_queue_;
   static uint64_t batch_id_;
   uint64_t total_ins_num_ = 0;
-  platform::DeviceContext* dev_ctx_ = nullptr;
+  phi::DeviceContext* dev_ctx_ = nullptr;
   bool debug_ = false;
   std::vector<double> op_total_time_;
   std::vector<std::string> op_name_;
 
@@ -60,7 +60,7 @@ struct TEST_API ExecutorPrepareContext {
 class TEST_API Executor {
  public:
   // TODO(dzhwinter) : Do not rely on this function, it will be removed
-  explicit Executor(const platform::DeviceContext& device)
+  explicit Executor(const phi::DeviceContext& device)
       : Executor(device.GetPlace()) {}
 
   explicit Executor(const phi::Place& place);
 
@@ -50,7 +50,7 @@ class GarbageCollector {
  protected:
   virtual void ClearCallback(const std::function<void()> &callback) = 0;
 
-  platform::DeviceContext *dev_ctx_;
+  phi::DeviceContext *dev_ctx_;
   std::unique_ptr<GarbageQueue> garbages_;
   mutable std::unique_ptr<std::mutex> mutex_;
   const size_t max_memory_size_;
 
@@ -24,7 +24,7 @@ namespace paddle {
 namespace framework {
 
 void SetMicroId(paddle::framework::Scope* scope,
-                platform::DeviceContext* dev_ctx,
+                phi::DeviceContext* dev_ctx,
                 const phi::Place& place,
                 int micro_id) {
   // create microbatch_id variable
 
@@ -363,7 +363,7 @@ int HeterXpuTrainer::EndPass(const HeterRequest* request,
         auto dev_id = place.device;
         phi::backends::xpu::XPUDeviceGuard guard(dev_id);
         phi::DeviceContextPool& pool = phi::DeviceContextPool::Instance();
-        platform::DeviceContext* dev_ctx = pool.Get(place);
+        phi::DeviceContext* dev_ctx = pool.Get(place);
         const platform::XPUDeviceContext* xpu_ctx =
             reinterpret_cast<const platform::XPUDeviceContext*>(dev_ctx);
         xpu::memset(
@@ -399,7 +399,7 @@ int HeterXpuTrainer::EndPass(const HeterRequest* request,
       auto dev_id = place.device;
       phi::backends::xpu::XPUDeviceGuard guard(dev_id);
       phi::DeviceContextPool& pool = phi::DeviceContextPool::Instance();
-      platform::DeviceContext* dev_ctx = pool.Get(place);
+      phi::DeviceContext* dev_ctx = pool.Get(place);
       const platform::XPUDeviceContext* xpu_ctx =
           reinterpret_cast<const platform::XPUDeviceContext*>(dev_ctx);
       xpu::memset(
 
@@ -204,7 +204,7 @@ LoDAndOffset GetSubLoDAndAbsoluteOffset(const LoD &lod,
 
 void SerializeToStream(std::ostream &os,
                        const phi::DenseTensor &tensor,
-                       const platform::DeviceContext &dev_ctx) {
+                       const phi::DeviceContext &dev_ctx) {
   {  // the 1st field, uint32_t version for DenseTensor
     os.write(
         reinterpret_cast<const char *>(&paddle::framework::kCurTensorVersion),
@@ -234,22 +234,22 @@ void SerializeToStream(std::ostream &os,
 
 void SerializeToStream(std::ostream &os, const phi::DenseTensor &tensor) {
   phi::DeviceContextPool &pool = phi::DeviceContextPool::Instance();
-  const platform::DeviceContext *dev_ctx = nullptr;
+  const phi::DeviceContext *dev_ctx = nullptr;
   auto place = tensor.place();
   dev_ctx = pool.Get(place);
   SerializeToStream(os, tensor, *dev_ctx);
 }
 
 void DeserializeFromStream(std::istream &os, phi::DenseTensor *tensor) {
   phi::DeviceContextPool &pool = phi::DeviceContextPool::Instance();
-  const platform::DeviceContext *dev_ctx = nullptr;
+  const phi::DeviceContext *dev_ctx = nullptr;
   dev_ctx = pool.Get(phi::CPUPlace());
   DeserializeFromStream(os, tensor, *dev_ctx);
 }
 
 void DeserializeFromStream(std::istream &is,
                            phi::DenseTensor *tensor,
-                           const platform::DeviceContext &dev_ctx,
+                           const phi::DeviceContext &dev_ctx,
                            const size_t &seek,
                            const std::vector<int64_t> &shape) {
   {
@@ -282,7 +282,7 @@ void DeserializeFromStream(std::istream &is,
 
 void DeserializeFromStream(std::istream &is,
                            phi::DenseTensor *tensor,
-                           const platform::DeviceContext &dev_ctx) {
+                           const phi::DeviceContext &dev_ctx) {
   {
     // the 1st field, unit32_t version for DenseTensor
     uint32_t version = 0;
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ void OpHandleBase::Run(DeviceType use_device) {`
`171`	`171`	`RunImpl();`
`172`	`172`	`}`
`173`	`173`
`174`		`-void OpHandleBase::RecordWaitEventOnCtx(platform::DeviceContext *waited_ctx) {`
	`174`	`+void OpHandleBase::RecordWaitEventOnCtx(phi::DeviceContext *waited_ctx) {`
`175`	`175`	`#if defined(PADDLE_WITH_CUDA) \|\| defined(PADDLE_WITH_HIP)`
`176`	`176`	`PADDLE_ENFORCE_NOT_NULL(`
`177`	`177`	`waited_ctx, phi::errors::InvalidArgument("Argument waited_ctx is NULL."));`