Fix

Author: co63oc

paddle/cinn/ir/group_schedule/search/measurer.h

@@ -53,7 +53,7 @@ class Measurer {
   std::string compile_label_;
   std::string execute_label_;
   ::pir::Program* program_;
-  paddle::platform::Place place_ = paddle::platform::CUDAPlace(0);
+  phi::Place place_ = phi::GPUPlace(0);
   std::unique_ptr<pir::Program> kernel_program_;
   std::unique_ptr<paddle::framework::Scope> exe_scope_ =
       std::make_unique<paddle::framework::Scope>();

paddle/fluid/framework/compiled_program.cc

@@ -55,7 +55,7 @@ static std::unordered_set<std::string> ReaderOpSet() {
 
 class CompiledProgramPrivate {
  public:
-  CompiledProgramPrivate(const std::vector<platform::Place> &places,
+  CompiledProgramPrivate(const std::vector<phi::Place> &places,
                          Scope *global_scope)
       : places_(places), global_scope_(global_scope) {}
 
@@ -314,7 +314,7 @@ class CompiledProgramPrivate {
 #endif
 
   BuildStrategy build_strategy_;
-  std::vector<platform::Place> places_;
+  std::vector<phi::Place> places_;
   std::vector<Scope *> local_scopes_;
   Scope *global_scope_;  // not owned
 
@@ -497,7 +497,7 @@ std::vector<Scope *> &CompiledProgram::GetLocalScopes() {
   return member_->local_scopes_;
 }
 
-void InitP2P(const std::vector<platform::Place> &places) {
+void InitP2P(const std::vector<phi::Place> &places) {
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
   std::call_once(p2p_init_flag, [&]() {
     int count = places.size();
@@ -541,7 +541,7 @@ void InitP2P(const std::vector<platform::Place> &places) {
 #endif
 }
 
-CompiledProgram::CompiledProgram(const std::vector<platform::Place> &places,
+CompiledProgram::CompiledProgram(const std::vector<phi::Place> &places,
                                  const std::vector<std::string> &bcast_vars,
                                  const std::string &loss_var_name,
                                  Scope *scope,

paddle/fluid/framework/compiled_program.h

@@ -45,7 +45,7 @@ class CompiledProgram {
   DISABLE_COPY_AND_ASSIGN(CompiledProgram);
 
  public:
-  TEST_API explicit CompiledProgram(const std::vector<platform::Place> &places,
+  TEST_API explicit CompiledProgram(const std::vector<phi::Place> &places,
                                     const std::vector<std::string> &bcast_vars,
                                     const std::string &loss_var_name,
                                     Scope *scope,

paddle/fluid/framework/custom_operator.cc

@@ -896,7 +896,7 @@ static void RegisterOperatorKernelWithPlace(
     const std::string& name,
     const OperatorWithKernel::OpKernelFunc& op_kernel_func,
     const proto::VarType::Type type,
-    const platform::Place& place) {
+    const phi::Place& place) {
   OpKernelType key(type, place);
   VLOG(3) << "Custom Operator: op kernel key: " << key;
   OperatorWithKernel::AllOpKernels()[name][key] = op_kernel_func;

paddle/fluid/framework/data_device_transform.h

@@ -22,7 +22,7 @@ namespace paddle {
 namespace framework {
 
 void TransDataDevice(const phi::DenseTensor& in,
-                     const platform::Place& dst_place,
+                     const phi::Place& dst_place,
                      phi::DenseTensor* out);
 
 }  // namespace framework

paddle/fluid/framework/device_worker.h

@@ -271,7 +271,7 @@ class HogwildWorker : public CPUWorkerBase {
     std::vector<std::pair<std::string, std::string>> cast_vars;
     template <typename TCopyer>
     void CopyInputs(const Scope* root,
-                    const platform::Place& place,
+                    const phi::Place& place,
                     Scope* scope,
                     TCopyer* copyer);
     template <typename TCopyer>
@@ -630,7 +630,7 @@ class PSGPUWorker : public HogwildWorker {
 
   int OpRunAndShapeCheck(OperatorBase& op,  // NOLINT
                          const Scope& scope,
-                         const platform::Place& place);
+                         const phi::Place& place);
 
  private:
   int mpi_rank_;
@@ -736,7 +736,7 @@ class SectionWorker : public DeviceWorker {
 
   void PrintFetchVars() override {}
 
-  const platform::Place& place() const { return place_; }
+  const phi::Place& place() const { return place_; }
 
   void SetDeviceIndex(int tid UNUSED) override {}
   void SetThreadIndex(int thread_id) { thread_id_ = thread_id; }
@@ -808,7 +808,7 @@ class HeterSectionWorker : public DeviceWorker {
   void BindingDataFeedMemory() override {}
   void BindingDataFeedMemory(int micro_id);
   void PrintFetchVars() override;
-  const platform::Place& place() const { return place_; }
+  const phi::Place& place() const { return place_; }
 
   void SetDeviceIndex(int tid) override { thread_id_ = tid; }
   // void SetThreadNum(int thread_num) { thread_num_ = thread_num; }
@@ -831,7 +831,7 @@ class HeterSectionWorker : public DeviceWorker {
   }
   void CopyParameters(int microbatch_id,
                       const ProgramDesc& program,
-                      const platform::Place& place);
+                      const phi::Place& place);
   void SetMinibatchScope(Scope* scope) { minibatch_scope_ = scope; }
   void SetTrainerId(int trainer_id) { this->trainer_id_ = trainer_id; }
   void SetTrainers(int trainers) { this->trainers_ = trainers; }

paddle/fluid/framework/downpour_lite_worker.cc

@@ -427,7 +427,7 @@ void DownpourLiteWorker::TrainFilesWithProfiler() {
 /**
  * @brief add auc monitor
  */
-inline void AddAucMonitor(const Scope* scope, const platform::Place& place) {
+inline void AddAucMonitor(const Scope* scope, const phi::Place& place) {
   auto metric_ptr = Metric::GetInstance();
   auto& metric_list = metric_ptr->GetMetricList();
   for (auto& metric_item : metric_list) {

paddle/fluid/framework/downpour_worker.cc

@@ -787,7 +787,7 @@ void DownpourWorker::TrainFilesWithProfiler() {
 /**
  * @brief add auc monitor
  */
-inline void AddAucMonitor(const Scope* scope, const platform::Place& place) {
+inline void AddAucMonitor(const Scope* scope, const phi::Place& place) {
   auto metric_ptr = Metric::GetInstance();
   auto& metric_list = metric_ptr->GetMetricList();
   for (auto iter = metric_list.begin(); iter != metric_list.end(); iter++) {

paddle/fluid/framework/executor.cc

@@ -66,7 +66,7 @@ ExecutorPrepareContext::~ExecutorPrepareContext() {
   VLOG(5) << "destroy ExecutorPrepareContext";
 }
 
-Executor::Executor(const platform::Place& place) : place_(place) {}
+Executor::Executor(const phi::Place& place) : place_(place) {}
 
 Executor::~Executor() {
 #ifdef PADDLE_WITH_DNNL

paddle/fluid/framework/executor.h

@@ -63,7 +63,7 @@ class TEST_API Executor {
   explicit Executor(const platform::DeviceContext& device)
       : Executor(device.GetPlace()) {}
 
-  explicit Executor(const platform::Place& place);
+  explicit Executor(const phi::Place& place);
 
   ~Executor();
   /*