[ONNX] Alter code layout (#1481)

src/ngraph/frontend/onnx_import/CMakeLists.txt

@@ -34,14 +34,7 @@ add_library(onnx_import_interface OBJECT
 
 add_library(onnx_import STATIC
         onnx.pb.cc
-        attribute.cpp
-        attribute.hpp
         exceptions.hpp
-        graph.cpp
-        graph.hpp
-        model.hpp
-        node.cpp
-        node.hpp
         op/add.hpp
         op/batch_norm.cpp
         op/batch_norm.hpp
@@ -52,12 +45,19 @@ add_library(onnx_import STATIC
         op/split.cpp
         op/split.hpp
         ops_bridge.cpp
-        tensor.hpp
         utils/broadcasting.cpp
         utils/broadcasting.hpp
         utils/convpool.cpp
         utils/convpool.hpp
-        value_info.hpp)
+        core/attribute.cpp
+        core/attribute.hpp
+        core/graph.cpp
+        core/graph.hpp
+        core/model.hpp
+        core/node.cpp
+        core/node.hpp
+        core/tensor.hpp
+        core/value_info.hpp)
 
 add_dependencies(onnx_import onnx_import_interface)
 
@@ -67,7 +67,7 @@ if (NOT NGRAPH_USE_SYSTEM_PROTOBUF)
 endif()
 
 set_property(TARGET onnx_import PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_include_directories(onnx_import PUBLIC ${CMAKE_CURRENT_BINARY_DIR} PRIVATE ${NGRAPH_INCLUDE_PATH} ${Protobuf_INCLUDE_DIR})
+target_include_directories(onnx_import PUBLIC ${CMAKE_CURRENT_BINARY_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${NGRAPH_INCLUDE_PATH} ${Protobuf_INCLUDE_DIR})
 target_link_libraries(onnx_import PRIVATE ${Protobuf_LIBRARIES})
 
 set_property(TARGET onnx_import_interface PROPERTY POSITION_INDEPENDENT_CODE ON)

src/ngraph/frontend/onnx_import/graph.hpp → src/ngraph/frontend/onnx_import/core/graph.hpp

@@ -16,14 +16,12 @@
 
 #pragma once
 
-#include <map>
-#include <ostream>
+#include <onnx.pb.h>
 #include <string>
 #include <vector>
 
 #include "ngraph/op/parameter_vector.hpp"
 
-#include <onnx.pb.h>
 #include "value_info.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/node.hpp → src/ngraph/frontend/onnx_import/core/node.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <algorithm>
-#include <ostream>
 #include <string>
 
 #include "ngraph/node_vector.hpp"

src/ngraph/frontend/onnx_import/value_info.hpp → src/ngraph/frontend/onnx_import/core/value_info.hpp

@@ -16,8 +16,6 @@
 
 #pragma once
 
-#include <ostream>
-
 #include "ngraph/op/constant.hpp"
 #include "ngraph/op/parameter_vector.hpp"
 #include "ngraph/shape.hpp"

src/ngraph/frontend/onnx_import/onnx.cpp

@@ -18,9 +18,9 @@
 
 #include "ngraph/except.hpp"
 
-#include "graph.hpp"
-#include "model.hpp"
-#include "node.hpp"
+#include "core/graph.hpp"
+#include "core/model.hpp"
+#include "core/node.hpp"
 #include "onnx.hpp"
 
 namespace ngraph

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

@@ -16,10 +16,11 @@
 
 #pragma once
 
-#include "ngraph/frontend/onnx_import/node.hpp"
 #include "ngraph/node_vector.hpp"
 #include "ngraph/op/add.hpp"
 
+#include "core/node.hpp"
+
 namespace ngraph
 {
     namespace onnx_import

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

@@ -20,7 +20,6 @@
 #include "ngraph/op/batch_norm.hpp"
 
 #include "ngraph/frontend/onnx_import/exceptions.hpp"
-#include "ngraph/frontend/onnx_import/node.hpp"
 #include "ngraph/frontend/onnx_import/op/batch_norm.hpp"
 
 namespace ngraph

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

@@ -16,8 +16,7 @@
 
 #pragma once
 
-#include "ngraph/frontend/onnx_import/node.hpp"
-#include "ngraph/node_vector.hpp"
+#include "core/node.hpp"
 
 namespace ngraph
 {

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

@@ -15,8 +15,8 @@
 *******************************************************************************/
 
 #include "ngraph/op/constant.hpp"
-#include "ngraph/frontend/onnx_import/node.hpp"
-#include "ngraph/frontend/onnx_import/tensor.hpp"
+#include "core/node.hpp"
+#include "core/tensor.hpp"
 #include "ngraph/node_vector.hpp"
 
 namespace ngraph

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

@@ -17,7 +17,8 @@
 #pragma once
 
 #include "ngraph/node_vector.hpp"
-#include "ngraph/op/constant.hpp"
+
+#include "core/node.hpp"
 
 namespace ngraph
 {

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

@@ -14,6 +14,12 @@
  * limitations under the License.
  *******************************************************************************/
 
+#include <cstddef>
+#include <memory>
+#include <vector>
+
+#include "op/conv.hpp"
+
 #include "ngraph/op/add.hpp"
 #include "ngraph/op/broadcast.hpp"
 #include "ngraph/op/concat.hpp"

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

@@ -16,9 +16,10 @@
 
 #pragma once
 
-#include "ngraph/node.hpp"
 #include "ngraph/node_vector.hpp"
 
+#include "core/node.hpp"
+
 namespace ngraph
 {
     namespace onnx_import

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

@@ -16,10 +16,11 @@
 
 #pragma once
 
-#include "ngraph/frontend/onnx_import/node.hpp"
 #include "ngraph/node_vector.hpp"
 #include "ngraph/op/relu.hpp"
 
+#include "core/node.hpp"
+
 namespace ngraph
 {
     namespace onnx_import

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

@@ -16,7 +16,7 @@
 
 #include "ngraph/op/slice.hpp"
 
-#include "ngraph/frontend/onnx_import/op/split.hpp"
+#include "op/split.hpp"
 
 namespace ngraph
 {

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

@@ -18,7 +18,7 @@
 
 #include "ngraph/node_vector.hpp"
 
-#include "ngraph/frontend/onnx_import/node.hpp"
+#include "ngraph/frontend/onnx_import/core/node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/ops_bridge.cpp

@@ -17,13 +17,13 @@
 #include <algorithm>
 #include <functional>
 
-#include "attribute.hpp"
-#include "ngraph/frontend/onnx_import/op/add.hpp"
-#include "ngraph/frontend/onnx_import/op/batch_norm.hpp"
-#include "ngraph/frontend/onnx_import/op/constant.hpp"
-#include "ngraph/frontend/onnx_import/op/conv.hpp"
-#include "ngraph/frontend/onnx_import/op/relu.hpp"
-#include "ngraph/frontend/onnx_import/op/split.hpp"
+#include "core/attribute.hpp"
+#include "op/add.hpp"
+#include "op/batch_norm.hpp"
+#include "op/constant.hpp"
+#include "op/conv.hpp"
+#include "op/relu.hpp"
+#include "op/split.hpp"
 #include "ops_bridge.hpp"
 
 namespace ngraph

src/ngraph/frontend/onnx_import/ops_bridge.hpp

@@ -16,8 +16,8 @@
 
 #pragma once
 
+#include "core/node.hpp"
 #include "ngraph/node_vector.hpp"
-#include "node.hpp"
 
 namespace ngraph
 {

src/ngraph/frontend/onnx_import/utils/convpool.hpp

@@ -17,8 +17,10 @@
 #pragma once
 
 #include "ngraph/coordinate_diff.hpp"
-#include "ngraph/frontend/onnx_import/attribute.hpp"
-#include "ngraph/frontend/onnx_import/node.hpp"
+#include "ngraph/shape.hpp"
+
+#include "core/attribute.hpp"
+#include "core/node.hpp"
 
 namespace ngraph
 {