You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by bg...@apache.org on 2022/01/27 13:44:50 UTC
[incubator-mxnet] branch master updated: [master] Avoid dots, full path to a file. (#20751)
This is an automated email from the ASF dual-hosted git repository.
bgawrych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 8cf49ed [master] Avoid dots, full path to a file. (#20751)
8cf49ed is described below
commit 8cf49edb312bae87c8ae3b8472363a699b5cbba3
Author: mozga <ma...@intel.com>
AuthorDate: Thu Jan 27 14:42:01 2022 +0100
[master] Avoid dots, full path to a file. (#20751)
* Keep full path to a file in directory
* Conflict && simplyfy includes
* Delete unused files
* Add misssed headers
* Move header before
---
src/operator/nn/dnnl/dnnl_act-inl.h | 4 ++--
src/operator/nn/dnnl/dnnl_act.cc | 4 ++--
src/operator/nn/dnnl/dnnl_base.cc | 6 +++---
src/operator/nn/dnnl/dnnl_batch_dot-inl.h | 6 +++---
src/operator/nn/dnnl/dnnl_batch_dot.cc | 4 ++--
src/operator/nn/dnnl/dnnl_batch_norm-inl.h | 6 +++---
src/operator/nn/dnnl/dnnl_concat-inl.h | 6 +++---
src/operator/nn/dnnl/dnnl_convolution-inl.h | 6 +++---
src/operator/nn/dnnl/dnnl_convolution.cc | 10 ++++++----
src/operator/nn/dnnl/dnnl_copy.cc | 4 ++--
src/operator/nn/dnnl/dnnl_deconvolution-inl.h | 6 +++---
src/operator/nn/dnnl/dnnl_deconvolution.cc | 4 ++--
src/operator/nn/dnnl/dnnl_fully_connected-inl.h | 4 ++--
src/operator/nn/dnnl/dnnl_layer_norm-inl.h | 6 +++---
src/operator/nn/dnnl/dnnl_layer_norm.cc | 2 +-
src/operator/nn/dnnl/dnnl_log_softmax.cc | 6 +++---
src/operator/nn/dnnl/dnnl_lrn-inl.h | 4 ++--
src/operator/nn/dnnl/dnnl_pooling-inl.h | 4 ++--
src/operator/nn/dnnl/dnnl_pooling.cc | 2 +-
src/operator/nn/dnnl/dnnl_reshape-inl.h | 2 +-
src/operator/nn/dnnl/dnnl_reshape.cc | 8 ++++----
src/operator/nn/dnnl/dnnl_rnn-inl.h | 4 ++--
src/operator/nn/dnnl/dnnl_rnn.cc | 3 ++-
src/operator/nn/dnnl/dnnl_slice-inl.h | 6 +++---
src/operator/nn/dnnl/dnnl_slice.cc | 6 +++---
src/operator/nn/dnnl/dnnl_softmax-inl.h | 6 +++---
src/operator/nn/dnnl/dnnl_softmax.cc | 2 +-
src/operator/nn/dnnl/dnnl_softmax_output.cc | 8 +++++---
src/operator/nn/dnnl/dnnl_stack.cc | 8 ++++----
src/operator/nn/dnnl/dnnl_sum.cc | 6 +++---
src/operator/nn/dnnl/dnnl_transpose-inl.h | 6 +++---
src/operator/nn/dnnl/dnnl_transpose.cc | 5 ++---
src/operator/quantization/dnnl/dnnl_dequantize-inl.h | 2 +-
src/operator/quantization/dnnl/dnnl_quantize-inl.h | 4 ++--
src/operator/quantization/dnnl/dnnl_quantize_v2-inl.h | 4 ++--
src/operator/quantization/dnnl/dnnl_quantized_act.cc | 4 ++--
.../quantization/dnnl/dnnl_quantized_batch_norm.cc | 4 ++--
src/operator/quantization/dnnl/dnnl_quantized_concat.cc | 4 ++--
src/operator/quantization/dnnl/dnnl_quantized_conv.cc | 13 +++++++------
.../quantization/dnnl/dnnl_quantized_elemwise_add.cc | 8 ++++----
src/operator/quantization/dnnl/dnnl_quantized_flatten.cc | 4 ++--
.../quantization/dnnl/dnnl_quantized_fully_connected.cc | 4 ++--
src/operator/quantization/dnnl/dnnl_quantized_pooling.cc | 2 +-
src/operator/quantization/dnnl/dnnl_requantize-inl.h | 4 ++--
src/operator/subgraph/dnnl/dnnl_batch_dot.cc | 12 ++++++------
src/operator/subgraph/dnnl/dnnl_batch_dot_property.h | 6 +++---
src/operator/subgraph/dnnl/dnnl_bn_relu_property.h | 8 +++++---
src/operator/subgraph/dnnl/dnnl_common.h | 4 +++-
src/operator/subgraph/dnnl/dnnl_conv-inl.h | 9 +++++----
src/operator/subgraph/dnnl/dnnl_conv.cc | 12 ++++++------
src/operator/subgraph/dnnl/dnnl_conv_property.h | 13 +++++++------
src/operator/subgraph/dnnl/dnnl_fc-inl.h | 3 ++-
src/operator/subgraph/dnnl/dnnl_fc.cc | 14 +++++++-------
src/operator/subgraph/dnnl/dnnl_fc_property.h | 5 +++--
.../dnnl/dnnl_post_quantize_align_scale_property.h | 3 ++-
src/operator/subgraph/dnnl/dnnl_post_quantize_property.h | 1 +
src/operator/subgraph/dnnl/dnnl_subgraph_base-inl.h | 3 ++-
src/operator/subgraph/dnnl/dnnl_transformer-inl.h | 4 ++--
src/operator/subgraph/dnnl/dnnl_transformer.cc | 10 +++++-----
src/operator/subgraph/dnnl/dnnl_transformer_qk_property.h | 9 +++++----
.../subgraph/dnnl/dnnl_transformer_valatt_property.h | 11 ++++++-----
61 files changed, 183 insertions(+), 165 deletions(-)
diff --git a/src/operator/nn/dnnl/dnnl_act-inl.h b/src/operator/nn/dnnl/dnnl_act-inl.h
index 3c8c16b..66f2299 100644
--- a/src/operator/nn/dnnl/dnnl_act-inl.h
+++ b/src/operator/nn/dnnl/dnnl_act-inl.h
@@ -30,8 +30,8 @@
#include <utility>
#include <vector>
-#include "../../leaky_relu-inl.h"
-#include "../activation-inl.h"
+#include "operator/leaky_relu-inl.h"
+#include "operator/nn/activation-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_act.cc b/src/operator/nn/dnnl/dnnl_act.cc
index 90a8fd0..2cc8a34 100644
--- a/src/operator/nn/dnnl/dnnl_act.cc
+++ b/src/operator/nn/dnnl/dnnl_act.cc
@@ -35,8 +35,8 @@
#include <utility>
#include <vector>
-#include "../../operator_common.h"
-#include "./dnnl_base-inl.h"
+#include "operator/operator_common.h"
+#include "dnnl_base-inl.h"
#include "dnnl_act-inl.h"
namespace mxnet {
diff --git a/src/operator/nn/dnnl/dnnl_base.cc b/src/operator/nn/dnnl/dnnl_base.cc
index 26579f4..27345a0 100644
--- a/src/operator/nn/dnnl/dnnl_base.cc
+++ b/src/operator/nn/dnnl/dnnl_base.cc
@@ -22,9 +22,9 @@
#include <atomic>
#include "../../../common/exec_utils.h"
-#include "../../operator_common.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "operator/operator_common.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
namespace mxnet {
diff --git a/src/operator/nn/dnnl/dnnl_batch_dot-inl.h b/src/operator/nn/dnnl/dnnl_batch_dot-inl.h
index ee828b3..4117b17 100644
--- a/src/operator/nn/dnnl/dnnl_batch_dot-inl.h
+++ b/src/operator/nn/dnnl/dnnl_batch_dot-inl.h
@@ -31,9 +31,9 @@
#include <utility>
#include <vector>
-#include "../../tensor/dot-inl.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "operator/tensor/dot-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_batch_dot.cc b/src/operator/nn/dnnl/dnnl_batch_dot.cc
index 71d08fa..4534fea 100644
--- a/src/operator/nn/dnnl/dnnl_batch_dot.cc
+++ b/src/operator/nn/dnnl/dnnl_batch_dot.cc
@@ -24,8 +24,8 @@
#if MXNET_USE_ONEDNN == 1
-#include "./dnnl_batch_dot-inl.h"
-#include "../../quantization/quantization_utils.h"
+#include "dnnl_batch_dot-inl.h"
+#include "operator/quantization/quantization_utils.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_batch_norm-inl.h b/src/operator/nn/dnnl/dnnl_batch_norm-inl.h
index 3902b2e..ca64434 100644
--- a/src/operator/nn/dnnl/dnnl_batch_norm-inl.h
+++ b/src/operator/nn/dnnl/dnnl_batch_norm-inl.h
@@ -31,9 +31,9 @@
#include <utility>
#include <vector>
-#include "../batch_norm-inl.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "operator/nn/batch_norm-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_concat-inl.h b/src/operator/nn/dnnl/dnnl_concat-inl.h
index 294582a..2970908 100644
--- a/src/operator/nn/dnnl/dnnl_concat-inl.h
+++ b/src/operator/nn/dnnl/dnnl_concat-inl.h
@@ -29,9 +29,9 @@
#include <utility>
#include <vector>
-#include "../concat-inl.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "operator/nn/concat-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_convolution-inl.h b/src/operator/nn/dnnl/dnnl_convolution-inl.h
index 529b6c3..0c48d0d 100644
--- a/src/operator/nn/dnnl/dnnl_convolution-inl.h
+++ b/src/operator/nn/dnnl/dnnl_convolution-inl.h
@@ -30,9 +30,9 @@
#include <utility>
#include <vector>
-#include "../convolution-inl.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "operator/nn/convolution-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_convolution.cc b/src/operator/nn/dnnl/dnnl_convolution.cc
index 314bc62..072c157 100644
--- a/src/operator/nn/dnnl/dnnl_convolution.cc
+++ b/src/operator/nn/dnnl/dnnl_convolution.cc
@@ -25,10 +25,12 @@
#if MXNET_USE_ONEDNN == 1
-#include "../convolution-inl.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_convolution-inl.h"
-#include "./dnnl_ops-inl.h"
+#include <string>
+
+#include "operator/nn/convolution-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_convolution-inl.h"
+#include "dnnl_ops-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_copy.cc b/src/operator/nn/dnnl/dnnl_copy.cc
index 2b78103..0fa9dc1 100644
--- a/src/operator/nn/dnnl/dnnl_copy.cc
+++ b/src/operator/nn/dnnl/dnnl_copy.cc
@@ -23,8 +23,8 @@
* \author
*/
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
#if MXNET_USE_ONEDNN == 1
namespace mxnet {
diff --git a/src/operator/nn/dnnl/dnnl_deconvolution-inl.h b/src/operator/nn/dnnl/dnnl_deconvolution-inl.h
index 92c1d6b..1078423 100644
--- a/src/operator/nn/dnnl/dnnl_deconvolution-inl.h
+++ b/src/operator/nn/dnnl/dnnl_deconvolution-inl.h
@@ -41,9 +41,9 @@
#include <utility>
#include <vector>
-#include "../deconvolution-inl.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "operator/nn/deconvolution-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_deconvolution.cc b/src/operator/nn/dnnl/dnnl_deconvolution.cc
index b853d1a..9140d19 100644
--- a/src/operator/nn/dnnl/dnnl_deconvolution.cc
+++ b/src/operator/nn/dnnl/dnnl_deconvolution.cc
@@ -23,8 +23,8 @@
#if MXNET_USE_ONEDNN == 1
-#include "../deconvolution-inl.h"
-#include "./dnnl_deconvolution-inl.h"
+#include "operator/nn/deconvolution-inl.h"
+#include "dnnl_deconvolution-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_fully_connected-inl.h b/src/operator/nn/dnnl/dnnl_fully_connected-inl.h
index 980b931..c30ad4b 100644
--- a/src/operator/nn/dnnl/dnnl_fully_connected-inl.h
+++ b/src/operator/nn/dnnl/dnnl_fully_connected-inl.h
@@ -31,8 +31,8 @@
#include <string>
#include <vector>
-#include "../fully_connected-inl.h"
-#include "./dnnl_base-inl.h"
+#include "operator/nn/fully_connected-inl.h"
+#include "dnnl_base-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_layer_norm-inl.h b/src/operator/nn/dnnl/dnnl_layer_norm-inl.h
index ccd3e9c..c751930 100644
--- a/src/operator/nn/dnnl/dnnl_layer_norm-inl.h
+++ b/src/operator/nn/dnnl/dnnl_layer_norm-inl.h
@@ -29,9 +29,9 @@
#include <utility>
#include <vector>
-#include "../layer_norm-inl.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "operator/nn/layer_norm-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_layer_norm.cc b/src/operator/nn/dnnl/dnnl_layer_norm.cc
index 2c938db..4108a62 100644
--- a/src/operator/nn/dnnl/dnnl_layer_norm.cc
+++ b/src/operator/nn/dnnl/dnnl_layer_norm.cc
@@ -24,7 +24,7 @@
#if MXNET_USE_ONEDNN == 1
-#include "./dnnl_layer_norm-inl.h"
+#include "dnnl_layer_norm-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_log_softmax.cc b/src/operator/nn/dnnl/dnnl_log_softmax.cc
index a3c8c90..9243440 100644
--- a/src/operator/nn/dnnl/dnnl_log_softmax.cc
+++ b/src/operator/nn/dnnl/dnnl_log_softmax.cc
@@ -22,9 +22,9 @@
* \brief Implementation of log_softmax function with DNNL support
*/
-#include "../softmax-inl.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "operator/nn/softmax-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
#if MXNET_USE_ONEDNN == 1
namespace mxnet {
diff --git a/src/operator/nn/dnnl/dnnl_lrn-inl.h b/src/operator/nn/dnnl/dnnl_lrn-inl.h
index 842705b..913a621 100644
--- a/src/operator/nn/dnnl/dnnl_lrn-inl.h
+++ b/src/operator/nn/dnnl/dnnl_lrn-inl.h
@@ -30,8 +30,8 @@
#include <utility>
#include <vector>
-#include "../lrn-inl.h"
-#include "./dnnl_base-inl.h"
+#include "operator/nn/lrn-inl.h"
+#include "dnnl_base-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_pooling-inl.h b/src/operator/nn/dnnl/dnnl_pooling-inl.h
index 15a544e..e01270a 100644
--- a/src/operator/nn/dnnl/dnnl_pooling-inl.h
+++ b/src/operator/nn/dnnl/dnnl_pooling-inl.h
@@ -29,8 +29,8 @@
#include <dnnl.hpp>
#include <utility>
-#include "../pooling-inl.h"
-#include "./dnnl_base-inl.h"
+#include "operator/nn/pooling-inl.h"
+#include "dnnl_base-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_pooling.cc b/src/operator/nn/dnnl/dnnl_pooling.cc
index 418c832..5f21a79 100644
--- a/src/operator/nn/dnnl/dnnl_pooling.cc
+++ b/src/operator/nn/dnnl/dnnl_pooling.cc
@@ -25,7 +25,7 @@
#if MXNET_USE_ONEDNN == 1
-#include "./dnnl_pooling-inl.h"
+#include "dnnl_pooling-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_reshape-inl.h b/src/operator/nn/dnnl/dnnl_reshape-inl.h
index a814c1d..04e1fec 100644
--- a/src/operator/nn/dnnl/dnnl_reshape-inl.h
+++ b/src/operator/nn/dnnl/dnnl_reshape-inl.h
@@ -28,7 +28,7 @@
#if MXNET_USE_ONEDNN == 1
#include <vector>
-#include "../../tensor/matrix_op-inl.h"
+#include "operator/tensor/matrix_op-inl.h"
#include "dnnl_base-inl.h"
namespace mxnet {
diff --git a/src/operator/nn/dnnl/dnnl_reshape.cc b/src/operator/nn/dnnl/dnnl_reshape.cc
index 5d25919..8481eae 100644
--- a/src/operator/nn/dnnl/dnnl_reshape.cc
+++ b/src/operator/nn/dnnl/dnnl_reshape.cc
@@ -24,10 +24,10 @@
*/
#if MXNET_USE_ONEDNN == 1
-#include "../../tensor/elemwise_unary_op.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
-#include "./dnnl_reshape-inl.h"
+#include "operator/tensor/elemwise_unary_op.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
+#include "dnnl_reshape-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_rnn-inl.h b/src/operator/nn/dnnl/dnnl_rnn-inl.h
index bd2a63f..f287534 100644
--- a/src/operator/nn/dnnl/dnnl_rnn-inl.h
+++ b/src/operator/nn/dnnl/dnnl_rnn-inl.h
@@ -30,8 +30,8 @@
#include <vector>
-#include "../../rnn-inl.h"
-#include "./dnnl_base-inl.h"
+#include "operator/rnn-inl.h"
+#include "dnnl_base-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_rnn.cc b/src/operator/nn/dnnl/dnnl_rnn.cc
index 22b9e27..0d65eb9 100644
--- a/src/operator/nn/dnnl/dnnl_rnn.cc
+++ b/src/operator/nn/dnnl/dnnl_rnn.cc
@@ -26,8 +26,9 @@
#if MXNET_USE_ONEDNN == 1
#include <numeric>
+#include <functional>
-#include "./dnnl_rnn-inl.h"
+#include "dnnl_rnn-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_slice-inl.h b/src/operator/nn/dnnl/dnnl_slice-inl.h
index 64ef19a..db4d562 100644
--- a/src/operator/nn/dnnl/dnnl_slice-inl.h
+++ b/src/operator/nn/dnnl/dnnl_slice-inl.h
@@ -34,9 +34,9 @@
#include <utility>
-#include "../../operator_common.h"
-#include "../../tensor/slice-inl.h"
-#include "./dnnl_base-inl.h"
+#include "operator/operator_common.h"
+#include "operator/tensor/slice-inl.h"
+#include "dnnl_base-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_slice.cc b/src/operator/nn/dnnl/dnnl_slice.cc
index 32bef00..3008133 100644
--- a/src/operator/nn/dnnl/dnnl_slice.cc
+++ b/src/operator/nn/dnnl/dnnl_slice.cc
@@ -25,9 +25,9 @@
#if MXNET_USE_ONEDNN == 1
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
-#include "./dnnl_slice-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
+#include "dnnl_slice-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_softmax-inl.h b/src/operator/nn/dnnl/dnnl_softmax-inl.h
index 0978ab0..eea520e 100644
--- a/src/operator/nn/dnnl/dnnl_softmax-inl.h
+++ b/src/operator/nn/dnnl/dnnl_softmax-inl.h
@@ -36,10 +36,10 @@
#if MXNET_USE_ONEDNN == 1
#include <vector>
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
-#include "../softmax-inl.h"
+#include "operator/nn/softmax-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_softmax.cc b/src/operator/nn/dnnl/dnnl_softmax.cc
index 48c2944..50c71e5 100644
--- a/src/operator/nn/dnnl/dnnl_softmax.cc
+++ b/src/operator/nn/dnnl/dnnl_softmax.cc
@@ -24,7 +24,7 @@
*/
#if MXNET_USE_ONEDNN == 1
-#include "./dnnl_softmax-inl.h"
+#include "dnnl_softmax-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_softmax_output.cc b/src/operator/nn/dnnl/dnnl_softmax_output.cc
index 7a7d399..94b0029 100644
--- a/src/operator/nn/dnnl/dnnl_softmax_output.cc
+++ b/src/operator/nn/dnnl/dnnl_softmax_output.cc
@@ -24,9 +24,11 @@
*/
#if MXNET_USE_ONEDNN == 1
-#include "../../softmax_output-inl.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+
+#include "operator/softmax_output-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
+
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_stack.cc b/src/operator/nn/dnnl/dnnl_stack.cc
index aaeebb7..4cd45e1 100644
--- a/src/operator/nn/dnnl/dnnl_stack.cc
+++ b/src/operator/nn/dnnl/dnnl_stack.cc
@@ -21,11 +21,11 @@
* \file dnnl_stack.cc
*/
-#include "./dnnl_base-inl.h"
-#include "./dnnl_concat-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_concat-inl.h"
+#include "dnnl_ops-inl.h"
-#include "../../tensor/matrix_op-inl.h"
+#include "operator/tensor/matrix_op-inl.h"
#if MXNET_USE_ONEDNN == 1
namespace mxnet {
diff --git a/src/operator/nn/dnnl/dnnl_sum.cc b/src/operator/nn/dnnl/dnnl_sum.cc
index 14b7dea..c2626a2 100644
--- a/src/operator/nn/dnnl/dnnl_sum.cc
+++ b/src/operator/nn/dnnl/dnnl_sum.cc
@@ -24,9 +24,9 @@
*/
#include <iostream>
-#include "../../operator_common.h"
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "operator/operator_common.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_transpose-inl.h b/src/operator/nn/dnnl/dnnl_transpose-inl.h
index b9bff7a..a829dc2 100644
--- a/src/operator/nn/dnnl/dnnl_transpose-inl.h
+++ b/src/operator/nn/dnnl/dnnl_transpose-inl.h
@@ -26,10 +26,10 @@
#define MXNET_OPERATOR_NN_DNNL_DNNL_TRANSPOSE_INL_H_
#if MXNET_USE_ONEDNN == 1
-#include "./dnnl_base-inl.h"
-#include "./dnnl_ops-inl.h"
+#include "dnnl_base-inl.h"
+#include "dnnl_ops-inl.h"
-#include "../../numpy/np_matrix_op-inl.h"
+#include "operator/numpy/np_matrix_op-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/nn/dnnl/dnnl_transpose.cc b/src/operator/nn/dnnl/dnnl_transpose.cc
index 78b53c7..97a8630 100644
--- a/src/operator/nn/dnnl/dnnl_transpose.cc
+++ b/src/operator/nn/dnnl/dnnl_transpose.cc
@@ -25,9 +25,8 @@
#if MXNET_USE_ONEDNN == 1
-#include "../../tensor/matrix_op-inl.h"
-
-#include "./dnnl_transpose-inl.h"
+#include "operator/tensor/matrix_op-inl.h"
+#include "dnnl_transpose-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_dequantize-inl.h b/src/operator/quantization/dnnl/dnnl_dequantize-inl.h
index 0c4e417..cfbdd12 100644
--- a/src/operator/quantization/dnnl/dnnl_dequantize-inl.h
+++ b/src/operator/quantization/dnnl/dnnl_dequantize-inl.h
@@ -30,7 +30,7 @@
#include <string>
#include <vector>
-#include "../../nn/dnnl/dnnl_base-inl.h"
+#include "operator/nn/dnnl/dnnl_base-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_quantize-inl.h b/src/operator/quantization/dnnl/dnnl_quantize-inl.h
index 13f2e1e..56fa315 100644
--- a/src/operator/quantization/dnnl/dnnl_quantize-inl.h
+++ b/src/operator/quantization/dnnl/dnnl_quantize-inl.h
@@ -30,8 +30,8 @@
#include <string>
#include <vector>
-#include "../../nn/dnnl/dnnl_base-inl.h"
-#include "../quantize-inl.h"
+#include "operator/nn/dnnl/dnnl_base-inl.h"
+#include "operator/quantization/quantize-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_quantize_v2-inl.h b/src/operator/quantization/dnnl/dnnl_quantize_v2-inl.h
index 6181132..4effb39 100644
--- a/src/operator/quantization/dnnl/dnnl_quantize_v2-inl.h
+++ b/src/operator/quantization/dnnl/dnnl_quantize_v2-inl.h
@@ -29,8 +29,8 @@
#include <string>
#include <vector>
-#include "../../nn/dnnl/dnnl_base-inl.h"
-#include "../quantize_v2-inl.h"
+#include "operator/nn/dnnl/dnnl_base-inl.h"
+#include "operator/quantization/quantize_v2-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_quantized_act.cc b/src/operator/quantization/dnnl/dnnl_quantized_act.cc
index 0aea4b4..6cf31a0 100644
--- a/src/operator/quantization/dnnl/dnnl_quantized_act.cc
+++ b/src/operator/quantization/dnnl/dnnl_quantized_act.cc
@@ -23,8 +23,8 @@
*/
#if MXNET_USE_ONEDNN == 1
-#include "../../nn/dnnl/dnnl_ops-inl.h"
-#include "../quantization_utils.h"
+#include "operator/nn/dnnl/dnnl_ops-inl.h"
+#include "operator/quantization/quantization_utils.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_quantized_batch_norm.cc b/src/operator/quantization/dnnl/dnnl_quantized_batch_norm.cc
index f8c7948..3f13775 100644
--- a/src/operator/quantization/dnnl/dnnl_quantized_batch_norm.cc
+++ b/src/operator/quantization/dnnl/dnnl_quantized_batch_norm.cc
@@ -24,8 +24,8 @@
*/
#if MXNET_USE_ONEDNN == 1
-#include "../../nn/dnnl/dnnl_batch_norm-inl.h"
-#include "../quantization_utils.h"
+#include "operator/nn/dnnl/dnnl_batch_norm-inl.h"
+#include "operator/quantization/quantization_utils.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_quantized_concat.cc b/src/operator/quantization/dnnl/dnnl_quantized_concat.cc
index 3409ec2..a6f9e85 100644
--- a/src/operator/quantization/dnnl/dnnl_quantized_concat.cc
+++ b/src/operator/quantization/dnnl/dnnl_quantized_concat.cc
@@ -23,8 +23,8 @@
*/
#if MXNET_USE_ONEDNN == 1
-#include "../../nn/dnnl/dnnl_concat-inl.h"
-#include "../quantization_utils.h"
+#include "operator/nn/dnnl/dnnl_concat-inl.h"
+#include "operator/quantization/quantization_utils.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_quantized_conv.cc b/src/operator/quantization/dnnl/dnnl_quantized_conv.cc
index 934a24c..158d0ea 100644
--- a/src/operator/quantization/dnnl/dnnl_quantized_conv.cc
+++ b/src/operator/quantization/dnnl/dnnl_quantized_conv.cc
@@ -24,12 +24,13 @@
*/
#if MXNET_USE_ONEDNN == 1
-#include "../../elemwise_op_common.h"
-#include "../../nn/convolution-inl.h"
-#include "../../nn/dnnl/dnnl_base-inl.h"
-#include "../../nn/dnnl/dnnl_convolution-inl.h"
-#include "../../tensor/matrix_op-inl.h"
-#include "../quantization_utils.h"
+#include "operator/elemwise_op_common.h"
+#include "operator/nn/convolution-inl.h"
+#include "operator/nn/dnnl/dnnl_base-inl.h"
+#include "operator/nn/dnnl/dnnl_convolution-inl.h"
+#include "operator/tensor/matrix_op-inl.h"
+#include "operator/quantization/quantization_utils.h"
+
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_quantized_elemwise_add.cc b/src/operator/quantization/dnnl/dnnl_quantized_elemwise_add.cc
index 4dbe648..c9d1157 100644
--- a/src/operator/quantization/dnnl/dnnl_quantized_elemwise_add.cc
+++ b/src/operator/quantization/dnnl/dnnl_quantized_elemwise_add.cc
@@ -23,10 +23,10 @@
*/
#if MXNET_USE_ONEDNN == 1
-#include "../../nn/dnnl/dnnl_base-inl.h"
-#include "../../nn/dnnl/dnnl_ops-inl.h"
-#include "../quantization_utils.h"
-#include "../quantized_elemwise_add-inl.h"
+#include "operator/nn/dnnl/dnnl_base-inl.h"
+#include "operator/nn/dnnl/dnnl_ops-inl.h"
+#include "operator/quantization/quantization_utils.h"
+#include "operator/quantization/quantized_elemwise_add-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_quantized_flatten.cc b/src/operator/quantization/dnnl/dnnl_quantized_flatten.cc
index 12eb01f..a605a16 100644
--- a/src/operator/quantization/dnnl/dnnl_quantized_flatten.cc
+++ b/src/operator/quantization/dnnl/dnnl_quantized_flatten.cc
@@ -23,8 +23,8 @@
*/
#if MXNET_USE_ONEDNN == 1
-#include "../../nn/dnnl/dnnl_ops-inl.h"
-#include "../quantization_utils.h"
+#include "operator/nn/dnnl/dnnl_ops-inl.h"
+#include "operator/quantization/quantization_utils.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_quantized_fully_connected.cc b/src/operator/quantization/dnnl/dnnl_quantized_fully_connected.cc
index 5e70c4e..7746129 100644
--- a/src/operator/quantization/dnnl/dnnl_quantized_fully_connected.cc
+++ b/src/operator/quantization/dnnl/dnnl_quantized_fully_connected.cc
@@ -24,8 +24,8 @@
*/
#if MXNET_USE_ONEDNN == 1
-#include "../../nn/dnnl/dnnl_fully_connected-inl.h"
-#include "../quantization_utils.h"
+#include "operator/nn/dnnl/dnnl_fully_connected-inl.h"
+#include "operator/quantization/quantization_utils.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_quantized_pooling.cc b/src/operator/quantization/dnnl/dnnl_quantized_pooling.cc
index a6f89ee..d0a2154 100644
--- a/src/operator/quantization/dnnl/dnnl_quantized_pooling.cc
+++ b/src/operator/quantization/dnnl/dnnl_quantized_pooling.cc
@@ -25,7 +25,7 @@
#if MXNET_USE_ONEDNN == 1
-#include "../../nn/dnnl/dnnl_pooling-inl.h"
+#include "operator/nn/dnnl/dnnl_pooling-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/quantization/dnnl/dnnl_requantize-inl.h b/src/operator/quantization/dnnl/dnnl_requantize-inl.h
index 2dc61d6..3095b87 100644
--- a/src/operator/quantization/dnnl/dnnl_requantize-inl.h
+++ b/src/operator/quantization/dnnl/dnnl_requantize-inl.h
@@ -29,8 +29,8 @@
#include <string>
#include <vector>
-#include "../../nn/dnnl/dnnl_base-inl.h"
-#include "../requantize-inl.h"
+#include "operator/nn/dnnl/dnnl_base-inl.h"
+#include "operator/quantization/requantize-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/subgraph/dnnl/dnnl_batch_dot.cc b/src/operator/subgraph/dnnl/dnnl_batch_dot.cc
index 612629d..c9beffc 100644
--- a/src/operator/subgraph/dnnl/dnnl_batch_dot.cc
+++ b/src/operator/subgraph/dnnl/dnnl_batch_dot.cc
@@ -28,12 +28,12 @@
#include <utility>
#include <vector>
-#include "../../nn/dnnl/dnnl_base-inl.h"
-#include "../../nn/dnnl/dnnl_batch_dot-inl.h"
-#include "../../nn/dnnl/dnnl_ops-inl.h"
-#include "../../quantization/quantization_utils.h"
-#include "../../tensor/matrix_op-inl.h"
-#include "../common.h"
+#include "operator/nn/dnnl/dnnl_base-inl.h"
+#include "operator/nn/dnnl/dnnl_batch_dot-inl.h"
+#include "operator/nn/dnnl/dnnl_ops-inl.h"
+#include "operator/quantization/quantization_utils.h"
+#include "operator/tensor/matrix_op-inl.h"
+#include "operator/subgraph/common.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/subgraph/dnnl/dnnl_batch_dot_property.h b/src/operator/subgraph/dnnl/dnnl_batch_dot_property.h
index c4dee3e..d91b17a 100644
--- a/src/operator/subgraph/dnnl/dnnl_batch_dot_property.h
+++ b/src/operator/subgraph/dnnl/dnnl_batch_dot_property.h
@@ -19,14 +19,14 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_BATCH_DOT_PROPERTY_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_BATCH_DOT_PROPERTY_H_
+
#if MXNET_USE_ONEDNN == 1
#include <string>
#include <vector>
-#include "../../tensor/dot-inl.h"
-#include "../common.h"
-
+#include "operator/tensor/dot-inl.h"
+#include "operator/subgraph/common.h"
#include "dnnl_subgraph_base-inl.h"
namespace mxnet {
diff --git a/src/operator/subgraph/dnnl/dnnl_bn_relu_property.h b/src/operator/subgraph/dnnl/dnnl_bn_relu_property.h
index 4d39bbe..d59b5e2 100644
--- a/src/operator/subgraph/dnnl/dnnl_bn_relu_property.h
+++ b/src/operator/subgraph/dnnl/dnnl_bn_relu_property.h
@@ -19,15 +19,17 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_BN_RELU_PROPERTY_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_BN_RELU_PROPERTY_H_
+
#if MXNET_USE_ONEDNN == 1
#include <string>
#include <vector>
-#include "../../nn/dnnl/dnnl_act-inl.h"
-#include "../../nn/dnnl/dnnl_batch_norm-inl.h"
-#include "../common.h"
+#include "operator/nn/dnnl/dnnl_act-inl.h"
+#include "operator/nn/dnnl/dnnl_batch_norm-inl.h"
+#include "operator/subgraph/common.h"
#include "dnnl_subgraph_base-inl.h"
+
namespace mxnet {
namespace op {
diff --git a/src/operator/subgraph/dnnl/dnnl_common.h b/src/operator/subgraph/dnnl/dnnl_common.h
index 7fdc7ec..68f10c0 100644
--- a/src/operator/subgraph/dnnl/dnnl_common.h
+++ b/src/operator/subgraph/dnnl/dnnl_common.h
@@ -25,10 +25,12 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_COMMON_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_COMMON_H_
+
#if MXNET_USE_ONEDNN == 1
+
#include <vector>
-#include "../../numpy/np_matrix_op-inl.h"
+#include "operator/numpy/np_matrix_op-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/subgraph/dnnl/dnnl_conv-inl.h b/src/operator/subgraph/dnnl/dnnl_conv-inl.h
index 81b7e55..ef69670 100644
--- a/src/operator/subgraph/dnnl/dnnl_conv-inl.h
+++ b/src/operator/subgraph/dnnl/dnnl_conv-inl.h
@@ -19,16 +19,17 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_CONV_INL_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_CONV_INL_H_
+
#if MXNET_USE_ONEDNN == 1
#include <string>
#include <utility>
#include <vector>
-#include "../../nn/activation-inl.h"
-#include "../../nn/batch_norm-inl.h"
-#include "../../nn/convolution-inl.h"
-#include "../../nn/dnnl/dnnl_convolution-inl.h"
+#include "operator/nn/activation-inl.h"
+#include "operator/nn/batch_norm-inl.h"
+#include "operator/nn/convolution-inl.h"
+#include "operator/nn/dnnl/dnnl_convolution-inl.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/subgraph/dnnl/dnnl_conv.cc b/src/operator/subgraph/dnnl/dnnl_conv.cc
index 7bc1b24..ad7a683 100644
--- a/src/operator/subgraph/dnnl/dnnl_conv.cc
+++ b/src/operator/subgraph/dnnl/dnnl_conv.cc
@@ -23,12 +23,12 @@
#include <utility>
#include <vector>
-#include "../../nn/dnnl/dnnl_act-inl.h"
-#include "../../nn/dnnl/dnnl_base-inl.h"
-#include "../../nn/dnnl/dnnl_ops-inl.h"
-#include "../../quantization/quantization_utils.h"
-#include "../../tensor/matrix_op-inl.h"
-#include "../common.h"
+#include "operator/nn/dnnl/dnnl_act-inl.h"
+#include "operator/nn/dnnl/dnnl_base-inl.h"
+#include "operator/nn/dnnl/dnnl_ops-inl.h"
+#include "operator/quantization/quantization_utils.h"
+#include "operator/tensor/matrix_op-inl.h"
+#include "operator/subgraph/common.h"
#include "dnnl_common.h"
#include "dnnl_conv-inl.h"
diff --git a/src/operator/subgraph/dnnl/dnnl_conv_property.h b/src/operator/subgraph/dnnl/dnnl_conv_property.h
index 3bb08a5..c5e027d 100644
--- a/src/operator/subgraph/dnnl/dnnl_conv_property.h
+++ b/src/operator/subgraph/dnnl/dnnl_conv_property.h
@@ -19,17 +19,18 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_CONV_PROPERTY_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_CONV_PROPERTY_H_
+
#if MXNET_USE_ONEDNN == 1
#include <string>
#include <vector>
-#include "../../leaky_relu-inl.h"
-#include "../../nn/activation-inl.h"
-#include "../../nn/convolution-inl.h"
-#include "../../nn/dnnl/dnnl_ops-inl.h"
-#include "../../tensor/matrix_op-inl.h"
-#include "../common.h"
+#include "operator/leaky_relu-inl.h"
+#include "operator/nn/activation-inl.h"
+#include "operator/nn/convolution-inl.h"
+#include "operator/nn/dnnl/dnnl_ops-inl.h"
+#include "operator/tensor/matrix_op-inl.h"
+#include "operator/subgraph/common.h"
#include "dnnl_subgraph_base-inl.h"
namespace mxnet {
diff --git a/src/operator/subgraph/dnnl/dnnl_fc-inl.h b/src/operator/subgraph/dnnl/dnnl_fc-inl.h
index ba1beac..09ca2ca 100644
--- a/src/operator/subgraph/dnnl/dnnl_fc-inl.h
+++ b/src/operator/subgraph/dnnl/dnnl_fc-inl.h
@@ -19,13 +19,14 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_FC_INL_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_FC_INL_H_
+
#if MXNET_USE_ONEDNN == 1
#include <string>
#include <utility>
#include <vector>
-#include "../../nn/dnnl/dnnl_fully_connected-inl.h"
+#include "operator/nn/dnnl/dnnl_fully_connected-inl.h"
#include "dnnl.hpp"
namespace mxnet {
diff --git a/src/operator/subgraph/dnnl/dnnl_fc.cc b/src/operator/subgraph/dnnl/dnnl_fc.cc
index 51989ca..49887fe 100644
--- a/src/operator/subgraph/dnnl/dnnl_fc.cc
+++ b/src/operator/subgraph/dnnl/dnnl_fc.cc
@@ -29,13 +29,13 @@
#include <utility>
#include <vector>
-#include "../../nn/dnnl/dnnl_act-inl.h"
-#include "../../nn/dnnl/dnnl_base-inl.h"
-#include "../../nn/dnnl/dnnl_fully_connected-inl.h"
-#include "../../nn/dnnl/dnnl_ops-inl.h"
-#include "../../quantization/quantization_utils.h"
-#include "../../tensor/matrix_op-inl.h"
-#include "../common.h"
+#include "operator/nn/dnnl/dnnl_act-inl.h"
+#include "operator/nn/dnnl/dnnl_base-inl.h"
+#include "operator/nn/dnnl/dnnl_fully_connected-inl.h"
+#include "operator/nn/dnnl/dnnl_ops-inl.h"
+#include "operator/quantization/quantization_utils.h"
+#include "operator/tensor/matrix_op-inl.h"
+#include "operator/subgraph/common.h"
#include "dnnl_common.h"
#include "dnnl_fc-inl.h"
diff --git a/src/operator/subgraph/dnnl/dnnl_fc_property.h b/src/operator/subgraph/dnnl/dnnl_fc_property.h
index 9884dc7..64fd507 100644
--- a/src/operator/subgraph/dnnl/dnnl_fc_property.h
+++ b/src/operator/subgraph/dnnl/dnnl_fc_property.h
@@ -25,13 +25,14 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_FC_PROPERTY_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_FC_PROPERTY_H_
+
#if MXNET_USE_ONEDNN == 1
#include <string>
#include <vector>
-#include "../../tensor/matrix_op-inl.h"
-#include "../common.h"
+#include "operator/tensor/matrix_op-inl.h"
+#include "operator/subgraph/common.h"
#include "dnnl_fc-inl.h"
#include "dnnl_subgraph_base-inl.h"
diff --git a/src/operator/subgraph/dnnl/dnnl_post_quantize_align_scale_property.h b/src/operator/subgraph/dnnl/dnnl_post_quantize_align_scale_property.h
index a4cc724..62d88d6 100644
--- a/src/operator/subgraph/dnnl/dnnl_post_quantize_align_scale_property.h
+++ b/src/operator/subgraph/dnnl/dnnl_post_quantize_align_scale_property.h
@@ -19,12 +19,13 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_POST_QUANTIZE_ALIGN_SCALE_PROPERTY_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_POST_QUANTIZE_ALIGN_SCALE_PROPERTY_H_
+
#if MXNET_USE_ONEDNN == 1
#include <string>
#include <vector>
-#include "../common.h"
+#include "operator/subgraph/common.h"
#include "dnnl_subgraph_base-inl.h"
namespace mxnet {
diff --git a/src/operator/subgraph/dnnl/dnnl_post_quantize_property.h b/src/operator/subgraph/dnnl/dnnl_post_quantize_property.h
index cddf4b4..d9cb6c0 100644
--- a/src/operator/subgraph/dnnl/dnnl_post_quantize_property.h
+++ b/src/operator/subgraph/dnnl/dnnl_post_quantize_property.h
@@ -18,6 +18,7 @@
*/
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_POST_QUANTIZE_PROPERTY_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_POST_QUANTIZE_PROPERTY_H_
+
#if MXNET_USE_ONEDNN == 1
#include <memory>
diff --git a/src/operator/subgraph/dnnl/dnnl_subgraph_base-inl.h b/src/operator/subgraph/dnnl/dnnl_subgraph_base-inl.h
index f1ff878..fcecead 100644
--- a/src/operator/subgraph/dnnl/dnnl_subgraph_base-inl.h
+++ b/src/operator/subgraph/dnnl/dnnl_subgraph_base-inl.h
@@ -18,9 +18,10 @@
*/
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_SUBGRAPH_BASE_INL_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_SUBGRAPH_BASE_INL_H_
+
#if MXNET_USE_ONEDNN == 1
-#include "../subgraph_property.h"
+#include "operator/subgraph/subgraph_property.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/subgraph/dnnl/dnnl_transformer-inl.h b/src/operator/subgraph/dnnl/dnnl_transformer-inl.h
index b711e53..6f69064 100644
--- a/src/operator/subgraph/dnnl/dnnl_transformer-inl.h
+++ b/src/operator/subgraph/dnnl/dnnl_transformer-inl.h
@@ -20,8 +20,8 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_TRANSFORMER_INL_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_TRANSFORMER_INL_H_
-#include "../../mshadow_op.h"
-#include "../../mxnet_op.h"
+#include "operator/mshadow_op.h"
+#include "operator/mxnet_op.h"
namespace mxnet {
namespace op {
diff --git a/src/operator/subgraph/dnnl/dnnl_transformer.cc b/src/operator/subgraph/dnnl/dnnl_transformer.cc
index 5871cb2..6574be6 100644
--- a/src/operator/subgraph/dnnl/dnnl_transformer.cc
+++ b/src/operator/subgraph/dnnl/dnnl_transformer.cc
@@ -23,11 +23,11 @@
#include <utility>
#include <vector>
-#include "../../contrib/transformer-inl.h"
-#include "../../quantization/quantization_utils.h"
-#include "../../tensor/elemwise_unary_op.h"
-#include "../common.h"
-#include "./dnnl_transformer-inl.h"
+#include "operator/contrib/transformer-inl.h"
+#include "operator/quantization/quantization_utils.h"
+#include "operator/tensor/elemwise_unary_op.h"
+#include "operator/subgraph/common.h"
+#include "dnnl_transformer-inl.h"
// 3 tensors within one (queries key values) =
#define QKV_NUM 3
diff --git a/src/operator/subgraph/dnnl/dnnl_transformer_qk_property.h b/src/operator/subgraph/dnnl/dnnl_transformer_qk_property.h
index 3be675c..c117cf6 100644
--- a/src/operator/subgraph/dnnl/dnnl_transformer_qk_property.h
+++ b/src/operator/subgraph/dnnl/dnnl_transformer_qk_property.h
@@ -19,16 +19,17 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_TRANSFORMER_QK_PROPERTY_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_TRANSFORMER_QK_PROPERTY_H_
+
#if MXNET_USE_ONEDNN == 1
#include <map>
#include <string>
#include <vector>
-#include "../../contrib/transformer-inl.h"
-#include "../../numpy/np_matrix_op-inl.h"
-#include "../../tensor/matrix_op-inl.h"
-#include "../common.h"
+#include "operator/contrib/transformer-inl.h"
+#include "operator/numpy/np_matrix_op-inl.h"
+#include "operator/tensor/matrix_op-inl.h"
+#include "operator/subgraph/common.h"
#include "dnnl_common.h"
#include "dnnl_subgraph_base-inl.h"
#include "dnnl_transformer-inl.h"
diff --git a/src/operator/subgraph/dnnl/dnnl_transformer_valatt_property.h b/src/operator/subgraph/dnnl/dnnl_transformer_valatt_property.h
index a62c10f..35f02f6 100644
--- a/src/operator/subgraph/dnnl/dnnl_transformer_valatt_property.h
+++ b/src/operator/subgraph/dnnl/dnnl_transformer_valatt_property.h
@@ -19,17 +19,18 @@
#ifndef MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_TRANSFORMER_VALATT_PROPERTY_H_
#define MXNET_OPERATOR_SUBGRAPH_DNNL_DNNL_TRANSFORMER_VALATT_PROPERTY_H_
+
#if MXNET_USE_ONEDNN == 1
#include <map>
#include <string>
#include <vector>
-#include "../../contrib/transformer-inl.h"
-#include "../../numpy/np_matrix_op-inl.h"
-#include "../../swapaxis-inl.h"
-#include "../../tensor/matrix_op-inl.h"
-#include "../common.h"
+#include "operator/contrib/transformer-inl.h"
+#include "operator/numpy/np_matrix_op-inl.h"
+#include "operator/swapaxis-inl.h"
+#include "operator/tensor/matrix_op-inl.h"
+#include "operator/subgraph/common.h"
#include "dnnl_common.h"
#include "dnnl_subgraph_base-inl.h"
#include "dnnl_transformer-inl.h"