From 9b56d08112fa767c5aa2b9ee445005db02cc2324 Mon Sep 17 00:00:00 2001 From: Katarzyna Mitrus Date: Fri, 6 Dec 2019 16:27:58 +0100 Subject: [PATCH] Headers refactoring in ONNX importer (#4004) --- src/ngraph/frontend/onnx_import/CMakeLists.txt | 2 +- src/ngraph/frontend/onnx_import/op/acosh.cpp | 2 ++ src/ngraph/frontend/onnx_import/op/acosh.hpp | 2 -- src/ngraph/frontend/onnx_import/op/add.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/and.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/argmax.cpp | 3 ++- src/ngraph/frontend/onnx_import/op/argmin.cpp | 3 ++- src/ngraph/frontend/onnx_import/op/asinh.cpp | 2 ++ src/ngraph/frontend/onnx_import/op/asinh.hpp | 2 -- src/ngraph/frontend/onnx_import/op/atanh.cpp | 2 ++ src/ngraph/frontend/onnx_import/op/atanh.hpp | 2 -- src/ngraph/frontend/onnx_import/op/average_pool.cpp | 1 + src/ngraph/frontend/onnx_import/op/batch_norm.cpp | 7 +++---- src/ngraph/frontend/onnx_import/op/batch_norm.hpp | 1 + src/ngraph/frontend/onnx_import/op/constant.cpp | 5 ++--- src/ngraph/frontend/onnx_import/op/conv.cpp | 6 +++--- src/ngraph/frontend/onnx_import/op/conv_integer.cpp | 2 +- src/ngraph/frontend/onnx_import/op/conv_transpose.cpp | 6 +++--- src/ngraph/frontend/onnx_import/op/dequantize_linear.cpp | 2 +- src/ngraph/frontend/onnx_import/op/div.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/elu.cpp | 3 +-- src/ngraph/frontend/onnx_import/op/equal.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/expand.cpp | 1 + src/ngraph/frontend/onnx_import/op/eye_like.cpp | 7 +++++-- src/ngraph/frontend/onnx_import/op/flatten.hpp | 2 -- src/ngraph/frontend/onnx_import/op/gather.hpp | 2 ++ .../frontend/onnx_import/op/global_average_pool.cpp | 1 + src/ngraph/frontend/onnx_import/op/global_max_pool.cpp | 1 + src/ngraph/frontend/onnx_import/op/greater.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/instance_norm.cpp | 1 + src/ngraph/frontend/onnx_import/op/leaky_relu.cpp | 9 +-------- src/ngraph/frontend/onnx_import/op/less.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/log_softmax.cpp | 4 +--- src/ngraph/frontend/onnx_import/op/log_softmax.hpp | 2 -- src/ngraph/frontend/onnx_import/op/lp_norm.cpp | 1 + src/ngraph/frontend/onnx_import/op/lstm.cpp | 1 + src/ngraph/frontend/onnx_import/op/matmul.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/max_pool.cpp | 6 ++++-- .../onnx_import/op/mean_variance_normalization.hpp | 2 -- src/ngraph/frontend/onnx_import/op/mod.cpp | 3 ++- src/ngraph/frontend/onnx_import/op/mod.hpp | 2 -- src/ngraph/frontend/onnx_import/op/mul.hpp | 2 ++ .../frontend/onnx_import/op/non_max_suppression.cpp | 1 + .../frontend/onnx_import/op/non_max_suppression.hpp | 1 - src/ngraph/frontend/onnx_import/op/not.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/onehot.hpp | 2 -- src/ngraph/frontend/onnx_import/op/or.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/pad.cpp | 4 ++-- src/ngraph/frontend/onnx_import/op/pad.hpp | 2 +- src/ngraph/frontend/onnx_import/op/pow.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/quant_conv.cpp | 3 +-- src/ngraph/frontend/onnx_import/op/reciprocal.cpp | 1 - src/ngraph/frontend/onnx_import/op/relu.hpp | 2 ++ src/ngraph/frontend/onnx_import/op/reverse_sequence.cpp | 1 + .../op/{reverse_sequence.h => reverse_sequence.hpp} | 4 +--- src/ngraph/frontend/onnx_import/op/shape.cpp | 1 - src/ngraph/frontend/onnx_import/op/size.cpp | 3 +-- src/ngraph/frontend/onnx_import/op/softplus.cpp | 1 - src/ngraph/frontend/onnx_import/op/softsign.cpp | 1 - src/ngraph/frontend/onnx_import/op/split.cpp | 2 +- src/ngraph/frontend/onnx_import/op/unsqueeze.cpp | 7 +++++-- src/ngraph/frontend/onnx_import/ops_bridge.cpp | 2 +- src/ngraph/frontend/onnx_import/utils/reshape.cpp | 1 + 63 files changed, 88 insertions(+), 71 deletions(-) rename src/ngraph/frontend/onnx_import/op/{reverse_sequence.h => reverse_sequence.hpp} (96%) diff --git a/src/ngraph/frontend/onnx_import/CMakeLists.txt b/src/ngraph/frontend/onnx_import/CMakeLists.txt index 271d11cb75a..8e92eb01414 100644 --- a/src/ngraph/frontend/onnx_import/CMakeLists.txt +++ b/src/ngraph/frontend/onnx_import/CMakeLists.txt @@ -164,7 +164,7 @@ add_library(onnx_import STATIC op/reshape.cpp op/reshape.hpp op/reverse_sequence.cpp - op/reverse_sequence.h + op/reverse_sequence.hpp op/selu.cpp op/selu.hpp op/shape.hpp diff --git a/src/ngraph/frontend/onnx_import/op/acosh.cpp b/src/ngraph/frontend/onnx_import/op/acosh.cpp index 9011d155fca..e79b867703c 100644 --- a/src/ngraph/frontend/onnx_import/op/acosh.cpp +++ b/src/ngraph/frontend/onnx_import/op/acosh.cpp @@ -14,6 +14,8 @@ // limitations under the License. //***************************************************************************** +#include + #include "acosh.hpp" #include "ngraph/op/add.hpp" #include "ngraph/op/constant.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/acosh.hpp b/src/ngraph/frontend/onnx_import/op/acosh.hpp index 83dea337214..8794c1a4225 100644 --- a/src/ngraph/frontend/onnx_import/op/acosh.hpp +++ b/src/ngraph/frontend/onnx_import/op/acosh.hpp @@ -16,8 +16,6 @@ #pragma once -#include - #include "core/node.hpp" #include "ngraph/node.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/add.hpp b/src/ngraph/frontend/onnx_import/op/add.hpp index 16413cafaa3..b26793419e4 100644 --- a/src/ngraph/frontend/onnx_import/op/add.hpp +++ b/src/ngraph/frontend/onnx_import/op/add.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/add.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/and.hpp b/src/ngraph/frontend/onnx_import/op/and.hpp index c292f763f81..9f8574c3417 100644 --- a/src/ngraph/frontend/onnx_import/op/and.hpp +++ b/src/ngraph/frontend/onnx_import/op/and.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/and.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/argmax.cpp b/src/ngraph/frontend/onnx_import/op/argmax.cpp index 793e028a4bf..ee5bd154227 100644 --- a/src/ngraph/frontend/onnx_import/op/argmax.cpp +++ b/src/ngraph/frontend/onnx_import/op/argmax.cpp @@ -14,9 +14,10 @@ // limitations under the License. //***************************************************************************** -#include "ngraph/op/argmax.hpp" +#include "argmax.hpp" #include "core/node.hpp" #include "ngraph/node.hpp" +#include "ngraph/op/argmax.hpp" #include "utils/reduction.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/argmin.cpp b/src/ngraph/frontend/onnx_import/op/argmin.cpp index 1425d0f25a0..33d6dc288a1 100644 --- a/src/ngraph/frontend/onnx_import/op/argmin.cpp +++ b/src/ngraph/frontend/onnx_import/op/argmin.cpp @@ -14,9 +14,10 @@ // limitations under the License. //***************************************************************************** -#include "ngraph/op/argmin.hpp" +#include "argmin.hpp" #include "core/node.hpp" #include "ngraph/node.hpp" +#include "ngraph/op/argmin.hpp" #include "utils/reduction.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/asinh.cpp b/src/ngraph/frontend/onnx_import/op/asinh.cpp index f7595d64004..80f967e3c9e 100644 --- a/src/ngraph/frontend/onnx_import/op/asinh.cpp +++ b/src/ngraph/frontend/onnx_import/op/asinh.cpp @@ -14,6 +14,8 @@ // limitations under the License. //***************************************************************************** +#include + #include "asinh.hpp" #include "ngraph/op/add.hpp" #include "ngraph/op/constant.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/asinh.hpp b/src/ngraph/frontend/onnx_import/op/asinh.hpp index 450c438f51b..7470adbbc59 100644 --- a/src/ngraph/frontend/onnx_import/op/asinh.hpp +++ b/src/ngraph/frontend/onnx_import/op/asinh.hpp @@ -16,8 +16,6 @@ #pragma once -#include - #include "core/node.hpp" #include "ngraph/node.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/atanh.cpp b/src/ngraph/frontend/onnx_import/op/atanh.cpp index 0c7d6dcae31..e46316af02c 100644 --- a/src/ngraph/frontend/onnx_import/op/atanh.cpp +++ b/src/ngraph/frontend/onnx_import/op/atanh.cpp @@ -14,6 +14,8 @@ // limitations under the License. //***************************************************************************** +#include + #include "atanh.hpp" #include "ngraph/op/add.hpp" #include "ngraph/op/constant.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/atanh.hpp b/src/ngraph/frontend/onnx_import/op/atanh.hpp index b45a2d60472..2b02d65d987 100644 --- a/src/ngraph/frontend/onnx_import/op/atanh.hpp +++ b/src/ngraph/frontend/onnx_import/op/atanh.hpp @@ -16,8 +16,6 @@ #pragma once -#include - #include "core/node.hpp" #include "ngraph/node.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/average_pool.cpp b/src/ngraph/frontend/onnx_import/op/average_pool.cpp index d05f436b9b4..d26c10d1f5d 100644 --- a/src/ngraph/frontend/onnx_import/op/average_pool.cpp +++ b/src/ngraph/frontend/onnx_import/op/average_pool.cpp @@ -14,6 +14,7 @@ // limitations under the License. //***************************************************************************** +#include "average_pool.hpp" #include "ngraph/node.hpp" #include "ngraph/op/avg_pool.hpp" #include "utils/pooling_factory.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/batch_norm.cpp b/src/ngraph/frontend/onnx_import/op/batch_norm.cpp index b2eb90c3fea..277c5e2983a 100644 --- a/src/ngraph/frontend/onnx_import/op/batch_norm.cpp +++ b/src/ngraph/frontend/onnx_import/op/batch_norm.cpp @@ -17,10 +17,9 @@ #include #include -#include "ngraph/frontend/onnx_import/core/null_node.hpp" -#include "ngraph/frontend/onnx_import/exceptions.hpp" -#include "ngraph/frontend/onnx_import/op/batch_norm.hpp" -#include "ngraph/node.hpp" +#include "batch_norm.hpp" +#include "core/null_node.hpp" +#include "exceptions.hpp" #include "ngraph/op/batch_norm.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/batch_norm.hpp b/src/ngraph/frontend/onnx_import/op/batch_norm.hpp index 674cb5c6c61..5a38dfe8b90 100644 --- a/src/ngraph/frontend/onnx_import/op/batch_norm.hpp +++ b/src/ngraph/frontend/onnx_import/op/batch_norm.hpp @@ -17,6 +17,7 @@ #pragma once #include "core/node.hpp" +#include "ngraph/node.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/constant.cpp b/src/ngraph/frontend/onnx_import/op/constant.cpp index ea695fea353..093a7746863 100644 --- a/src/ngraph/frontend/onnx_import/op/constant.cpp +++ b/src/ngraph/frontend/onnx_import/op/constant.cpp @@ -14,10 +14,9 @@ // limitations under the License. //***************************************************************************** -#include "ngraph/op/constant.hpp" -#include "core/node.hpp" +#include "constant.hpp" #include "core/tensor.hpp" -#include "ngraph/node.hpp" +#include "ngraph/op/constant.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/conv.cpp b/src/ngraph/frontend/onnx_import/op/conv.cpp index aa3ec1784be..fec8e3a63d5 100644 --- a/src/ngraph/frontend/onnx_import/op/conv.cpp +++ b/src/ngraph/frontend/onnx_import/op/conv.cpp @@ -18,10 +18,9 @@ #include #include +#include "conv.hpp" +#include "exceptions.hpp" #include "ngraph/builder/reshape.hpp" -#include "ngraph/frontend/onnx_import/exceptions.hpp" -#include "ngraph/frontend/onnx_import/op/conv.hpp" -#include "ngraph/frontend/onnx_import/utils/convpool.hpp" #include "ngraph/op/add.hpp" #include "ngraph/op/broadcast.hpp" #include "ngraph/op/concat.hpp" @@ -31,6 +30,7 @@ #include "ngraph/op/slice.hpp" #include "ngraph/op/util/attr_types.hpp" #include "ngraph/op/util/broadcasting.hpp" +#include "utils/convpool.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/conv_integer.cpp b/src/ngraph/frontend/onnx_import/op/conv_integer.cpp index 154c9c09af1..08aca6ed2ef 100644 --- a/src/ngraph/frontend/onnx_import/op/conv_integer.cpp +++ b/src/ngraph/frontend/onnx_import/op/conv_integer.cpp @@ -14,7 +14,7 @@ // limitations under the License. //***************************************************************************** -#include "op/conv_integer.hpp" +#include "conv_integer.hpp" #include "ngraph/builder/make_constant.hpp" #include "ngraph/frontend/onnx_import/exceptions.hpp" #include "ngraph/frontend/onnx_import/utils/convpool.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/conv_transpose.cpp b/src/ngraph/frontend/onnx_import/op/conv_transpose.cpp index 5322f3691eb..e52bfade8f2 100644 --- a/src/ngraph/frontend/onnx_import/op/conv_transpose.cpp +++ b/src/ngraph/frontend/onnx_import/op/conv_transpose.cpp @@ -20,15 +20,15 @@ #include #include +#include "conv_transpose.hpp" +#include "exceptions.hpp" #include "ngraph/coordinate_diff.hpp" -#include "ngraph/frontend/onnx_import/exceptions.hpp" -#include "ngraph/frontend/onnx_import/op/conv_transpose.hpp" -#include "ngraph/frontend/onnx_import/utils/convpool.hpp" #include "ngraph/op/add.hpp" #include "ngraph/op/fused/group_conv_transpose.hpp" #include "ngraph/op/util/attr_types.hpp" #include "ngraph/op/util/broadcasting.hpp" #include "ngraph/shape.hpp" +#include "utils/convpool.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/dequantize_linear.cpp b/src/ngraph/frontend/onnx_import/op/dequantize_linear.cpp index 9031a82a49a..b219ecf18c0 100644 --- a/src/ngraph/frontend/onnx_import/op/dequantize_linear.cpp +++ b/src/ngraph/frontend/onnx_import/op/dequantize_linear.cpp @@ -17,12 +17,12 @@ #include #include +#include "dequantize_linear.hpp" #include "ngraph/axis_set.hpp" #include "ngraph/builder/make_constant.hpp" #include "ngraph/op/convert.hpp" #include "ngraph/op/dequantize.hpp" #include "ngraph/shape.hpp" -#include "quantize_linear.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/div.hpp b/src/ngraph/frontend/onnx_import/op/div.hpp index 23a16a5bfb1..a50ca56d534 100644 --- a/src/ngraph/frontend/onnx_import/op/div.hpp +++ b/src/ngraph/frontend/onnx_import/op/div.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/divide.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/elu.cpp b/src/ngraph/frontend/onnx_import/op/elu.cpp index 7db12e4a450..61f4ebd4c44 100644 --- a/src/ngraph/frontend/onnx_import/op/elu.cpp +++ b/src/ngraph/frontend/onnx_import/op/elu.cpp @@ -17,11 +17,10 @@ #include #include +#include "elu.hpp" #include "ngraph/op/constant.hpp" #include "ngraph/op/fused/elu.hpp" -#include "elu.hpp" - namespace ngraph { namespace onnx_import diff --git a/src/ngraph/frontend/onnx_import/op/equal.hpp b/src/ngraph/frontend/onnx_import/op/equal.hpp index c36d7dbc15f..ae7af50db76 100644 --- a/src/ngraph/frontend/onnx_import/op/equal.hpp +++ b/src/ngraph/frontend/onnx_import/op/equal.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/equal.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/expand.cpp b/src/ngraph/frontend/onnx_import/op/expand.cpp index 594a74803aa..17886fff0bb 100644 --- a/src/ngraph/frontend/onnx_import/op/expand.cpp +++ b/src/ngraph/frontend/onnx_import/op/expand.cpp @@ -16,6 +16,7 @@ #include #include +#include #include "expand.hpp" #include "ngraph/descriptor/output.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/eye_like.cpp b/src/ngraph/frontend/onnx_import/op/eye_like.cpp index 8ee2a0a53a6..8d0b85e35d0 100644 --- a/src/ngraph/frontend/onnx_import/op/eye_like.cpp +++ b/src/ngraph/frontend/onnx_import/op/eye_like.cpp @@ -13,9 +13,12 @@ // See the License for the specific language governing permissions and // limitations under the License. //***************************************************************************** -#include "eye_like.hpp" + +#include + #include "exceptions.hpp" -#include "ngraph/frontend/onnx_import/utils/common.hpp" +#include "eye_like.hpp" +#include "utils/common.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/flatten.hpp b/src/ngraph/frontend/onnx_import/op/flatten.hpp index 4670ef53cbb..9e84ac26ef2 100644 --- a/src/ngraph/frontend/onnx_import/op/flatten.hpp +++ b/src/ngraph/frontend/onnx_import/op/flatten.hpp @@ -16,8 +16,6 @@ #pragma once -#include - #include "core/node.hpp" #include "ngraph/node.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/gather.hpp b/src/ngraph/frontend/onnx_import/op/gather.hpp index af281ff0d87..bd07e23014e 100644 --- a/src/ngraph/frontend/onnx_import/op/gather.hpp +++ b/src/ngraph/frontend/onnx_import/op/gather.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/gather.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/global_average_pool.cpp b/src/ngraph/frontend/onnx_import/op/global_average_pool.cpp index 4ed0064d480..0284f941c6f 100644 --- a/src/ngraph/frontend/onnx_import/op/global_average_pool.cpp +++ b/src/ngraph/frontend/onnx_import/op/global_average_pool.cpp @@ -14,6 +14,7 @@ // limitations under the License. //***************************************************************************** +#include "global_average_pool.hpp" #include "ngraph/node.hpp" #include "ngraph/op/avg_pool.hpp" #include "utils/pooling_factory.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/global_max_pool.cpp b/src/ngraph/frontend/onnx_import/op/global_max_pool.cpp index 2563ca3b03d..191d15dd5a2 100644 --- a/src/ngraph/frontend/onnx_import/op/global_max_pool.cpp +++ b/src/ngraph/frontend/onnx_import/op/global_max_pool.cpp @@ -14,6 +14,7 @@ // limitations under the License. //***************************************************************************** +#include "global_max_pool.hpp" #include "ngraph/node.hpp" #include "ngraph/op/max_pool.hpp" #include "utils/pooling_factory.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/greater.hpp b/src/ngraph/frontend/onnx_import/op/greater.hpp index fc105524700..11c5f9248f4 100644 --- a/src/ngraph/frontend/onnx_import/op/greater.hpp +++ b/src/ngraph/frontend/onnx_import/op/greater.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/greater.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/instance_norm.cpp b/src/ngraph/frontend/onnx_import/op/instance_norm.cpp index c80a63fdaae..e0afe45f214 100644 --- a/src/ngraph/frontend/onnx_import/op/instance_norm.cpp +++ b/src/ngraph/frontend/onnx_import/op/instance_norm.cpp @@ -15,6 +15,7 @@ //***************************************************************************** #include +#include #include "exceptions.hpp" #include "instance_norm.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/leaky_relu.cpp b/src/ngraph/frontend/onnx_import/op/leaky_relu.cpp index d9365c37cb1..119d6493d96 100644 --- a/src/ngraph/frontend/onnx_import/op/leaky_relu.cpp +++ b/src/ngraph/frontend/onnx_import/op/leaky_relu.cpp @@ -17,17 +17,10 @@ #include #include "exceptions.hpp" -#include "ngraph/node.hpp" -#include "ngraph/node.hpp" -#include "ngraph/op/broadcast.hpp" +#include "leaky_relu.hpp" #include "ngraph/op/constant.hpp" #include "ngraph/op/maximum.hpp" #include "ngraph/op/multiply.hpp" -#include "ngraph/shape.hpp" - -#include "core/node.hpp" -#include "leaky_relu.hpp" -#include "ngraph/op/util/broadcasting.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/less.hpp b/src/ngraph/frontend/onnx_import/op/less.hpp index 8990433c108..c8ea0987891 100644 --- a/src/ngraph/frontend/onnx_import/op/less.hpp +++ b/src/ngraph/frontend/onnx_import/op/less.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/less.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/log_softmax.cpp b/src/ngraph/frontend/onnx_import/op/log_softmax.cpp index 99d0806299c..81bce51ff24 100644 --- a/src/ngraph/frontend/onnx_import/op/log_softmax.cpp +++ b/src/ngraph/frontend/onnx_import/op/log_softmax.cpp @@ -16,10 +16,8 @@ #include -#include "core/node.hpp" -#include "ngraph/node.hpp" +#include "log_softmax.hpp" #include "ngraph/op/fused/log_softmax.hpp" -#include "utils/common.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/log_softmax.hpp b/src/ngraph/frontend/onnx_import/op/log_softmax.hpp index 53b526ad148..6524221afe7 100644 --- a/src/ngraph/frontend/onnx_import/op/log_softmax.hpp +++ b/src/ngraph/frontend/onnx_import/op/log_softmax.hpp @@ -16,8 +16,6 @@ #pragma once -#include - #include "core/node.hpp" #include "ngraph/node.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/lp_norm.cpp b/src/ngraph/frontend/onnx_import/op/lp_norm.cpp index 313f54f4f05..abb3367e8e8 100644 --- a/src/ngraph/frontend/onnx_import/op/lp_norm.cpp +++ b/src/ngraph/frontend/onnx_import/op/lp_norm.cpp @@ -16,6 +16,7 @@ #include #include +#include #include "exceptions.hpp" #include "lp_norm.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/lstm.cpp b/src/ngraph/frontend/onnx_import/op/lstm.cpp index 61016dce1e7..61547c97825 100644 --- a/src/ngraph/frontend/onnx_import/op/lstm.cpp +++ b/src/ngraph/frontend/onnx_import/op/lstm.cpp @@ -22,6 +22,7 @@ #include #include "exceptions.hpp" +#include "lstm.hpp" #include "ngraph/builder/split.hpp" #include "ngraph/frontend/onnx_import/op/lstm.hpp" #include "ngraph/op/add.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/matmul.hpp b/src/ngraph/frontend/onnx_import/op/matmul.hpp index ecc71150731..9e8963cfdf0 100644 --- a/src/ngraph/frontend/onnx_import/op/matmul.hpp +++ b/src/ngraph/frontend/onnx_import/op/matmul.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/fused/matmul.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/max_pool.cpp b/src/ngraph/frontend/onnx_import/op/max_pool.cpp index 5d90c5c1816..759808f81a8 100644 --- a/src/ngraph/frontend/onnx_import/op/max_pool.cpp +++ b/src/ngraph/frontend/onnx_import/op/max_pool.cpp @@ -14,9 +14,11 @@ // limitations under the License. //***************************************************************************** -#include "ngraph/op/max_pool.hpp" +#include + #include "core/null_node.hpp" -#include "ngraph/node.hpp" +#include "max_pool.hpp" +#include "ngraph/op/max_pool.hpp" #include "utils/pooling_factory.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/mean_variance_normalization.hpp b/src/ngraph/frontend/onnx_import/op/mean_variance_normalization.hpp index 0bd2f4220d5..71e0192150c 100644 --- a/src/ngraph/frontend/onnx_import/op/mean_variance_normalization.hpp +++ b/src/ngraph/frontend/onnx_import/op/mean_variance_normalization.hpp @@ -16,8 +16,6 @@ #pragma once -#include - #include "core/node.hpp" #include "ngraph/node.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/mod.cpp b/src/ngraph/frontend/onnx_import/op/mod.cpp index 85d1a9c115b..bc9e2c23286 100644 --- a/src/ngraph/frontend/onnx_import/op/mod.cpp +++ b/src/ngraph/frontend/onnx_import/op/mod.cpp @@ -13,10 +13,11 @@ // See the License for the specific language governing permissions and // limitations under the License. //***************************************************************************** + #include +#include "exceptions.hpp" #include "mod.hpp" -#include "ngraph/frontend/onnx_import/exceptions.hpp" #include "ngraph/op/abs.hpp" #include "ngraph/op/fused/mod.hpp" #include "ngraph/op/util/attr_types.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/mod.hpp b/src/ngraph/frontend/onnx_import/op/mod.hpp index 375be5defe0..27ef8611189 100644 --- a/src/ngraph/frontend/onnx_import/op/mod.hpp +++ b/src/ngraph/frontend/onnx_import/op/mod.hpp @@ -16,8 +16,6 @@ #pragma once -#include - #include "core/node.hpp" #include "ngraph/node.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/mul.hpp b/src/ngraph/frontend/onnx_import/op/mul.hpp index 24d3662461f..a93ec441519 100644 --- a/src/ngraph/frontend/onnx_import/op/mul.hpp +++ b/src/ngraph/frontend/onnx_import/op/mul.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/broadcast.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/non_max_suppression.cpp b/src/ngraph/frontend/onnx_import/op/non_max_suppression.cpp index b82e2b6f0de..2ac3ab87cf6 100644 --- a/src/ngraph/frontend/onnx_import/op/non_max_suppression.cpp +++ b/src/ngraph/frontend/onnx_import/op/non_max_suppression.cpp @@ -13,6 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. //***************************************************************************** + #include #include "ngraph/frontend/onnx_import/exceptions.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/non_max_suppression.hpp b/src/ngraph/frontend/onnx_import/op/non_max_suppression.hpp index 63a1708b8c5..1dc2cde8b8b 100644 --- a/src/ngraph/frontend/onnx_import/op/non_max_suppression.hpp +++ b/src/ngraph/frontend/onnx_import/op/non_max_suppression.hpp @@ -18,7 +18,6 @@ #include "core/node.hpp" #include "ngraph/node.hpp" -#include "ngraph/op/and.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/not.hpp b/src/ngraph/frontend/onnx_import/op/not.hpp index 8551586ba92..ae3c99dac97 100644 --- a/src/ngraph/frontend/onnx_import/op/not.hpp +++ b/src/ngraph/frontend/onnx_import/op/not.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/not.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/onehot.hpp b/src/ngraph/frontend/onnx_import/op/onehot.hpp index bb767576fa0..15e71a69b04 100644 --- a/src/ngraph/frontend/onnx_import/op/onehot.hpp +++ b/src/ngraph/frontend/onnx_import/op/onehot.hpp @@ -16,8 +16,6 @@ #pragma once -#include - #include "core/node.hpp" #include "ngraph/node.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/or.hpp b/src/ngraph/frontend/onnx_import/op/or.hpp index 00de0ee5e03..111bceef3ac 100644 --- a/src/ngraph/frontend/onnx_import/op/or.hpp +++ b/src/ngraph/frontend/onnx_import/op/or.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/or.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/pad.cpp b/src/ngraph/frontend/onnx_import/op/pad.cpp index 5ed29c95282..c2b594ddbc2 100644 --- a/src/ngraph/frontend/onnx_import/op/pad.cpp +++ b/src/ngraph/frontend/onnx_import/op/pad.cpp @@ -18,11 +18,11 @@ #include "exceptions.hpp" #include "ngraph/coordinate_diff.hpp" -#include "ngraph/frontend/onnx_import/op/pad.hpp" -#include "ngraph/frontend/onnx_import/utils/convpool.hpp" #include "ngraph/op/constant.hpp" #include "ngraph/op/pad.hpp" #include "ngraph/shape.hpp" +#include "pad.hpp" +#include "utils/convpool.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/pad.hpp b/src/ngraph/frontend/onnx_import/op/pad.hpp index 98b0497a308..6c5de112d8d 100644 --- a/src/ngraph/frontend/onnx_import/op/pad.hpp +++ b/src/ngraph/frontend/onnx_import/op/pad.hpp @@ -16,7 +16,7 @@ #pragma once -#include "ngraph/frontend/onnx_import/core/node.hpp" +#include "core/node.hpp" #include "ngraph/node.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/pow.hpp b/src/ngraph/frontend/onnx_import/op/pow.hpp index f27e6a71223..6a4bcd2f94e 100644 --- a/src/ngraph/frontend/onnx_import/op/pow.hpp +++ b/src/ngraph/frontend/onnx_import/op/pow.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/power.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/quant_conv.cpp b/src/ngraph/frontend/onnx_import/op/quant_conv.cpp index 925ce509e06..67a6f531a00 100644 --- a/src/ngraph/frontend/onnx_import/op/quant_conv.cpp +++ b/src/ngraph/frontend/onnx_import/op/quant_conv.cpp @@ -18,10 +18,9 @@ #include #include +#include "exceptions.hpp" #include "ngraph/builder/quantization/quantized_linear_convolution.hpp" #include "ngraph/coordinate_diff.hpp" -#include "ngraph/frontend/onnx_import/exceptions.hpp" -#include "ngraph/frontend/onnx_import/op/conv.hpp" #include "ngraph/frontend/onnx_import/utils/convpool.hpp" #include "ngraph/op/concat.hpp" #include "ngraph/op/quantized_convolution.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/reciprocal.cpp b/src/ngraph/frontend/onnx_import/op/reciprocal.cpp index 999f393ea0a..a6ac26623d9 100644 --- a/src/ngraph/frontend/onnx_import/op/reciprocal.cpp +++ b/src/ngraph/frontend/onnx_import/op/reciprocal.cpp @@ -20,7 +20,6 @@ #include "ngraph/op/fused/reciprocal.hpp" #include "ngraph/op/util/broadcasting.hpp" #include "ngraph/shape.hpp" - #include "reciprocal.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/relu.hpp b/src/ngraph/frontend/onnx_import/op/relu.hpp index 598d6914612..6c63fe3b9b2 100644 --- a/src/ngraph/frontend/onnx_import/op/relu.hpp +++ b/src/ngraph/frontend/onnx_import/op/relu.hpp @@ -16,6 +16,8 @@ #pragma once +#include + #include "core/node.hpp" #include "ngraph/node.hpp" #include "ngraph/op/relu.hpp" diff --git a/src/ngraph/frontend/onnx_import/op/reverse_sequence.cpp b/src/ngraph/frontend/onnx_import/op/reverse_sequence.cpp index 40aeb8d7371..1e3dce1b7aa 100644 --- a/src/ngraph/frontend/onnx_import/op/reverse_sequence.cpp +++ b/src/ngraph/frontend/onnx_import/op/reverse_sequence.cpp @@ -21,6 +21,7 @@ #include "ngraph/op/convert.hpp" #include "ngraph/op/reverse_sequence.hpp" #include "ngraph/type/element_type.hpp" +#include "reverse_sequence.hpp" #include "utils/common.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/reverse_sequence.h b/src/ngraph/frontend/onnx_import/op/reverse_sequence.hpp similarity index 96% rename from src/ngraph/frontend/onnx_import/op/reverse_sequence.h rename to src/ngraph/frontend/onnx_import/op/reverse_sequence.hpp index 6522b6ede63..769e27027c2 100644 --- a/src/ngraph/frontend/onnx_import/op/reverse_sequence.h +++ b/src/ngraph/frontend/onnx_import/op/reverse_sequence.hpp @@ -16,8 +16,6 @@ #pragma once -#include - #include "core/node.hpp" #include "ngraph/node.hpp" @@ -33,7 +31,7 @@ namespace ngraph } // namespace set_1 - } //namespace op + } // namespace op } // namespace onnx_import diff --git a/src/ngraph/frontend/onnx_import/op/shape.cpp b/src/ngraph/frontend/onnx_import/op/shape.cpp index d3198ac071e..1e43b6aa6b2 100644 --- a/src/ngraph/frontend/onnx_import/op/shape.cpp +++ b/src/ngraph/frontend/onnx_import/op/shape.cpp @@ -20,7 +20,6 @@ #include "ngraph/op/constant.hpp" #include "ngraph/shape.hpp" #include "ngraph/type/element_type.hpp" - #include "shape.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/size.cpp b/src/ngraph/frontend/onnx_import/op/size.cpp index adcd7b1d0dd..2ea86477fe8 100644 --- a/src/ngraph/frontend/onnx_import/op/size.cpp +++ b/src/ngraph/frontend/onnx_import/op/size.cpp @@ -18,11 +18,10 @@ #include #include -#include "ngraph/node.hpp" #include "ngraph/op/constant.hpp" #include "ngraph/shape.hpp" #include "ngraph/type/element_type.hpp" -#include "shape.hpp" +#include "size.hpp" namespace ngraph { diff --git a/src/ngraph/frontend/onnx_import/op/softplus.cpp b/src/ngraph/frontend/onnx_import/op/softplus.cpp index 1c9bf808248..f9b4f0b6f7e 100644 --- a/src/ngraph/frontend/onnx_import/op/softplus.cpp +++ b/src/ngraph/frontend/onnx_import/op/softplus.cpp @@ -24,7 +24,6 @@ #include "ngraph/op/log.hpp" #include "ngraph/op/negative.hpp" #include "ngraph/op/select.hpp" - #include "softplus.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/softsign.cpp b/src/ngraph/frontend/onnx_import/op/softsign.cpp index 6710b8cf219..866a964e3c7 100644 --- a/src/ngraph/frontend/onnx_import/op/softsign.cpp +++ b/src/ngraph/frontend/onnx_import/op/softsign.cpp @@ -23,7 +23,6 @@ #include "ngraph/op/divide.hpp" #include "ngraph/op/util/broadcasting.hpp" #include "ngraph/shape.hpp" - #include "softsign.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/split.cpp b/src/ngraph/frontend/onnx_import/op/split.cpp index 50aa0fd89d5..8be65d608fc 100644 --- a/src/ngraph/frontend/onnx_import/op/split.cpp +++ b/src/ngraph/frontend/onnx_import/op/split.cpp @@ -20,7 +20,7 @@ #include "ngraph/op/constant.hpp" #include "ngraph/op/fused/split.hpp" #include "ngraph/op/variadic_split.hpp" -#include "op/split.hpp" +#include "split.hpp" #include "utils/common.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/op/unsqueeze.cpp b/src/ngraph/frontend/onnx_import/op/unsqueeze.cpp index 5026323fcb0..bf695fdf785 100644 --- a/src/ngraph/frontend/onnx_import/op/unsqueeze.cpp +++ b/src/ngraph/frontend/onnx_import/op/unsqueeze.cpp @@ -14,9 +14,12 @@ // limitations under the License. //***************************************************************************** -#include "ngraph/op/fused/unsqueeze.hpp" +#include + #include "ngraph/op/constant.hpp" -#include "squeeze.hpp" +#include "ngraph/op/fused/unsqueeze.hpp" +#include "ngraph/shape.hpp" +#include "unsqueeze.hpp" #include "utils/common.hpp" namespace ngraph diff --git a/src/ngraph/frontend/onnx_import/ops_bridge.cpp b/src/ngraph/frontend/onnx_import/ops_bridge.cpp index 61f86945112..9f4ea017dff 100644 --- a/src/ngraph/frontend/onnx_import/ops_bridge.cpp +++ b/src/ngraph/frontend/onnx_import/ops_bridge.cpp @@ -99,7 +99,7 @@ #include "op/reduce.hpp" #include "op/relu.hpp" #include "op/reshape.hpp" -#include "op/reverse_sequence.h" +#include "op/reverse_sequence.hpp" #include "op/selu.hpp" #include "op/shape.hpp" #include "op/shrink.hpp" diff --git a/src/ngraph/frontend/onnx_import/utils/reshape.cpp b/src/ngraph/frontend/onnx_import/utils/reshape.cpp index 046bb67a04c..0b17bf80d2e 100644 --- a/src/ngraph/frontend/onnx_import/utils/reshape.cpp +++ b/src/ngraph/frontend/onnx_import/utils/reshape.cpp @@ -22,6 +22,7 @@ #include "ngraph/builder/make_constant.hpp" #include "ngraph/builder/reshape.hpp" #include "ngraph/shape.hpp" +#include "reshape.hpp" namespace ngraph {