[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
apache · Jan 27, 2022 · 8cf49ed · 8cf49ed
1 parent 8779faf
commit 8cf49ed
Show file tree

Hide file tree

Showing 61 changed files with 183 additions and 165 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {