diff --git a/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc b/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc index 2eeb1e4d4bbaef..248877aa95d319 100644 --- a/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc +++ b/paddle/fluid/framework/new_executor/interpreter/interpreter_util.cc @@ -403,7 +403,7 @@ void ApplyDeviceGuard(const OperatorBase* op_base, auto& op_device = op_base->Attr("op_device"); if (op_device == "cpu" || phi::is_cpu_place(place)) { VLOG(3) << "Switch into CPUPlace by device_guard."; - expected_kernel_key->place_ = phi::CPUPlace(); + expected_kernel_key->place_ = CPUPlace(); } else if (op_device.find("gpu") != std::string::npos && phi::is_gpu_place(place)) { // when the Op that does not have GPUKernel is assigned to GPU, the @@ -412,7 +412,7 @@ void ApplyDeviceGuard(const OperatorBase* op_base, if (op_base->SupportGPU()) { expected_kernel_key->place_ = place; } else { - expected_kernel_key->place_ = phi::CPUPlace(); + expected_kernel_key->place_ = CPUPlace(); LOG_FIRST_N(WARNING, 1) << "Op(" << op_base->Type() << ") has no CUDA implementation. It will be assigned to CPUPlace."; @@ -427,7 +427,7 @@ void ApplyDeviceGuard(const OperatorBase* op_base, if (op_base->SupportXPU()) { expected_kernel_key->place_ = place; } else { - expected_kernel_key->place_ = phi::CPUPlace(); + expected_kernel_key->place_ = CPUPlace(); LOG_FIRST_N(WARNING, 1) << "Op(" << op_base->Type() << ") has no XPU implementation. It will be assigned to CPUPlace."; @@ -461,7 +461,7 @@ void ApplyDeviceGuard(const OperatorBase* op_base, if (op_base->SupportCustomDevice()) { expected_kernel_key->place_ = place; } else { - expected_kernel_key->place_ = phi::CPUPlace(); + expected_kernel_key->place_ = CPUPlace(); LOG_FIRST_N(WARNING, 1) << "Op(" << op_base->Type() << ") has no Custom Place implementation. It " "will be assigned to CPUPlace."; diff --git a/paddle/fluid/imperative/prepared_operator.cc b/paddle/fluid/imperative/prepared_operator.cc index c6cff099ba3001..1192d9d49ecf74 100644 --- a/paddle/fluid/imperative/prepared_operator.cc +++ b/paddle/fluid/imperative/prepared_operator.cc @@ -443,7 +443,7 @@ PreparedOp PrepareImpl( VLOG(6) << "Dynamic mode PrepareImpl - kernel name: " << phi_kernel_name << " | kernel key: " << phi_cpu_kernel_key << " | kernel: " << phi_cpu_kernel; - auto* cpu_ctx = pool.Get(phi::CPUPlace()); + auto* cpu_ctx = pool.Get(CPUPlace()); return PreparedOp(op, empty_ctx, phi_cpu_kernel_key, @@ -472,7 +472,7 @@ PreparedOp PrepareImpl( VLOG(3) << "fluid missing XPU kernel: " << op.Type() << ", expected_kernel_key:" << fluid_kernel_type << ", fallbacking to CPU one!"; - fluid_kernel_type.place_ = phi::CPUPlace(); + fluid_kernel_type.place_ = CPUPlace(); kernel_iter = kernels.find(fluid_kernel_type); } #endif @@ -496,7 +496,7 @@ PreparedOp PrepareImpl( VLOG(3) << "fluid missing XPU kernel: " << op.Type() << ", expected_kernel_key:" << fluid_kernel_type << ", fallbacking to CPU one!"; - fluid_kernel_type.place_ = phi::CPUPlace(); + fluid_kernel_type.place_ = CPUPlace(); kernel_iter = kernels.find(fluid_kernel_type); } } @@ -507,7 +507,7 @@ PreparedOp PrepareImpl( VLOG(3) << "missing IPU kernel: " << op.Type() << ", expected_kernel_key:" << fluid_kernel_type << ", fallbacking to CPU one!"; - fluid_kernel_type.place_ = phi::CPUPlace(); + fluid_kernel_type.place_ = CPUPlace(); kernel_iter = kernels.find(fluid_kernel_type); } #endif @@ -517,7 +517,7 @@ PreparedOp PrepareImpl( VLOG(3) << "missing " << place.GetDeviceType() << " kernel: " << op.Type() << ", expected_kernel_key:" << expected_kernel_key << ", fallbacking to CPU one!"; - fluid_kernel_type.place_ = phi::CPUPlace(); + fluid_kernel_type.place_ = CPUPlace(); kernel_iter = kernels.find(fluid_kernel_type); } #endif