diff --git a/paddle/fluid/platform/mkldnn_reuse.h b/paddle/fluid/platform/mkldnn_reuse.h index 32c31ef696094c43bf5c6f78238d601943445685..fd309a7f85f603797df3c5747d2e5c36b08787f9 100644 --- a/paddle/fluid/platform/mkldnn_reuse.h +++ b/paddle/fluid/platform/mkldnn_reuse.h @@ -25,7 +25,7 @@ limitations under the License. */ #include "paddle/fluid/operators/pool_op.h" #include "paddle/fluid/platform/mkldnn_helper.h" #include "paddle/fluid/platform/place.h" -#include "paddle/phi/kernels/funcs/onednn/onednn_reuse.h" +#include "paddle/phi/backends/onednn/onednn_reuse.h" namespace paddle { namespace platform { @@ -572,7 +572,7 @@ class BroadcastDataMKLDNNHandler }; static void AppendActivation(const framework::ExecutionContext& ctx, - dnnl::post_ops& post_ops, + dnnl::post_ops& post_ops, // NOLINT float activation_scale = 1.0f) { const auto invalid_attribute = ctx.HasAttr("fuse_activation") diff --git a/paddle/phi/kernels/funcs/onednn/onednn_helper.h b/paddle/phi/backends/onednn/onednn_helper.h similarity index 100% rename from paddle/phi/kernels/funcs/onednn/onednn_helper.h rename to paddle/phi/backends/onednn/onednn_helper.h diff --git a/paddle/phi/kernels/funcs/onednn/onednn_reuse.h b/paddle/phi/backends/onednn/onednn_reuse.h similarity index 99% rename from paddle/phi/kernels/funcs/onednn/onednn_reuse.h rename to paddle/phi/backends/onednn/onednn_reuse.h index 7384752c88ef9ea583d2dbe6a4f97e634c84f1ea..728bbc775f3ad6f4016e77d8010d1988b6985894 100644 --- a/paddle/phi/kernels/funcs/onednn/onednn_reuse.h +++ b/paddle/phi/backends/onednn/onednn_reuse.h @@ -22,10 +22,10 @@ limitations under the License. */ #include "paddle/fluid/platform/profiler/event_tracing.h" #include "paddle/phi/backends/onednn/onednn_context.h" +#include "paddle/phi/backends/onednn/onednn_helper.h" #include "paddle/phi/common/data_type.h" #include "paddle/phi/common/place.h" #include "paddle/phi/core/dense_tensor.h" -#include "paddle/phi/kernels/funcs/onednn/onednn_helper.h" namespace phi { namespace funcs { diff --git a/paddle/phi/kernels/funcs/data_layout_transform.cc b/paddle/phi/kernels/funcs/data_layout_transform.cc index 5b8eb677fce47050de576d5d7ea871d30eb0f14d..3e14adf7e791c360de1595d187f43fd35216d2e4 100644 --- a/paddle/phi/kernels/funcs/data_layout_transform.cc +++ b/paddle/phi/kernels/funcs/data_layout_transform.cc @@ -25,8 +25,8 @@ #include "paddle/phi/core/dense_tensor.h" #ifdef PADDLE_WITH_MKLDNN -#include "paddle/phi/kernels/funcs/onednn/onednn_helper.h" -#include "paddle/phi/kernels/funcs/onednn/onednn_reuse.h" +#include "paddle/phi/backends/onednn/onednn_helper.h" +#include "paddle/phi/backends/onednn/onednn_reuse.h" #endif namespace phi { diff --git a/paddle/phi/kernels/onednn/activation_grad_kernel.cc b/paddle/phi/kernels/onednn/activation_grad_kernel.cc index b7a0010a6ea0b630f441cea2706b6be3efff103c..4f972f44b4d8387933bb3cbfaf5fcd50bded065f 100644 --- a/paddle/phi/kernels/onednn/activation_grad_kernel.cc +++ b/paddle/phi/kernels/onednn/activation_grad_kernel.cc @@ -15,11 +15,11 @@ #include "paddle/phi/kernels/activation_grad_kernel.h" #include "paddle/phi/backends/onednn/onednn_context.h" +#include "paddle/phi/backends/onednn/onednn_reuse.h" #include "paddle/phi/common/bfloat16.h" #include "paddle/phi/common/place.h" #include "paddle/phi/core/kernel_registry.h" #include "paddle/phi/kernels/funcs/activation_functor.h" -#include "paddle/phi/kernels/funcs/onednn/onednn_reuse.h" namespace phi { diff --git a/paddle/phi/kernels/onednn/activation_kernel.cc b/paddle/phi/kernels/onednn/activation_kernel.cc index 4d1b17b7aaf0ce0b4dd4e63c2e60510c81a6474b..8e1574b8c679f7786ff03dd34274068e31294eff 100644 --- a/paddle/phi/kernels/onednn/activation_kernel.cc +++ b/paddle/phi/kernels/onednn/activation_kernel.cc @@ -15,11 +15,11 @@ #include "paddle/phi/kernels/activation_kernel.h" #include "paddle/phi/backends/onednn/onednn_context.h" +#include "paddle/phi/backends/onednn/onednn_reuse.h" #include "paddle/phi/common/bfloat16.h" #include "paddle/phi/common/place.h" #include "paddle/phi/core/kernel_registry.h" #include "paddle/phi/kernels/funcs/activation_functor.h" -#include "paddle/phi/kernels/funcs/onednn/onednn_reuse.h" namespace phi { diff --git a/paddle/phi/kernels/transfer_layout_kernel.cc b/paddle/phi/kernels/transfer_layout_kernel.cc index 0e8faa64ad129f58ad554c19d42f10d28b4b6e7e..4d69737131a803b4cb3e8ad26e523999e63466ce 100644 --- a/paddle/phi/kernels/transfer_layout_kernel.cc +++ b/paddle/phi/kernels/transfer_layout_kernel.cc @@ -23,7 +23,7 @@ limitations under the License. */ #include "paddle/phi/kernels/funcs/data_layout_transform.h" #include "paddle/phi/kernels/funcs/math_function.h" #ifdef PADDLE_WITH_MKLDNN -#include "paddle/phi/kernels/funcs/onednn/onednn_helper.h" +#include "paddle/phi/backends/onednn/onednn_helper.h" #endif namespace phi {