From 22e81907e48b3506b39e27c3de8a59e5ec009645 Mon Sep 17 00:00:00 2001 From: HongyuJia Date: Fri, 30 Sep 2022 10:25:06 +0800 Subject: [PATCH] change mkldnn kernel layout, ALL_LAYOUT->ONEDNN (#46626) --- paddle/phi/kernels/onednn/reduce_max_kernel.cc | 8 ++------ paddle/phi/kernels/onednn/reduce_mean_grad_kernel.cc | 2 +- paddle/phi/kernels/onednn/reduce_mean_kernel.cc | 9 +++------ paddle/phi/kernels/onednn/reduce_min_kernel.cc | 8 ++------ paddle/phi/kernels/onednn/reduce_sum_grad_kernel.cc | 9 +++------ paddle/phi/kernels/onednn/reduce_sum_kernel.cc | 8 ++------ paddle/phi/kernels/reduce_max_kernel.cc | 2 +- paddle/phi/kernels/reduce_mean_kernel.cc | 2 +- paddle/phi/kernels/reduce_min_kernel.cc | 2 +- paddle/phi/kernels/reduce_sum_kernel.cc | 2 +- 10 files changed, 17 insertions(+), 35 deletions(-) diff --git a/paddle/phi/kernels/onednn/reduce_max_kernel.cc b/paddle/phi/kernels/onednn/reduce_max_kernel.cc index 55fe45554e..9e3932d7f0 100644 --- a/paddle/phi/kernels/onednn/reduce_max_kernel.cc +++ b/paddle/phi/kernels/onednn/reduce_max_kernel.cc @@ -34,9 +34,5 @@ void MaxRawKernel(const Context& dev_ctx, } } // namespace phi -PD_REGISTER_KERNEL(max_raw, - OneDNN, - ALL_LAYOUT, - phi::MaxRawKernel, - float, - phi::dtype::bfloat16) {} +PD_REGISTER_KERNEL( + max_raw, OneDNN, ONEDNN, phi::MaxRawKernel, float, phi::dtype::bfloat16) {} diff --git a/paddle/phi/kernels/onednn/reduce_mean_grad_kernel.cc b/paddle/phi/kernels/onednn/reduce_mean_grad_kernel.cc index bccfce5864..4395126821 100644 --- a/paddle/phi/kernels/onednn/reduce_mean_grad_kernel.cc +++ b/paddle/phi/kernels/onednn/reduce_mean_grad_kernel.cc @@ -55,7 +55,7 @@ void MeanGradKernel(const Context& dev_ctx, PD_REGISTER_KERNEL(mean_grad, OneDNN, - ALL_LAYOUT, + ONEDNN, phi::MeanGradKernel, float, phi::dtype::bfloat16) {} diff --git a/paddle/phi/kernels/onednn/reduce_mean_kernel.cc b/paddle/phi/kernels/onednn/reduce_mean_kernel.cc index cd5e1781db..22e6b3f87b 100644 --- a/paddle/phi/kernels/onednn/reduce_mean_kernel.cc +++ b/paddle/phi/kernels/onednn/reduce_mean_kernel.cc @@ -34,9 +34,6 @@ void MeanRawKernel(const Context& dev_ctx, } } // namespace phi -PD_REGISTER_KERNEL(mean_raw, - OneDNN, - ALL_LAYOUT, - phi::MeanRawKernel, - float, - phi::dtype::bfloat16) {} +PD_REGISTER_KERNEL( + mean_raw, OneDNN, ONEDNN, phi::MeanRawKernel, float, phi::dtype::bfloat16) { +} diff --git a/paddle/phi/kernels/onednn/reduce_min_kernel.cc b/paddle/phi/kernels/onednn/reduce_min_kernel.cc index 118a5cc642..177e588d38 100644 --- a/paddle/phi/kernels/onednn/reduce_min_kernel.cc +++ b/paddle/phi/kernels/onednn/reduce_min_kernel.cc @@ -35,9 +35,5 @@ void MinRawKernel(const Context& dev_ctx, } // namespace phi -PD_REGISTER_KERNEL(min_raw, - OneDNN, - ALL_LAYOUT, - phi::MinRawKernel, - float, - phi::dtype::bfloat16) {} +PD_REGISTER_KERNEL( + min_raw, OneDNN, ONEDNN, phi::MinRawKernel, float, phi::dtype::bfloat16) {} diff --git a/paddle/phi/kernels/onednn/reduce_sum_grad_kernel.cc b/paddle/phi/kernels/onednn/reduce_sum_grad_kernel.cc index 26d5aea1a9..cd21d36cba 100644 --- a/paddle/phi/kernels/onednn/reduce_sum_grad_kernel.cc +++ b/paddle/phi/kernels/onednn/reduce_sum_grad_kernel.cc @@ -39,9 +39,6 @@ void SumGradKernel(const Context& dev_ctx, } } // namespace phi -PD_REGISTER_KERNEL(sum_grad, - OneDNN, - ALL_LAYOUT, - phi::SumGradKernel, - float, - phi::dtype::bfloat16) {} +PD_REGISTER_KERNEL( + sum_grad, OneDNN, ONEDNN, phi::SumGradKernel, float, phi::dtype::bfloat16) { +} diff --git a/paddle/phi/kernels/onednn/reduce_sum_kernel.cc b/paddle/phi/kernels/onednn/reduce_sum_kernel.cc index 18c714e7d9..e5b1d8b6fb 100644 --- a/paddle/phi/kernels/onednn/reduce_sum_kernel.cc +++ b/paddle/phi/kernels/onednn/reduce_sum_kernel.cc @@ -35,9 +35,5 @@ void SumRawKernel(const Context& dev_ctx, } } // namespace phi -PD_REGISTER_KERNEL(sum_raw, - OneDNN, - ALL_LAYOUT, - phi::SumRawKernel, - float, - phi::dtype::bfloat16) {} +PD_REGISTER_KERNEL( + sum_raw, OneDNN, ONEDNN, phi::SumRawKernel, float, phi::dtype::bfloat16) {} diff --git a/paddle/phi/kernels/reduce_max_kernel.cc b/paddle/phi/kernels/reduce_max_kernel.cc index cf5862ef99..64079cb2ae 100644 --- a/paddle/phi/kernels/reduce_max_kernel.cc +++ b/paddle/phi/kernels/reduce_max_kernel.cc @@ -48,7 +48,7 @@ PD_REGISTER_KERNEL(max, KPS, ALL_LAYOUT, phi::MaxKernel, float) {} #if defined(PADDLE_WITH_MKLDNN) PD_REGISTER_KERNEL( - max, OneDNN, ALL_LAYOUT, phi::MaxKernel, float, phi::dtype::bfloat16) {} + max, OneDNN, ONEDNN, phi::MaxKernel, float, phi::dtype::bfloat16) {} #endif #if defined(PADDLE_WITH_XPU) diff --git a/paddle/phi/kernels/reduce_mean_kernel.cc b/paddle/phi/kernels/reduce_mean_kernel.cc index e7df2596f5..375172fdb3 100644 --- a/paddle/phi/kernels/reduce_mean_kernel.cc +++ b/paddle/phi/kernels/reduce_mean_kernel.cc @@ -53,7 +53,7 @@ PD_REGISTER_KERNEL(mean, KPS, ALL_LAYOUT, phi::MeanKernel, float) {} #if defined(PADDLE_WITH_MKLDNN) PD_REGISTER_KERNEL( - mean, OneDNN, ALL_LAYOUT, phi::MeanKernel, float, phi::dtype::bfloat16) {} + mean, OneDNN, ONEDNN, phi::MeanKernel, float, phi::dtype::bfloat16) {} #endif #if defined(PADDLE_WITH_XPU) diff --git a/paddle/phi/kernels/reduce_min_kernel.cc b/paddle/phi/kernels/reduce_min_kernel.cc index 1df454e297..7a14d106c3 100644 --- a/paddle/phi/kernels/reduce_min_kernel.cc +++ b/paddle/phi/kernels/reduce_min_kernel.cc @@ -48,7 +48,7 @@ PD_REGISTER_KERNEL(min, KPS, ALL_LAYOUT, phi::MinKernel, float) {} #if defined(PADDLE_WITH_MKLDNN) PD_REGISTER_KERNEL( - min, OneDNN, ALL_LAYOUT, phi::MinKernel, float, phi::dtype::bfloat16) {} + min, OneDNN, ONEDNN, phi::MinKernel, float, phi::dtype::bfloat16) {} #endif #if defined(PADDLE_WITH_XPU) diff --git a/paddle/phi/kernels/reduce_sum_kernel.cc b/paddle/phi/kernels/reduce_sum_kernel.cc index 075e4a6022..70c88c2358 100644 --- a/paddle/phi/kernels/reduce_sum_kernel.cc +++ b/paddle/phi/kernels/reduce_sum_kernel.cc @@ -81,7 +81,7 @@ PD_REGISTER_KERNEL(sum, KPS, ALL_LAYOUT, phi::SumKernel, float) { #if defined(PADDLE_WITH_MKLDNN) PD_REGISTER_KERNEL( - sum, OneDNN, ALL_LAYOUT, phi::SumKernel, float, phi::dtype::bfloat16) {} + sum, OneDNN, ONEDNN, phi::SumKernel, float, phi::dtype::bfloat16) {} #endif #if defined(PADDLE_WITH_XPU) -- GitLab