From 8271c515f749a6398d18dc1e26df885424c3fe00 Mon Sep 17 00:00:00 2001
From: Tomasz Socha <tomasz.socha@intel.com>
Date: Fri, 15 Jan 2021 22:33:46 +0100
Subject: [PATCH] [ONNX Importer] move null_node to private scope (#3877)

---
 ngraph/frontend/onnx_import/src/core/node.cpp                   | 2 +-
 ngraph/frontend/onnx_import/src/core/null_node.cpp              | 2 +-
 .../onnx_import/{include/onnx_import => src}/core/null_node.hpp | 0
 ngraph/frontend/onnx_import/src/op/batch_norm.cpp               | 2 +-
 ngraph/frontend/onnx_import/src/op/clip.cpp                     | 2 +-
 ngraph/frontend/onnx_import/src/op/dequantize_linear.cpp        | 2 +-
 ngraph/frontend/onnx_import/src/op/dropout.hpp                  | 2 +-
 ngraph/frontend/onnx_import/src/op/gru.cpp                      | 2 +-
 ngraph/frontend/onnx_import/src/op/loop.cpp                     | 2 +-
 ngraph/frontend/onnx_import/src/op/lstm.cpp                     | 2 +-
 ngraph/frontend/onnx_import/src/op/max_pool.cpp                 | 2 +-
 ngraph/frontend/onnx_import/src/utils/recurrent.cpp             | 2 +-
 ngraph/test/onnx/onnx_import.in.cpp                             | 2 +-
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename ngraph/frontend/onnx_import/{include/onnx_import => src}/core/null_node.hpp (100%)

diff --git a/ngraph/frontend/onnx_import/src/core/node.cpp b/ngraph/frontend/onnx_import/src/core/node.cpp
index 9c79f5dd6a7..6b8b33979e6 100644
--- a/ngraph/frontend/onnx_import/src/core/node.cpp
+++ b/ngraph/frontend/onnx_import/src/core/node.cpp
@@ -18,9 +18,9 @@
 
 #include "core/attribute.hpp"
 #include "core/graph.hpp"
+#include "core/null_node.hpp"
 #include "core/tensor.hpp"
 #include "onnx_import/core/node.hpp"
-#include "onnx_import/core/null_node.hpp"
 
 namespace ngraph
 {
diff --git a/ngraph/frontend/onnx_import/src/core/null_node.cpp b/ngraph/frontend/onnx_import/src/core/null_node.cpp
index 1e7ef5e048f..9d72f214128 100644
--- a/ngraph/frontend/onnx_import/src/core/null_node.cpp
+++ b/ngraph/frontend/onnx_import/src/core/null_node.cpp
@@ -17,7 +17,7 @@
 #include <string>
 
 #include "ngraph/node.hpp"
-#include "onnx_import/core/null_node.hpp"
+#include "null_node.hpp"
 
 namespace ngraph
 {
diff --git a/ngraph/frontend/onnx_import/include/onnx_import/core/null_node.hpp b/ngraph/frontend/onnx_import/src/core/null_node.hpp
similarity index 100%
rename from ngraph/frontend/onnx_import/include/onnx_import/core/null_node.hpp
rename to ngraph/frontend/onnx_import/src/core/null_node.hpp
diff --git a/ngraph/frontend/onnx_import/src/op/batch_norm.cpp b/ngraph/frontend/onnx_import/src/op/batch_norm.cpp
index 2c910412132..04c54208088 100644
--- a/ngraph/frontend/onnx_import/src/op/batch_norm.cpp
+++ b/ngraph/frontend/onnx_import/src/op/batch_norm.cpp
@@ -17,9 +17,9 @@
 #include <cstdint>
 #include <memory>
 
+#include "core/null_node.hpp"
 #include "default_opset.hpp"
 #include "exceptions.hpp"
-#include "onnx_import/core/null_node.hpp"
 #include "op/batch_norm.hpp"
 
 namespace ngraph
diff --git a/ngraph/frontend/onnx_import/src/op/clip.cpp b/ngraph/frontend/onnx_import/src/op/clip.cpp
index 57a015318cd..74f54436e92 100644
--- a/ngraph/frontend/onnx_import/src/op/clip.cpp
+++ b/ngraph/frontend/onnx_import/src/op/clip.cpp
@@ -17,9 +17,9 @@
 #include <limits>
 #include <memory>
 
+#include "core/null_node.hpp"
 #include "default_opset.hpp"
 #include "ngraph/builder/make_constant.hpp"
-#include "onnx_import/core/null_node.hpp"
 #include "op/clip.hpp"
 
 namespace ngraph
diff --git a/ngraph/frontend/onnx_import/src/op/dequantize_linear.cpp b/ngraph/frontend/onnx_import/src/op/dequantize_linear.cpp
index 95b1e92ecf9..1cddae55812 100644
--- a/ngraph/frontend/onnx_import/src/op/dequantize_linear.cpp
+++ b/ngraph/frontend/onnx_import/src/op/dequantize_linear.cpp
@@ -17,13 +17,13 @@
 #include <cstdint>
 #include <memory>
 
+#include "core/null_node.hpp"
 #include "default_opset.hpp"
 #include "ngraph/axis_set.hpp"
 #include "ngraph/builder/make_constant.hpp"
 #include "ngraph/op/convert.hpp"
 #include "ngraph/shape.hpp"
 #include "ngraph/validation_util.hpp"
-#include "onnx_import/core/null_node.hpp"
 #include "op/dequantize_linear.hpp"
 #include "utils/common.hpp"
 
diff --git a/ngraph/frontend/onnx_import/src/op/dropout.hpp b/ngraph/frontend/onnx_import/src/op/dropout.hpp
index 9b15f057651..5b6ee83b731 100644
--- a/ngraph/frontend/onnx_import/src/op/dropout.hpp
+++ b/ngraph/frontend/onnx_import/src/op/dropout.hpp
@@ -18,9 +18,9 @@
 
 #include <memory>
 
+#include "core/null_node.hpp"
 #include "ngraph/node.hpp"
 #include "onnx_import/core/node.hpp"
-#include "onnx_import/core/null_node.hpp"
 
 namespace ngraph
 {
diff --git a/ngraph/frontend/onnx_import/src/op/gru.cpp b/ngraph/frontend/onnx_import/src/op/gru.cpp
index b3aa854d90b..240d52d3b01 100644
--- a/ngraph/frontend/onnx_import/src/op/gru.cpp
+++ b/ngraph/frontend/onnx_import/src/op/gru.cpp
@@ -17,11 +17,11 @@
 #include <string>
 #include <vector>
 
+#include "core/null_node.hpp"
 #include "default_opset.hpp"
 #include "ngraph/builder/reshape.hpp"
 #include "ngraph/builder/split.hpp"
 #include "ngraph/shape.hpp"
-#include "onnx_import/core/null_node.hpp"
 #include "op/gru.hpp"
 #include "utils/recurrent.hpp"
 
diff --git a/ngraph/frontend/onnx_import/src/op/loop.cpp b/ngraph/frontend/onnx_import/src/op/loop.cpp
index 051b4752fb6..f20f03c683a 100644
--- a/ngraph/frontend/onnx_import/src/op/loop.cpp
+++ b/ngraph/frontend/onnx_import/src/op/loop.cpp
@@ -19,12 +19,12 @@
 #include <memory>
 
 #include "core/graph.hpp"
+#include "core/null_node.hpp"
 #include "default_opset.hpp"
 #include "exceptions.hpp"
 #include "ngraph/function.hpp"
 #include "ngraph/log.hpp"
 #include "ngraph/op/util/op_types.hpp"
-#include "onnx_import/core/null_node.hpp"
 #include "utils/reshape.hpp"
 
 namespace ngraph
diff --git a/ngraph/frontend/onnx_import/src/op/lstm.cpp b/ngraph/frontend/onnx_import/src/op/lstm.cpp
index bc6d503bff0..ba2e571aeaf 100644
--- a/ngraph/frontend/onnx_import/src/op/lstm.cpp
+++ b/ngraph/frontend/onnx_import/src/op/lstm.cpp
@@ -21,6 +21,7 @@
 #include <string>
 #include <vector>
 
+#include "core/null_node.hpp"
 #include "default_opset.hpp"
 #include "exceptions.hpp"
 #include "ngraph/builder/reshape.hpp"
@@ -34,7 +35,6 @@
 #include "ngraph/opsets/opset3.hpp"
 #include "ngraph/shape.hpp"
 #include "ngraph/type/element_type.hpp"
-#include "onnx_import/core/null_node.hpp"
 #include "op/lstm.hpp"
 #include "op/lstm.hpp"
 
diff --git a/ngraph/frontend/onnx_import/src/op/max_pool.cpp b/ngraph/frontend/onnx_import/src/op/max_pool.cpp
index 9a76b102481..c53c4cea6bb 100644
--- a/ngraph/frontend/onnx_import/src/op/max_pool.cpp
+++ b/ngraph/frontend/onnx_import/src/op/max_pool.cpp
@@ -16,8 +16,8 @@
 
 #include <memory>
 
+#include "core/null_node.hpp"
 #include "ngraph/op/max_pool.hpp"
-#include "onnx_import/core/null_node.hpp"
 #include "op/max_pool.hpp"
 #include "utils/pooling_factory.hpp"
 
diff --git a/ngraph/frontend/onnx_import/src/utils/recurrent.cpp b/ngraph/frontend/onnx_import/src/utils/recurrent.cpp
index 95c562d5e7a..8ac27148278 100644
--- a/ngraph/frontend/onnx_import/src/utils/recurrent.cpp
+++ b/ngraph/frontend/onnx_import/src/utils/recurrent.cpp
@@ -18,13 +18,13 @@
 #include <cstdlib>
 #include <vector>
 
+#include "core/null_node.hpp"
 #include "default_opset.hpp"
 #include "ngraph/builder/autobroadcast.hpp"
 #include "ngraph/builder/reshape.hpp"
 #include "ngraph/builder/split.hpp"
 #include "ngraph/check.hpp"
 #include "ngraph/enum_names.hpp"
-#include "onnx_import/core/null_node.hpp"
 #include "utils/recurrent.hpp"
 
 namespace ngraph
diff --git a/ngraph/test/onnx/onnx_import.in.cpp b/ngraph/test/onnx/onnx_import.in.cpp
index 5663d585d98..f4472b9179e 100644
--- a/ngraph/test/onnx/onnx_import.in.cpp
+++ b/ngraph/test/onnx/onnx_import.in.cpp
@@ -34,8 +34,8 @@
 #endif
 // clang-format on
 
+#include "core/null_node.hpp"
 #include "gtest/gtest.h"
-#include "onnx_import/core/null_node.hpp"
 #include "onnx_import/onnx.hpp"
 #include "onnx_import/onnx_utils.hpp"
 #include "default_opset.hpp"