Headers refactoring in ONNX importer (#4004)

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

src/ngraph/frontend/onnx_import/op/acosh.cpp

@@ -14,6 +14,8 @@
 // limitations under the License.
 //*****************************************************************************
 
+#include <memory>
+
 #include "acosh.hpp"
 #include "ngraph/op/add.hpp"
 #include "ngraph/op/constant.hpp"

src/ngraph/frontend/onnx_import/op/acosh.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 

src/ngraph/frontend/onnx_import/op/add.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/add.hpp"

src/ngraph/frontend/onnx_import/op/and.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/and.hpp"

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

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

src/ngraph/frontend/onnx_import/op/asinh.cpp

@@ -14,6 +14,8 @@
 // limitations under the License.
 //*****************************************************************************
 
+#include <memory>
+
 #include "asinh.hpp"
 #include "ngraph/op/add.hpp"
 #include "ngraph/op/constant.hpp"

src/ngraph/frontend/onnx_import/op/asinh.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 

src/ngraph/frontend/onnx_import/op/atanh.cpp

@@ -14,6 +14,8 @@
 // limitations under the License.
 //*****************************************************************************
 
+#include <memory>
+
 #include "atanh.hpp"
 #include "ngraph/op/add.hpp"
 #include "ngraph/op/constant.hpp"

src/ngraph/frontend/onnx_import/op/atanh.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 

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"

src/ngraph/frontend/onnx_import/op/batch_norm.cpp

@@ -17,10 +17,9 @@
 #include <cstdint>
 #include <memory>
 
-#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

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
 {

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
 {

src/ngraph/frontend/onnx_import/op/conv.cpp

@@ -18,10 +18,9 @@
 #include <memory>
 #include <vector>
 
+#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
 {

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"

src/ngraph/frontend/onnx_import/op/conv_transpose.cpp

@@ -20,15 +20,15 @@
 #include <memory>
 #include <vector>
 
+#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
 {

src/ngraph/frontend/onnx_import/op/dequantize_linear.cpp

@@ -17,12 +17,12 @@
 #include <cstdint>
 #include <memory>
 
+#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
 {

src/ngraph/frontend/onnx_import/op/div.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/divide.hpp"

src/ngraph/frontend/onnx_import/op/elu.cpp

@@ -17,11 +17,10 @@
 #include <memory>
 #include <vector>
 
+#include "elu.hpp"
 #include "ngraph/op/constant.hpp"
 #include "ngraph/op/fused/elu.hpp"
 
-#include "elu.hpp"
-
 namespace ngraph
 {
     namespace onnx_import

src/ngraph/frontend/onnx_import/op/equal.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/equal.hpp"

src/ngraph/frontend/onnx_import/op/expand.cpp

@@ -16,6 +16,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <memory>
 
 #include "expand.hpp"
 #include "ngraph/descriptor/output.hpp"

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 <memory>
+
 #include "exceptions.hpp"
-#include "ngraph/frontend/onnx_import/utils/common.hpp"
+#include "eye_like.hpp"
+#include "utils/common.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/op/flatten.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 

src/ngraph/frontend/onnx_import/op/gather.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/gather.hpp"

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"

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"

src/ngraph/frontend/onnx_import/op/greater.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/greater.hpp"

src/ngraph/frontend/onnx_import/op/instance_norm.cpp

@@ -15,6 +15,7 @@
 //*****************************************************************************
 
 #include <cstddef>
+#include <memory>
 
 #include "exceptions.hpp"
 #include "instance_norm.hpp"

src/ngraph/frontend/onnx_import/op/leaky_relu.cpp

@@ -17,17 +17,10 @@
 #include <memory>
 
 #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
 {

src/ngraph/frontend/onnx_import/op/less.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/less.hpp"

src/ngraph/frontend/onnx_import/op/log_softmax.cpp

@@ -16,10 +16,8 @@
 
 #include <memory>
 
-#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
 {

src/ngraph/frontend/onnx_import/op/log_softmax.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 

src/ngraph/frontend/onnx_import/op/lp_norm.cpp

@@ -16,6 +16,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <memory>
 
 #include "exceptions.hpp"
 #include "lp_norm.hpp"

src/ngraph/frontend/onnx_import/op/lstm.cpp

@@ -22,6 +22,7 @@
 #include <vector>
 
 #include "exceptions.hpp"
+#include "lstm.hpp"
 #include "ngraph/builder/split.hpp"
 #include "ngraph/frontend/onnx_import/op/lstm.hpp"
 #include "ngraph/op/add.hpp"

src/ngraph/frontend/onnx_import/op/matmul.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/fused/matmul.hpp"

src/ngraph/frontend/onnx_import/op/max_pool.cpp

@@ -14,9 +14,11 @@
 // limitations under the License.
 //*****************************************************************************
 
-#include "ngraph/op/max_pool.hpp"
+#include <memory>
+
 #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

src/ngraph/frontend/onnx_import/op/mean_variance_normalization.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 

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 <memory>
 
+#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"

src/ngraph/frontend/onnx_import/op/mod.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 

src/ngraph/frontend/onnx_import/op/mul.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/broadcast.hpp"

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 <memory>
 
 #include "ngraph/frontend/onnx_import/exceptions.hpp"

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
 {

src/ngraph/frontend/onnx_import/op/not.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/not.hpp"

src/ngraph/frontend/onnx_import/op/onehot.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 

src/ngraph/frontend/onnx_import/op/or.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/or.hpp"

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
 {

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

src/ngraph/frontend/onnx_import/op/pow.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/power.hpp"

src/ngraph/frontend/onnx_import/op/quant_conv.cpp

@@ -18,10 +18,9 @@
 #include <memory>
 #include <vector>
 
+#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"

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

src/ngraph/frontend/onnx_import/op/relu.hpp

@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/relu.hpp"

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

src/ngraph/frontend/onnx_import/op/reverse_sequence.h → src/ngraph/frontend/onnx_import/op/reverse_sequence.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "core/node.hpp"
 #include "ngraph/node.hpp"
 
@@ -33,7 +31,7 @@ namespace ngraph
 
             } // namespace set_1
 
-        } //namespace op
+        } // namespace op
 
     } // namespace onnx_import
 

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

src/ngraph/frontend/onnx_import/op/size.cpp

@@ -18,11 +18,10 @@
 #include <memory>
 #include <vector>
 
-#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
 {

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

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

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

src/ngraph/frontend/onnx_import/op/unsqueeze.cpp

@@ -14,9 +14,12 @@
 // limitations under the License.
 //*****************************************************************************
 
-#include "ngraph/op/fused/unsqueeze.hpp"
+#include <memory>
+
 #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

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"

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
 {