Moved frontends to separate folder (#1657)

inference-engine/src/readers/onnx_reader/ie_onnx_reader.cpp

@@ -4,7 +4,7 @@
 
 #include "ie_onnx_reader.hpp"
 #include <ie_api.h>
-#include <ngraph/frontend/onnx_import/onnx.hpp>
+#include <onnx_import/onnx.hpp>
 
 using namespace InferenceEngine;
 

inference-engine/tests/unit/frontends/onnx_import/onnx_importer_test.cpp

@@ -8,7 +8,7 @@
 #include <fstream>
 
 #include "ngraph/file_util.hpp"
-#include "ngraph/frontend/onnx_import/onnx.hpp"
+#include "onnx_import/onnx.hpp"
 
 TEST(ONNX_Importer_Tests, ImportBasicModel) {
     auto model_file_path = ngraph::file_util::path_join(ONNX_MODELS_DIR, "add_abc_initializers.prototxt");

ngraph/CMakeLists.txt

@@ -485,6 +485,8 @@ endif()
 
 add_subdirectory(src)
 
+add_subdirectory(frontend)
+
 if (NGRAPH_TEST_UTIL_ENABLE)
     include(cmake/external_gtest.cmake)
 endif()

ngraph/cmake/Modules/style_apply.cmake

@@ -20,6 +20,7 @@ function(STYLE_APPLY_FILE PATH)
 endfunction()
 
 set(DIRECTORIES_OF_INTEREST
+    frontend
     src
     doc
     test

ngraph/cmake/Modules/style_check.cmake

@@ -27,6 +27,7 @@ macro(STYLE_CHECK_FILE PATH)
 endmacro()
 
 set(DIRECTORIES_OF_INTEREST
+    frontend
     src
     doc
     test

ngraph/frontend/onnx_import/CMakeLists.txt

@@ -0,0 +1,90 @@
+# ******************************************************************************
+# Copyright 2017-2020 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ******************************************************************************
+
+set(ONNX_OPSET_VERSION 13 CACHE INTERNAL "Supported version of ONNX operator set")
+
+file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
+file(GLOB_RECURSE PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
+
+# Remove disabled ops
+list(REMOVE_ITEM LIBRARY_SRC 
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/onnx_import/op/conv_integer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/onnx_import/op/gather_nd.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/onnx_import/op/quant_conv.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/onnx_import/op/round.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/onnx_import/op/scatter_nd.cpp
+    )
+list(REMOVE_ITEM PUBLIC_HEADERS 
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/onnx_import/op/conv_integer.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/onnx_import/op/gather_nd.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/onnx_import/op/quant_conv.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/onnx_import/op/round.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/onnx_import/op/scatter_nd.hpp
+    )
+
+set(ONNX_IMPORT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE INTERNAL "")
+
+# Create named folders for the sources within the .vcproj
+# Empty name lists them directly under the .vcproj
+
+source_group("src" FILES ${LIBRARY_SRC})
+source_group("include" FILES ${PUBLIC_HEADERS})
+
+# Create shared library
+add_library(onnx_importer SHARED ${LIBRARY_SRC} ${PUBLIC_HEADERS})
+
+target_link_libraries(onnx_importer PRIVATE onnx onnx_proto ${Protobuf_LIBRARIES})
+target_link_libraries(onnx_importer PUBLIC ngraph)
+
+set_target_properties(onnx_importer PROPERTIES
+                      CXX_VISIBILITY_PRESET hidden
+                      C_VISIBILITY_PRESET hidden
+                      VISIBILITY_INLINES_HIDDEN ON
+                      POSITION_INDEPENDENT_CODE ON)
+target_include_directories(onnx_importer SYSTEM PUBLIC $<BUILD_INTERFACE:${ONNX_IMPORT_INCLUDE_DIR}>
+                                                       $<INSTALL_INTERFACE:include/ngraph/frontend/>)
+target_include_directories(onnx_importer SYSTEM PRIVATE ${NGRAPH_INCLUDE_PATH} ${NGRAPH_INCLUDE_PATH}/ngraph
+        ${ONNX_INCLUDE_DIR} ${ONNX_PROTO_INCLUDE_DIR} ${Protobuf_INCLUDE_DIRS})
+target_include_directories(onnx_importer PRIVATE ${ONNX_IMPORT_INCLUDE_DIR}/onnx_import/core 
+                                                 ${ONNX_IMPORT_INCLUDE_DIR}/onnx_import/op
+                                                 ${ONNX_IMPORT_INCLUDE_DIR}/onnx_import/utils)
+
+target_compile_definitions(onnx_importer PRIVATE ONNX_OPSET_VERSION=${ONNX_OPSET_VERSION})
+
+if(NGRAPH_USE_PROTOBUF_LITE)
+    target_compile_definitions(onnx_importer PRIVATE NGRAPH_USE_PROTOBUF_LITE)
+endif()
+
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "^(Apple)?Clang$")
+    target_compile_options(onnx_importer PRIVATE -Wno-undef -Wno-reserved-id-macro -Wno-switch-enum
+            -Wno-invalid-offsetof -Wno-shorten-64-to-32 -Wno-unused-macros -Wno-missing-variable-declarations
+            -Wno-unused-private-field -Wno-shadow -Wno-deprecated PUBLIC -Wno-undefined-func-template)
+endif()
+
+target_compile_definitions(onnx_importer PRIVATE ONNX_IMPORTER_DLL_EXPORTS)
+
+install(TARGETS onnx_importer EXPORT ngraphTargets
+        RUNTIME DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT ngraph
+        ARCHIVE DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT ngraph
+        LIBRARY DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT ngraph)
+
+    install(DIRECTORY ${ONNX_IMPORT_INCLUDE_DIR}/onnx_import
+    DESTINATION ${NGRAPH_INSTALL_INCLUDE}/ngraph/frontend/
+    COMPONENT ngraph
+    FILES_MATCHING
+        PATTERN "*.hpp"
+        PATTERN "*.h"
+)

ngraph/frontend/onnx_import/include/onnx_import/core/graph.hpp

@@ -21,10 +21,10 @@
 #include <string>
 #include <vector>
 
-#include "default_opset.hpp"
 #include "graph_cache.hpp"
 #include "model.hpp"
 #include "ngraph/op/parameter.hpp"
+#include "onnx_import/default_opset.hpp"
 #include "operator_set.hpp"
 #include "value_info.hpp"
 

ngraph/frontend/onnx_import/include/onnx_import/core/node.hpp

@@ -21,7 +21,7 @@
 
 #include "ngraph/except.hpp"
 #include "ngraph/node.hpp"
-#include "utils/onnx_importer_visibility.hpp"
+#include "onnx_import/utils/onnx_importer_visibility.hpp"
 
 namespace ONNX_NAMESPACE
 {

ngraph/frontend/onnx_import/include/onnx_import/core/null_node.hpp

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "ngraph/node.hpp"
-#include "utils/onnx_importer_visibility.hpp"
+#include "onnx_import/utils/onnx_importer_visibility.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/core/operator_set.hpp

@@ -21,7 +21,7 @@
 #include <unordered_map>
 
 #include "ngraph/node.hpp"
-#include "node.hpp"
+#include "onnx_import/core/node.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/core/value_info.hpp

@@ -18,14 +18,14 @@
 
 #include <onnx/onnx_pb.h>
 
-#include "default_opset.hpp"
 #include "ngraph/op/constant.hpp"
 #include "ngraph/op/parameter.hpp"
 #include "ngraph/partial_shape.hpp"
 #include "ngraph/type/element_type.hpp"
 #include "node.hpp"
+#include "onnx_import/default_opset.hpp"
+#include "onnx_import/utils/common.hpp"
 #include "tensor.hpp"
-#include "utils/common.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/exceptions.hpp

@@ -18,10 +18,10 @@
 
 #include <string>
 
-#include "core/node.hpp"
 #include "ngraph/assertion.hpp"
 #include "ngraph/check.hpp"
 #include "ngraph/except.hpp"
+#include "onnx_import/core/node.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/onnx.hpp

@@ -23,7 +23,7 @@
 #include <string>
 
 #include "ngraph/function.hpp"
-#include "utils/onnx_importer_visibility.hpp"
+#include "onnx_import/utils/onnx_importer_visibility.hpp"
 
 /// \brief              Top level nGraph namespace.
 namespace ngraph

ngraph/frontend/onnx_import/include/onnx_import/onnx_utils.hpp

@@ -19,8 +19,8 @@
 #include <cstdint>
 #include <string>
 
-#include "core/operator_set.hpp"
-#include "utils/onnx_importer_visibility.hpp"
+#include "onnx_import/core/operator_set.hpp"
+#include "onnx_import/utils/onnx_importer_visibility.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/abs.hpp

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/acos.hpp

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

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

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

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

@@ -18,8 +18,8 @@
 
 #include <memory>
 
-#include "core/node.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
 
 namespace ngraph
 {

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

@@ -18,10 +18,10 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/and.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/argmax.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/argmin.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/asin.hpp

@@ -18,10 +18,10 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/asin.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

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

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

ngraph/frontend/onnx_import/include/onnx_import/op/atan.hpp

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

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

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

ngraph/frontend/onnx_import/include/onnx_import/op/average_pool.hpp

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

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

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

ngraph/frontend/onnx_import/include/onnx_import/op/cast.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/ceil.hpp

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/clip.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/concat.hpp

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

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

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

ngraph/frontend/onnx_import/include/onnx_import/op/constant_of_shape.hpp

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

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

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

ngraph/frontend/onnx_import/include/onnx_import/op/conv_integer.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/conv_transpose.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/cos.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/cosh.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/cum_sum.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/depth_to_space.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/dequantize_linear.hpp

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

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

@@ -18,11 +18,11 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/builder/autobroadcast.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/shape.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/dropout.hpp

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "core/null_node.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/core/null_node.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/elu.hpp

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

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

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/erf.hpp

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/exp.hpp

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/expand.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/eye_like.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/fake_quantize.hpp

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

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

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

ngraph/frontend/onnx_import/include/onnx_import/op/floor.hpp

@@ -18,10 +18,10 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/floor.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

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

@@ -18,10 +18,10 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/validation_util.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/gather_nd.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/gemm.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/global_average_pool.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/global_max_pool.hpp

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

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

@@ -18,10 +18,10 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/greater.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/gru.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/hard_sigmoid.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/hardmax.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/identity.hpp

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/get_output_element.hpp"
+#include "onnx_import/core/node.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/image_scaler.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/instance_norm.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/leaky_relu.hpp

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

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

@@ -18,10 +18,10 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/less.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/log.hpp

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

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

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

ngraph/frontend/onnx_import/include/onnx_import/op/loop.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/lp_norm.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/lp_pool.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/lrn.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/lstm.hpp

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

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

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/matmul_integer.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/max.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/max_pool.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/mean.hpp

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

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

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

ngraph/frontend/onnx_import/include/onnx_import/op/min.hpp

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

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

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

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

@@ -18,12 +18,12 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/builder/autobroadcast.hpp"
 #include "ngraph/node.hpp"
 #include "ngraph/op/broadcast.hpp"
 #include "ngraph/op/multiply.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/neg.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/non_max_suppression.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/non_zero.hpp

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

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

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

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

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

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

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/pad.hpp

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

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

@@ -18,9 +18,9 @@
 
 #include <memory>
 
-#include "core/node.hpp"
-#include "default_opset.hpp"
 #include "ngraph/node.hpp"
+#include "onnx_import/core/node.hpp"
+#include "onnx_import/default_opset.hpp"
 
 namespace ngraph
 {

ngraph/frontend/onnx_import/include/onnx_import/op/prelu.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/qlinear_matmul.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/quant_conv.hpp

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

ngraph/frontend/onnx_import/include/onnx_import/op/quantize_linear.hpp

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