Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[master] Avoid dots, full path to a file. #20751

Merged
merged 8 commits into from
Jan 27, 2022
Merged

[master] Avoid dots, full path to a file. #20751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
02f7ba3
Keep full path to a file in directory
mozga-intel Nov 19, 2021
ac97edf
Conflict && simplyfy includes
mozga-intel Nov 25, 2021
51cd121
Delete unused files
mozga-intel Nov 25, 2021
47bf127
Add misssed headers
mozga-intel Dec 9, 2021
26a8e99
Merge remote-tracking branch 'origin/master' into mozga-intel/full_pa…
mozga-intel Dec 9, 2021
00f7c68
Move header before
mozga-intel Dec 9, 2021
a9c5b0e
Merge remote-tracking branch 'origin/master' into mozga-intel/full_pa…
mozga-intel Dec 15, 2021
e421b87
Merge remote-tracking branch 'origin/master' into mozga-intel/full_pa…
mozga-intel Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/operator/nn/dnnl/dnnl_act-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/operator/nn/dnnl/dnnl_act.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#include <atomic>

#include "../../../common/exec_utils.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this one has been left unchanged?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file comes from another scope ~ there I have another idea.

#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 {

Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_batch_dot-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/operator/nn/dnnl/dnnl_batch_dot.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_batch_norm-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_concat-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_convolution-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 6 additions & 4 deletions src/operator/nn/dnnl/dnnl_convolution.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/operator/nn/dnnl/dnnl_copy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_deconvolution-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/operator/nn/dnnl/dnnl_deconvolution.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/operator/nn/dnnl/dnnl_fully_connected-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_layer_norm-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/operator/nn/dnnl/dnnl_layer_norm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_log_softmax.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/operator/nn/dnnl/dnnl_lrn-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/operator/nn/dnnl/dnnl_pooling-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/operator/nn/dnnl/dnnl_pooling.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#if MXNET_USE_ONEDNN == 1

#include "./dnnl_pooling-inl.h"
#include "dnnl_pooling-inl.h"

namespace mxnet {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/operator/nn/dnnl/dnnl_reshape-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions src/operator/nn/dnnl/dnnl_reshape.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/operator/nn/dnnl/dnnl_rnn-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion src/operator/nn/dnnl/dnnl_rnn.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_slice-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_slice.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_softmax-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/operator/nn/dnnl/dnnl_softmax.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/

#if MXNET_USE_ONEDNN == 1
#include "./dnnl_softmax-inl.h"
#include "dnnl_softmax-inl.h"

namespace mxnet {
namespace op {
Expand Down
8 changes: 5 additions & 3 deletions src/operator/nn/dnnl/dnnl_softmax_output.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
8 changes: 4 additions & 4 deletions src/operator/nn/dnnl/dnnl_stack.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_sum.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/operator/nn/dnnl/dnnl_transpose-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions src/operator/nn/dnnl/dnnl_transpose.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading