Skip to content

P
Paddle

PaddlePaddle / Paddle
大约 2 年 前同步成功

通知 2325
Star 20933
Fork 5424
P
Paddle
未验证 提交 942ff89f 编写于 作者: W Weilong Wu 提交者： GitHub
浏览文件
操作

[Phi] polish and rename, pt* -> phi* (#44697) 

* polish and rename, pt* -> phi*

* fix code format
上级 d985b4b1
显示空白变更内容
内联 并排
Showing with 844 addition and 840 deletion
paddle/fluid/framework/new_executor/interpretercore.cc
浏览文件 @ 942ff89f
......@@ -621,13 +621,13 @@ void InterpreterCore::RunInstruction(const Instruction& instr_node) {
VLOG(4) << "Run phi kernel: " << op->Type();
VLOG(4) << instr_node.InnerRuntimeContext().get() << " "
<< &instr_node.DeviceContext();
phi::KernelContext pt_kernel_context;
phi::KernelContext phi_kernel_context;
op_with_kernel->BuildPhiKernelContext(
*instr_node.InnerRuntimeContext().get(),
const_cast<platform::DeviceContext*>(&instr_node.DeviceContext()),
&pt_kernel_context);
&phi_kernel_context);
(*instr_node.PhiKernel())(&pt_kernel_context);
(*instr_node.PhiKernel())(&phi_kernel_context);
} else {
instr_node.KernelFunc()(*instr_node.InnerExecutionContext().get());
......
paddle/fluid/framework/new_executor/interpretercore_util.cc
浏览文件 @ 942ff89f
......@@ -513,25 +513,25 @@ void build_op_func_list(const platform::Place& place,
auto run_phi_kernel = false;
if (phi::KernelFactory::Instance().HasCompatiblePhiKernel(
op_with_kernel->Type())) {
auto pt_kernel_key = op_with_kernel->ChoosePhiKernel(exec_ctx);
auto pt_kernel_name = op_with_kernel->PhiKernelSignature()->name;
auto phi_kernel_key = op_with_kernel->ChoosePhiKernel(exec_ctx);
auto phi_kernel_name = op_with_kernel->PhiKernelSignature()->name;
if (op_with_kernel->PhiKernel()->IsValid()) {
run_phi_kernel = true;
} else {
if (!op_with_kernel->SupportsKernelType(expected_kernel_key)) {
auto pt_cpu_kernel_key = FallBackToCpu(
expected_kernel_key, pt_kernel_key, *op_with_kernel);
auto phi_cpu_kernel_key = FallBackToCpu(
expected_kernel_key, phi_kernel_key, *op_with_kernel);
op_with_kernel->ResetPhiKernel(
new phi::Kernel(phi::KernelFactory::Instance().SelectKernel(
pt_kernel_name, pt_cpu_kernel_key)));
phi_kernel_name, phi_cpu_kernel_key)));
if (op_with_kernel->PhiKernel()->IsValid()) {
VLOG(6) << "Static mode PrepareImpl - kernel name: "
<< pt_kernel_name
<< " | kernel key: " << pt_cpu_kernel_key
<< phi_kernel_name
<< " | kernel key: " << phi_cpu_kernel_key
<< " | kernel: " << *(op_with_kernel->PhiKernel());
op_with_kernel->ResetKernelType(new OpKernelType(
TransPhiKernelKeyToOpKernelType(pt_cpu_kernel_key)));
TransPhiKernelKeyToOpKernelType(phi_cpu_kernel_key)));
run_phi_kernel = true;
}
}
......@@ -541,7 +541,7 @@ void build_op_func_list(const platform::Place& place,
op_with_kernel->ChooseKernel(exec_ctx);
op_func_node.kernel_func_ = *op_with_kernel->kernel_func();
} else {
op_func_node.pt_kernel_ = op_with_kernel->PhiKernel();
op_func_node.phi_kernel_ = op_with_kernel->PhiKernel();
}
auto kernel_type = *(op_with_kernel->kernel_type());
if (kernel_type.place_ != dev_ctx->GetPlace()) {
......@@ -583,10 +583,10 @@ void build_op_func_list(const platform::Place& place,
// step 5. run kernel
if (run_phi_kernel) {
phi::KernelContext pt_kernel_context;
phi::KernelContext phi_kernel_context;
op_with_kernel->BuildPhiKernelContext(
runtime_context, dev_ctx, &pt_kernel_context);
(*op_func_node.pt_kernel_)(&pt_kernel_context);
runtime_context, dev_ctx, &phi_kernel_context);
(*op_func_node.phi_kernel_)(&phi_kernel_context);
} else {
// the place of exec_ctx maybe has changed.
op_func_node.kernel_func_(ExecutionContext(
......
paddle/fluid/framework/new_executor/new_executor_defs.cc
浏览文件 @ 942ff89f
......@@ -705,7 +705,9 @@ OpKernelComputeFunc Instruction::KernelFunc() const {
return op_func_node_.kernel_func_;
}
phi::Kernel* Instruction::PhiKernel() const { return op_func_node_.pt_kernel_; }
phi::Kernel* Instruction::PhiKernel() const {
return op_func_node_.phi_kernel_;
}
OpFuncType Instruction::KernelType() const { return op_func_node_.type_; }
......
paddle/fluid/framework/new_executor/new_executor_defs.h
浏览文件 @ 942ff89f
......@@ -283,7 +283,7 @@ struct OpFuncNode {
platform::DeviceContext* dev_ctx_; // not owned
// fit for phi kernel
phi::Kernel* pt_kernel_{nullptr}; // not owned
phi::Kernel* phi_kernel_{nullptr}; // not owned
OpFuncType type_;
};
......
paddle/fluid/framework/operator.cc
浏览文件 @ 942ff89f
......@@ -1421,7 +1421,7 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
!need_prepare_phi_data_) {
if (!all_kernels_must_compute_runtime_shape_)
this->Info().infer_shape_(impl_->getRuntimeInferShapeContext());
(*pt_kernel_)(impl_->getKernelContext());
(*phi_kernel_)(impl_->getKernelContext());
} else {
if (runtime_ctx_.get() == nullptr || pre_scope_ != cur_scope) {
std::lock_guard<std::mutex> lock(cache_update_mutex_);
......@@ -1467,10 +1467,10 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
// TODO(chenweihang): in the first phase of project, we only support CPU, CUDA
// and RCOM backend, the XPU, NPU and MKLDNN will be supported in the second
// phase
phi::KernelKey pt_kernel_key;
std::string pt_kernel_name;
phi::KernelKey phi_kernel_key;
std::string phi_kernel_name;
if (phi::KernelFactory::Instance().HasCompatiblePhiKernel(type_)) {
if (kernel_signature_ == nullptr || pt_kernel_ == nullptr) {
if (kernel_signature_ == nullptr || phi_kernel_ == nullptr) {
kernel_signature_.reset(new phi::KernelSignature(
std::move(GetExpectedPhiKernelArgs(exe_ctx))));
VLOG(6) << *kernel_signature_.get();
......@@ -1479,7 +1479,7 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
new OpKernelType(std::move(InnerGetExpectedKernelType(exe_ctx))));
dev_ctx = pool.Get(kernel_type_->place_);
pt_kernel_name = kernel_signature_->name;
phi_kernel_name = kernel_signature_->name;
// NOTE(Liu-xiandong): The register kernel used KP have library_type[KP],
// But the default library_type is Plain, so we need to modify the
// library_type here, otherwise it can't work.
......@@ -1502,38 +1502,38 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
auto expected_kernel_key_library_type = kernel_type_->library_type_;
kernel_type_->library_type_ = LibraryType::kKP;
VLOG(3) << "modifing XPU KP kernel in static graph: "
<< pt_kernel_name
<< phi_kernel_name
<< ", using_kernel_key:" << *kernel_type_.get();
auto try_pt_kernel_key =
auto try_phi_kernel_key =
TransOpKernelTypeToPhiKernelKey(*kernel_type_.get());
if (!phi::KernelFactory::Instance().HasKernel(pt_kernel_name,
try_pt_kernel_key)) {
if (!phi::KernelFactory::Instance().HasKernel(phi_kernel_name,
try_phi_kernel_key)) {
kernel_type_->library_type_ = expected_kernel_key_library_type;
VLOG(3) << "modify XPU KP kernel in static graph: "
<< pt_kernel_name << " is failed " << *kernel_type_.get();
<< phi_kernel_name << " is failed " << *kernel_type_.get();
} else {
use_phi_xpu_kp = true;
VLOG(3) << "modify XPU KP kernel in static graph: "
<< pt_kernel_name << " is succeed " << *kernel_type_.get();
<< phi_kernel_name << " is succeed " << *kernel_type_.get();
}
}
}
#endif
pt_kernel_key = TransOpKernelTypeToPhiKernelKey(*kernel_type_.get());
pt_kernel_.reset(
phi_kernel_key = TransOpKernelTypeToPhiKernelKey(*kernel_type_.get());
phi_kernel_.reset(
new phi::Kernel(phi::KernelFactory::Instance().SelectKernel(
pt_kernel_name, pt_kernel_key)));
phi_kernel_name, phi_kernel_key)));
if (pt_kernel_->IsValid()) {
if (phi_kernel_->IsValid()) {
VLOG(6) << "Static mode ChoosePhiKernel - kernel name: "
<< pt_kernel_name << " | kernel key: " << pt_kernel_key
<< " | kernel: " << *pt_kernel_;
<< phi_kernel_name << " | kernel key: " << phi_kernel_key
<< " | kernel: " << *phi_kernel_;
} else {
VLOG(6) << "Static mode ChoosePhiKernel - kernel `" << pt_kernel_name
VLOG(6) << "Static mode ChoosePhiKernel - kernel `" << phi_kernel_name
<< "` not found.";
}
} else {
pt_kernel_name = kernel_signature_->name;
phi_kernel_name = kernel_signature_->name;
// NOTE(Liu-xiandong):In my ctest, this branch do not be executed,
// I can't understand it, it's really confusing.
// But we still need to keep this to avoid errors.
......@@ -1556,24 +1556,24 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
auto expected_kernel_key_library_type = kernel_type_->library_type_;
kernel_type_->library_type_ = LibraryType::kKP;
VLOG(3) << "modifing XPU KP kernel in static graph: "
<< pt_kernel_name
<< phi_kernel_name
<< ", using_kernel_key:" << *kernel_type_.get();
auto try_pt_kernel_key =
auto try_phi_kernel_key =
TransOpKernelTypeToPhiKernelKey(*kernel_type_.get());
if (!phi::KernelFactory::Instance().HasKernel(pt_kernel_name,
try_pt_kernel_key)) {
if (!phi::KernelFactory::Instance().HasKernel(phi_kernel_name,
try_phi_kernel_key)) {
kernel_type_->library_type_ = expected_kernel_key_library_type;
VLOG(3) << "modify XPU KP kernel in static graph: "
<< pt_kernel_name << " is failed " << *kernel_type_.get();
<< phi_kernel_name << " is failed " << *kernel_type_.get();
} else {
use_phi_xpu_kp = true;
VLOG(3) << "modify XPU KP kernel in static graph: "
<< pt_kernel_name << " is succeed " << *kernel_type_.get();
<< phi_kernel_name << " is succeed " << *kernel_type_.get();
}
}
}
#endif
pt_kernel_key = TransOpKernelTypeToPhiKernelKey(*kernel_type_.get());
phi_kernel_key = TransOpKernelTypeToPhiKernelKey(*kernel_type_.get());
}
// NOTE(Liu-xiandong): Determine whether the selected kernel is valid
......@@ -1596,7 +1596,7 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
bool is_xpu_kp_support = (use_xpu_kp_kernel_rt || use_xpu_kp_kernel_debug);
#endif
if (pt_kernel_->IsValid()
if (phi_kernel_->IsValid()
#if defined(PADDLE_WITH_XPU) && !defined(PADDLE_WITH_XPU_KP)
&& !is_xpu_unsupport
#endif
......@@ -1628,17 +1628,17 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
|| (is_xpu_unsupport && !is_xpu_kp_support)
#endif
) {
auto pt_cpu_kernel_key =
FallBackToCpu(*kernel_type_.get(), pt_kernel_key, *this);
pt_kernel_.reset(
auto phi_cpu_kernel_key =
FallBackToCpu(*kernel_type_.get(), phi_kernel_key, *this);
phi_kernel_.reset(
new phi::Kernel(phi::KernelFactory::Instance().SelectKernel(
pt_kernel_name, pt_cpu_kernel_key)));
phi_kernel_name, phi_cpu_kernel_key)));
dev_ctx = pool.Get(platform::CPUPlace());
if (pt_kernel_->IsValid()) {
VLOG(6) << "Static mode PrepareImpl - kernel name: " << pt_kernel_name
<< " | kernel key: " << pt_cpu_kernel_key
<< " | kernel: " << *pt_kernel_;
if (phi_kernel_->IsValid()) {
VLOG(6) << "Static mode PrepareImpl - kernel name: "
<< phi_kernel_name << " | kernel key: " << phi_cpu_kernel_key
<< " | kernel: " << *phi_kernel_;
run_phi_kernel_ = true;
}
}
......@@ -1692,20 +1692,20 @@ void OperatorWithKernel::RunImpl(const Scope& scope,
1,
platform::EventRole::kInnerOp);
if (run_phi_kernel_) {
phi::KernelContext pt_kernel_context;
phi::KernelContext phi_kernel_context;
if (enable_cache_runtime_context_ && !need_prepare_phi_data_ &&
!need_prepare_data_) {
impl_ =
new CacheImpl(new phi::KernelContext(),
new RuntimeInferShapeContext(*this, *runtime_ctx));
BuildPhiKernelContext(*runtime_ctx, dev_ctx, impl_->getKernelContext());
(*pt_kernel_)(impl_->getKernelContext());
(*phi_kernel_)(impl_->getKernelContext());
} else {
phi::KernelContext pt_kernel_context;
phi::KernelContext phi_kernel_context;
// Do data transform before building KernelContext
// TODO(zhiqiu): support TransferInplaceVarsBack
BuildPhiKernelContext(*runtime_ctx, dev_ctx, &pt_kernel_context);
(*pt_kernel_)(&pt_kernel_context);
BuildPhiKernelContext(*runtime_ctx, dev_ctx, &phi_kernel_context);
(*phi_kernel_)(&phi_kernel_context);
}
} else {
(*kernel_func_)(
......@@ -1851,20 +1851,20 @@ phi::KernelKey OperatorWithKernel::ChoosePhiKernel(
kernel_type_.reset(
new OpKernelType(std::move(InnerGetExpectedKernelType(ctx))));
auto pt_kernel_name = kernel_signature_->name;
auto pt_kernel_key = TransOpKernelTypeToPhiKernelKey(*kernel_type_.get());
pt_kernel_.reset(new phi::Kernel(phi::KernelFactory::Instance().SelectKernel(
pt_kernel_name, pt_kernel_key)));
auto phi_kernel_name = kernel_signature_->name;
auto phi_kernel_key = TransOpKernelTypeToPhiKernelKey(*kernel_type_.get());
phi_kernel_.reset(new phi::Kernel(phi::KernelFactory::Instance().SelectKernel(
phi_kernel_name, phi_kernel_key)));
if (pt_kernel_->IsValid()) {
VLOG(6) << "Static mode ChoosePhiKernel - kernel name: " << pt_kernel_name
<< " | kernel key: " << pt_kernel_key
<< " | kernel: " << *pt_kernel_;
if (phi_kernel_->IsValid()) {
VLOG(6) << "Static mode ChoosePhiKernel - kernel name: " << phi_kernel_name
<< " | kernel key: " << phi_kernel_key
<< " | kernel: " << *phi_kernel_;
} else {
VLOG(6) << "Static mode ChoosePhiKernel - kernel `" << pt_kernel_name
VLOG(6) << "Static mode ChoosePhiKernel - kernel `" << phi_kernel_name
<< "` not found.";
}
return pt_kernel_key;
return phi_kernel_key;
}
void OperatorWithKernel::ChooseKernel(const ExecutionContext& ctx) const {
......@@ -2302,7 +2302,7 @@ Scope* OperatorWithKernel::PrepareData(
if (run_phi_kernel_) {
const auto& input_names = kernel_signature_->input_names;
const auto& input_defs = pt_kernel_->args_def().input_defs();
const auto& input_defs = phi_kernel_->args_def().input_defs();
PADDLE_ENFORCE_EQ(input_names.size(),
input_defs.size(),
platform::errors::InvalidArgument(
......@@ -2311,7 +2311,7 @@ Scope* OperatorWithKernel::PrepareData(
input_names.size(),
input_defs.size()));
for (size_t i = 0; i < input_defs.size(); ++i) {
const auto& input_defs = pt_kernel_->args_def().input_defs();
const auto& input_defs = phi_kernel_->args_def().input_defs();
auto& in_def = input_defs.at(i);
std::string input_name = input_names[i];
auto iter = ctx->inputs.find(input_name);
......@@ -2577,16 +2577,16 @@ phi::KernelSignature OperatorWithKernel::GetExpectedPhiKernelArgs(
void OperatorWithKernel::BuildPhiKernelContext(
const RuntimeContext& ctx,
platform::DeviceContext* dev_ctx,
phi::KernelContext* pt_kernel_context) const {
pt_kernel_context->SetDeviceContext(dev_ctx);
phi::KernelContext* phi_kernel_context) const {
phi_kernel_context->SetDeviceContext(dev_ctx);
auto& input_names = kernel_signature_->input_names;
auto& attr_names = kernel_signature_->attr_names;
auto& output_names = kernel_signature_->output_names;
auto input_defs = pt_kernel_->args_def().input_defs();
auto attr_defs = pt_kernel_->args_def().attribute_defs();
auto output_defs = pt_kernel_->args_def().output_defs();
auto input_defs = phi_kernel_->args_def().input_defs();
auto attr_defs = phi_kernel_->args_def().attribute_defs();
auto output_defs = phi_kernel_->args_def().output_defs();
PADDLE_ENFORCE_EQ(input_names.size(),
input_defs.size(),
......@@ -2617,7 +2617,7 @@ void OperatorWithKernel::BuildPhiKernelContext(
// calcute the start and end index of the input tensors
size_t start_idx =
(i == 0 ? 0 : pt_kernel_context->InputRangeAt(i - 1).second);
(i == 0 ? 0 : phi_kernel_context->InputRangeAt(i - 1).second);
// deal with optional here
if ((it == ctx.inputs.end() || it->second.size() == 0) &&
(input_defs[i].type_index ==
......@@ -2627,9 +2627,9 @@ void OperatorWithKernel::BuildPhiKernelContext(
input_defs[i].type_index ==
std::type_index(typeid(
paddle::optional<std::vector<const phi::DenseTensor*>>)))) {
pt_kernel_context->EmplaceBackInputWithoutSetRange(nullptr);
phi_kernel_context->EmplaceBackInputWithoutSetRange(nullptr);
auto end_idx = start_idx + 1;
pt_kernel_context->AssignInputRange(std::make_pair(start_idx, end_idx),
phi_kernel_context->AssignInputRange(std::make_pair(start_idx, end_idx),
i);
continue;
......@@ -2641,10 +2641,10 @@ void OperatorWithKernel::BuildPhiKernelContext(
auto* var = ins_vector[offset];
if (var->IsType<framework::LoDTensor>()) {
tensor_in = &(var->Get<framework::LoDTensor>());
pt_kernel_context->EmplaceBackInputWithoutSetRange(tensor_in);
phi_kernel_context->EmplaceBackInputWithoutSetRange(tensor_in);
} else if (var->IsType<phi::SelectedRows>()) {
tensor_in = &(var->Get<phi::SelectedRows>());
pt_kernel_context->EmplaceBackInputWithoutSetRange(tensor_in);
phi_kernel_context->EmplaceBackInputWithoutSetRange(tensor_in);
} else if (var->IsType<framework::LoDTensorArray>()) {
need_prepare_phi_data_ = true;
paddle::small_vector<const phi::TensorBase*> tensor_vector;
......@@ -2652,7 +2652,7 @@ void OperatorWithKernel::BuildPhiKernelContext(
for (auto& t : tensor_array) {
tensor_vector.emplace_back(&t);
}
pt_kernel_context->EmplaceBackInputsWithoutSetRange(tensor_vector);
phi_kernel_context->EmplaceBackInputsWithoutSetRange(tensor_vector);
end_idx += tensor_array.size() - 1;
} else {
PADDLE_THROW(platform::errors::Unimplemented(
......@@ -2661,23 +2661,23 @@ void OperatorWithKernel::BuildPhiKernelContext(
}
}
// Note: here cannot deal with vector<LoDTensorArray> input
pt_kernel_context->AssignInputRange(std::make_pair(start_idx, end_idx), i);
phi_kernel_context->AssignInputRange(std::make_pair(start_idx, end_idx), i);
}
VLOG(4) << "Done inputs";
for (size_t i = 0; i < output_names.size(); ++i) {
auto it = ctx.outputs.find(output_names[i]);
size_t start_idx =
(i == 0 ? 0 : pt_kernel_context->OutputRangeAt(i - 1).second);
(i == 0 ? 0 : phi_kernel_context->OutputRangeAt(i - 1).second);
if (it == ctx.outputs.end() || it->second.empty()) {
// Deal with the case that some outputs are not found or be NULL when run
// the kernel.
// For example : the outputs of matmul_grad are dx and dy,
// sometimes dx or dy may be NULL.
pt_kernel_context->EmplaceBackOutputWithoutSetRange(nullptr);
phi_kernel_context->EmplaceBackOutputWithoutSetRange(nullptr);
auto end_idx = start_idx + 1;
pt_kernel_context->AssignOutputRange(std::make_pair(start_idx, end_idx),
phi_kernel_context->AssignOutputRange(std::make_pair(start_idx, end_idx),
i);
continue;
}
......@@ -2691,10 +2691,10 @@ void OperatorWithKernel::BuildPhiKernelContext(
if (var) {
if (var->template IsType<framework::LoDTensor>()) {
tensor_out = var->template GetMutable<framework::LoDTensor>();
pt_kernel_context->EmplaceBackOutputWithoutSetRange(tensor_out);
phi_kernel_context->EmplaceBackOutputWithoutSetRange(tensor_out);
} else if (var->template IsType<phi::SelectedRows>()) {
tensor_out = var->template GetMutable<phi::SelectedRows>();
pt_kernel_context->EmplaceBackOutputWithoutSetRange(tensor_out);
phi_kernel_context->EmplaceBackOutputWithoutSetRange(tensor_out);
} else if (var->template IsType<framework::LoDTensorArray>()) {
paddle::small_vector<phi::TensorBase*> tensor_vector;
auto* tensor_array =
......@@ -2704,7 +2704,7 @@ void OperatorWithKernel::BuildPhiKernelContext(
for (auto& t : *tensor_array) {
tensor_vector.emplace_back(&t);
}
pt_kernel_context->EmplaceBackOutputsWithoutSetRange(tensor_vector);
phi_kernel_context->EmplaceBackOutputsWithoutSetRange(tensor_vector);
end_idx += tensor_array->size() - 1;
} else {
PADDLE_THROW(platform::errors::Unimplemented(
......@@ -2712,10 +2712,11 @@ void OperatorWithKernel::BuildPhiKernelContext(
framework::ToTypeName(var->Type())));
}
} else {
pt_kernel_context->EmplaceBackOutputWithoutSetRange(tensor_out);
phi_kernel_context->EmplaceBackOutputWithoutSetRange(tensor_out);
}
}
pt_kernel_context->AssignOutputRange(std::make_pair(start_idx, end_idx), i);
phi_kernel_context->AssignOutputRange(std::make_pair(start_idx, end_idx),
i);
}
VLOG(4) << "Done outputs";
......@@ -2729,15 +2730,15 @@ void OperatorWithKernel::BuildPhiKernelContext(
// scalar is in the attribute
switch (AttrTypeID(attr_iter->second)) {
case proto::AttrType::FLOAT:
pt_kernel_context->EmplaceBackAttr(std::move(
phi_kernel_context->EmplaceBackAttr(std::move(
phi::Scalar(PADDLE_GET_CONST(float, attr_iter->second))));
break;
case proto::AttrType::INT:
pt_kernel_context->EmplaceBackAttr(std::move(
phi_kernel_context->EmplaceBackAttr(std::move(
phi::Scalar(PADDLE_GET_CONST(int, attr_iter->second))));
break;
case proto::AttrType::STRING:
pt_kernel_context->EmplaceBackAttr(std::move(phi::Scalar(
phi_kernel_context->EmplaceBackAttr(std::move(phi::Scalar(
PADDLE_GET_CONST(std::string, attr_iter->second))));
break;
default:
......@@ -2749,7 +2750,7 @@ void OperatorWithKernel::BuildPhiKernelContext(
} else { // scalar is in the input
need_prepare_phi_data_ = true;
auto& ins_vector = ctx.inputs.at(attr_names[i]);
pt_kernel_context->EmplaceBackAttr(std::move(
phi_kernel_context->EmplaceBackAttr(std::move(
experimental::MakePhiScalarFromVar(*ins_vector.front())));
}
break;
......@@ -2757,19 +2758,19 @@ void OperatorWithKernel::BuildPhiKernelContext(
if (attr_iter != Attrs().end()) {
switch (AttrTypeID(attr_iter->second)) {
case proto::AttrType::INTS:
pt_kernel_context->EmplaceBackAttr(std::move(phi::IntArray(
phi_kernel_context->EmplaceBackAttr(std::move(phi::IntArray(
PADDLE_GET_CONST(std::vector<int32_t>, attr_iter->second))));
break;
case proto::AttrType::LONGS:
pt_kernel_context->EmplaceBackAttr(std::move(phi::IntArray(
phi_kernel_context->EmplaceBackAttr(std::move(phi::IntArray(
PADDLE_GET_CONST(std::vector<int64_t>, attr_iter->second))));
break;
case proto::AttrType::INT:
pt_kernel_context->EmplaceBackAttr(std::move(phi::IntArray(
phi_kernel_context->EmplaceBackAttr(std::move(phi::IntArray(
&PADDLE_GET_CONST(int32_t, attr_iter->second), 1)));
break;
case proto::AttrType::LONG:
pt_kernel_context->EmplaceBackAttr(std::move(phi::IntArray(
phi_kernel_context->EmplaceBackAttr(std::move(phi::IntArray(
&PADDLE_GET_CONST(int64_t, attr_iter->second), 1)));
break;
default:
......@@ -2782,10 +2783,10 @@ void OperatorWithKernel::BuildPhiKernelContext(
need_prepare_phi_data_ = true;
auto& ins_vector = ctx.inputs.at(attr_names[i]);
if (ins_vector.size() == 1) { // ShapeTensor
pt_kernel_context->EmplaceBackAttr(std::move(
phi_kernel_context->EmplaceBackAttr(std::move(
experimental::MakePhiIntArrayFromVar(*ins_vector.front())));
} else { // ShapeTensorList
pt_kernel_context->EmplaceBackAttr(std::move(
phi_kernel_context->EmplaceBackAttr(std::move(
experimental::MakePhiIntArrayFromVarList(ins_vector)));
}
}
......@@ -2806,7 +2807,7 @@ void OperatorWithKernel::BuildPhiKernelContext(
for (const auto& val : vec) {
scalar_list.emplace_back(val);
}
pt_kernel_context->EmplaceBackAttr(std::move(scalar_list));
phi_kernel_context->EmplaceBackAttr(std::move(scalar_list));
} break;
case proto::AttrType::LONGS: {
const auto& vec =
......@@ -2816,7 +2817,7 @@ void OperatorWithKernel::BuildPhiKernelContext(
for (const auto& val : vec) {
scalar_list.emplace_back(val);
}
pt_kernel_context->EmplaceBackAttr(std::move(scalar_list));
phi_kernel_context->EmplaceBackAttr(std::move(scalar_list));
} break;
case proto::AttrType::FLOATS: {
const auto& vec =
......@@ -2826,7 +2827,7 @@ void OperatorWithKernel::BuildPhiKernelContext(
for (const auto& val : vec) {
scalar_list.emplace_back(val);
}
pt_kernel_context->EmplaceBackAttr(std::move(scalar_list));
phi_kernel_context->EmplaceBackAttr(std::move(scalar_list));
} break;
case proto::AttrType::FLOAT64S: {
const auto& vec =
......@@ -2836,7 +2837,7 @@ void OperatorWithKernel::BuildPhiKernelContext(
for (const auto& val : vec) {
scalar_list.emplace_back(val);
}
pt_kernel_context->EmplaceBackAttr(std::move(scalar_list));
phi_kernel_context->EmplaceBackAttr(std::move(scalar_list));
} break;
case proto::AttrType::BOOLEANS: {
const auto& vec =
......@@ -2846,7 +2847,7 @@ void OperatorWithKernel::BuildPhiKernelContext(
for (const auto& val : vec) {
scalar_list.emplace_back(val);
}
pt_kernel_context->EmplaceBackAttr(std::move(scalar_list));
phi_kernel_context->EmplaceBackAttr(std::move(scalar_list));
} break;
default:
PADDLE_THROW(platform::errors::Unimplemented(
......@@ -2864,39 +2865,39 @@ void OperatorWithKernel::BuildPhiKernelContext(
attr_names[i]));
switch (attr_defs[i].type_index) {
case phi::AttributeType::FLOAT32:
pt_kernel_context->EmplaceBackAttr(
phi_kernel_context->EmplaceBackAttr(
PADDLE_GET_CONST(float, attr_iter->second));
break;
case phi::AttributeType::INT32:
pt_kernel_context->EmplaceBackAttr(
phi_kernel_context->EmplaceBackAttr(
PADDLE_GET_CONST(int, attr_iter->second));
break;
case phi::AttributeType::BOOL:
pt_kernel_context->EmplaceBackAttr(
phi_kernel_context->EmplaceBackAttr(
PADDLE_GET_CONST(bool, attr_iter->second));
break;
case phi::AttributeType::INT64:
pt_kernel_context->EmplaceBackAttr(
phi_kernel_context->EmplaceBackAttr(
PADDLE_GET_CONST(int64_t, attr_iter->second));
break;
case phi::AttributeType::INT32S:
pt_kernel_context->EmplaceBackAttr(
phi_kernel_context->EmplaceBackAttr(
PADDLE_GET_CONST(std::vector<int>, attr_iter->second));
break;
case phi::AttributeType::DATA_TYPE: {
auto data_type = framework::TransToPhiDataType(
static_cast<framework::proto::VarType::Type>(
PADDLE_GET_CONST(int, attr_iter->second)));
pt_kernel_context->EmplaceBackAttr(data_type);
phi_kernel_context->EmplaceBackAttr(data_type);
} break;
case phi::AttributeType::STRING:
pt_kernel_context->EmplaceBackAttr(
phi_kernel_context->EmplaceBackAttr(
std::move(PADDLE_GET_CONST(std::string, attr_iter->second)));
break;
case phi::AttributeType::INT64S:
switch (AttrTypeID(attr_iter->second)) {
case proto::AttrType::LONGS:
pt_kernel_context->EmplaceBackAttr(
phi_kernel_context->EmplaceBackAttr(
PADDLE_GET_CONST(std::vector<int64_t>, attr_iter->second));
break;
case proto::AttrType::INTS: {
......@@ -2904,7 +2905,7 @@ void OperatorWithKernel::BuildPhiKernelContext(
PADDLE_GET_CONST(std::vector<int>, attr_iter->second);
const std::vector<int64_t> vector_int64_attr(
vector_int_attr.begin(), vector_int_attr.end());
pt_kernel_context->EmplaceBackAttr(vector_int64_attr);
phi_kernel_context->EmplaceBackAttr(vector_int64_attr);
} break;
default:
PADDLE_THROW(platform::errors::Unimplemented(
......@@ -2915,11 +2916,11 @@ void OperatorWithKernel::BuildPhiKernelContext(
}
break;
case phi::AttributeType::FLOAT32S:
pt_kernel_context->EmplaceBackAttr(
phi_kernel_context->EmplaceBackAttr(
PADDLE_GET_CONST(std::vector<float>, attr_iter->second));
break;
case phi::AttributeType::STRINGS:
pt_kernel_context->EmplaceBackAttr(
phi_kernel_context->EmplaceBackAttr(
PADDLE_GET_CONST(std::vector<std::string>, attr_iter->second));
break;
default:
......
paddle/fluid/framework/operator.h
浏览文件 @ 942ff89f
......@@ -652,16 +652,16 @@ class OperatorWithKernel : public OperatorBase {
void BuildPhiKernelContext(const RuntimeContext& ctx,
platform::DeviceContext* dev_ctx,
phi::KernelContext* pt_kernel_context) const;
phi::KernelContext* phi_kernel_context) const;
phi::KernelSignature* PhiKernelSignature() const {
return kernel_signature_.get();
}
phi::Kernel* PhiKernel() const { return pt_kernel_.get(); }
phi::Kernel* PhiKernel() const { return phi_kernel_.get(); }
void ResetPhiKernel(phi::Kernel* kernel) const {
return pt_kernel_.reset(kernel);
return phi_kernel_.reset(kernel);
}
const OpKernelType* kernel_type() const { return kernel_type_.get(); }
......@@ -730,7 +730,7 @@ class OperatorWithKernel : public OperatorBase {
mutable bool run_phi_kernel_ = false;
mutable bool run_kp_kernel = false;
mutable std::unique_ptr<phi::KernelSignature> kernel_signature_;
mutable std::unique_ptr<phi::Kernel> pt_kernel_;
mutable std::unique_ptr<phi::Kernel> phi_kernel_;
mutable std::unique_ptr<phi::ArgumentMappingFn> arg_map_fn_;
struct CacheImpl;
......
paddle/fluid/imperative/op_base.h
浏览文件 @ 942ff89f
......@@ -227,7 +227,7 @@ class OpBase {
size_t id_{-1UL};
// In order to reduce the compatibility phase
// performance overhead, temporarily cache KernelContext
static phi::KernelContext pt_kernel_context_;
static phi::KernelContext phi_kernel_context_;
std::vector<std::shared_ptr<std::function<void()>>> void_function_post_hooks_;
};
......
paddle/fluid/imperative/prepared_operator.cc
浏览文件 @ 942ff89f
......@@ -183,8 +183,8 @@ PreparedOp PrepareImpl(
const phi::KernelSignature* default_kernel_signature = nullptr;
phi::KernelSignature kernel_signature;
phi::KernelKey pt_kernel_key;
std::string pt_kernel_name;
phi::KernelKey phi_kernel_key;
std::string phi_kernel_name;
#if defined(PADDLE_WITH_XPU)
bool is_xpu_unsupport =
paddle::platform::is_xpu_place(expected_kernel_key.place_) &&
......@@ -213,7 +213,7 @@ PreparedOp PrepareImpl(
if (has_phi_kernel) {
VLOG(6) << kernel_signature;
pt_kernel_name = kernel_signature.name;
phi_kernel_name = kernel_signature.name;
// NOTE(Liu-xiandong): The register kernel used KP have library_type[KP],
// But the default library_type is Plain, so we need to modify the
// library_type here, otherwise it can't work.
......@@ -236,34 +236,35 @@ PreparedOp PrepareImpl(
auto expected_kernel_key_library_type =
expected_kernel_key.library_type_;
expected_kernel_key.library_type_ = paddle::framework::LibraryType::kKP;
VLOG(3) << "modifing XPU KP kernel: " << pt_kernel_name
VLOG(3) << "modifing XPU KP kernel: " << phi_kernel_name
<< ", using_kernel_key:" << expected_kernel_key;
phi::KernelKey try_pt_kernel_key =
phi::KernelKey try_phi_kernel_key =
TransOpKernelTypeToPhiKernelKey(expected_kernel_key);
if (!phi_kernel_factory.HasKernel(pt_kernel_name, try_pt_kernel_key)) {
if (!phi_kernel_factory.HasKernel(phi_kernel_name,
try_phi_kernel_key)) {
expected_kernel_key.library_type_ = expected_kernel_key_library_type;
VLOG(3) << "modify XPU KP kernel: " << pt_kernel_name
VLOG(3) << "modify XPU KP kernel: " << phi_kernel_name
<< " in dynamic graph is failed " << expected_kernel_key;
} else {
VLOG(3) << "modify XPU KP kernel: " << pt_kernel_name
VLOG(3) << "modify XPU KP kernel: " << phi_kernel_name
<< " in dynamic graph is succeed " << expected_kernel_key;
}
}
}
#endif
pt_kernel_key = TransOpKernelTypeToPhiKernelKey(expected_kernel_key);
phi_kernel_key = TransOpKernelTypeToPhiKernelKey(expected_kernel_key);
auto& phi_kernel =
phi_kernel_factory.SelectKernel(pt_kernel_name, pt_kernel_key);
phi_kernel_factory.SelectKernel(phi_kernel_name, phi_kernel_key);
if (phi_kernel.IsValid()
#if defined(PADDLE_WITH_XPU) && !defined(PADDLE_WITH_XPU_KP)
&& !is_xpu_unsupport
#endif
) {
VLOG(6) << "Dynamic mode PrepareImpl - kernel name: " << pt_kernel_name
<< " | kernel key: " << pt_kernel_key
VLOG(6) << "Dynamic mode PrepareImpl - kernel name: " << phi_kernel_name
<< " | kernel key: " << phi_kernel_key
<< " | kernel: " << phi_kernel;
if (expected_kernel_key.place_ != place) {
......@@ -279,7 +280,7 @@ PreparedOp PrepareImpl(
phi_kernel,
dev_ctx);
} else {
VLOG(6) << "Dynamic mode ChoosePhiKernel - kernel `" << pt_kernel_name
VLOG(6) << "Dynamic mode ChoosePhiKernel - kernel `" << phi_kernel_name
<< "` not found.";
}
}
......@@ -316,23 +317,23 @@ PreparedOp PrepareImpl(
#endif
) {
if (has_phi_kernel) {
auto pt_cpu_kernel_key =
FallBackToCpu(expected_kernel_key, pt_kernel_key, op);
auto& pt_cpu_kernel =
phi_kernel_factory.SelectKernel(pt_kernel_name, pt_cpu_kernel_key);
if (pt_cpu_kernel.IsValid()) {
VLOG(6) << "Dynamic mode PrepareImpl - kernel name: " << pt_kernel_name
<< " | kernel key: " << pt_cpu_kernel_key
<< " | kernel: " << pt_cpu_kernel;
auto phi_cpu_kernel_key =
FallBackToCpu(expected_kernel_key, phi_kernel_key, op);
auto& phi_cpu_kernel =
phi_kernel_factory.SelectKernel(phi_kernel_name, phi_cpu_kernel_key);
if (phi_cpu_kernel.IsValid()) {
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(paddle::platform::CPUPlace());
return PreparedOp(
op,
empty_ctx,
framework::TransPhiKernelKeyToOpKernelType(pt_cpu_kernel_key),
framework::TransPhiKernelKeyToOpKernelType(phi_cpu_kernel_key),
arg_map_fn,
default_kernel_signature,
std::move(kernel_signature),
pt_cpu_kernel,
phi_cpu_kernel,
cpu_ctx);
}
}
......@@ -610,7 +611,7 @@ static void PreparedOpRunPtImpl(
PreparePhiData<VarType>(phi_kernel, kernel_signature, ins);
phi::KernelContext pt_kernel_context;
phi::KernelContext phi_kernel_context;
BuildDygraphPhiKernelContext<VarType>(kernel_signature,
phi_kernel,
ins,
......@@ -618,9 +619,9 @@ static void PreparedOpRunPtImpl(
attrs,
default_attrs,
dev_ctx,
&pt_kernel_context);
&phi_kernel_context);
phi_kernel(&pt_kernel_context);
phi_kernel(&phi_kernel_context);
}
if (FLAGS_check_nan_inf) {
......
paddle/phi/capi/include/kernel_utils.h
浏览文件 @ 942ff89f
......@@ -138,7 +138,7 @@ namespace capi {
meta_kernel_fn, \
cpp_dtype) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
int TouchCustomKernelSymbolFor_##kernel_name##_##backend##_##layout() { \
return 0; \
}
......@@ -152,7 +152,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_1(registrar_class, \
kernel_name, \
......@@ -171,7 +171,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_2(registrar_class, \
kernel_name, \
......@@ -190,7 +190,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_3(registrar_class, \
kernel_name, \
......@@ -209,7 +209,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_4(registrar_class, \
kernel_name, \
......@@ -228,7 +228,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_5(registrar_class, \
kernel_name, \
......@@ -247,7 +247,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_6(registrar_class, \
kernel_name, \
......@@ -266,7 +266,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_7(registrar_class, \
kernel_name, \
......@@ -285,7 +285,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_8(registrar_class, \
kernel_name, \
......@@ -304,7 +304,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_9(registrar_class, \
kernel_name, \
......@@ -323,7 +323,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_10(registrar_class, \
kernel_name, \
......@@ -342,7 +342,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_11(registrar_class, \
kernel_name, \
......@@ -361,7 +361,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_12(registrar_class, \
kernel_name, \
......@@ -380,7 +380,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_13(registrar_class, \
kernel_name, \
......@@ -399,7 +399,7 @@ namespace capi {
cpp_dtype, \
...) \
static const registrar_class<cpp_dtype> PD_CUSTOM_PHI_KERNEL_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id); \
PD_CUSTOM_PHI_KERNEL_EXPAND( \
_PD_BUILD_KERNEL_REGISTRAR_INIT_14(registrar_class, \
kernel_name, \
......
paddle/phi/core/kernel_registry.h
浏览文件 @ 942ff89f
......@@ -563,7 +563,7 @@ struct KernelRegistrar {
meta_kernel_fn, \
cpp_dtype) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -586,7 +586,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -617,7 +617,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -648,7 +648,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -679,7 +679,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -710,7 +710,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -741,7 +741,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -772,7 +772,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -803,7 +803,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -834,7 +834,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -865,7 +865,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -896,7 +896,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -927,7 +927,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -958,7 +958,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -989,7 +989,7 @@ struct KernelRegistrar {
cpp_dtype, \
...) \
static const ::phi::KernelRegistrar PD_CONCATENATE( \
__reg_pt_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout##_, registrar_id)( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -1035,7 +1035,7 @@ struct KernelRegistrar {
static void __PD_KERNEL_args_def_FN_##kernel_name##_##backend##_##layout( \
const ::phi::KernelKey& kernel_key, ::phi::Kernel* kernel); \
static const ::phi::KernelRegistrar \
__reg_pt_kernel_##kernel_name##_##backend##_##layout( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout( \
reg_type, \
#kernel_name, \
#backend, \
......@@ -1055,7 +1055,7 @@ struct KernelRegistrar {
static void __PD_KERNEL_args_def_FN_##kernel_name##_##backend##_##layout( \
const ::phi::KernelKey& kernel_key, ::phi::Kernel* kernel); \
static const ::phi::KernelRegistrar \
__reg_pt_kernel_##kernel_name##_##backend##_##layout( \
__reg_phi_kernel_##kernel_name##_##backend##_##layout( \
reg_type, \
#kernel_name, \
#backend, \
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或