Static protobuf for FEs (#6588)

* protobuf static + mixed editor and importer * merged onnx common * remove ngraph_test_util to onnx_importer and onnx * styles applied * Revert "remove ngraph_test_util to onnx_importer and onnx". * test ngraph_test_util dependencies * Fixed static protobuf * Next * Fixes * Fixed cross-compilation * Don't export / install onnx_proto * Fixed Windows * Fixed opencl headers * Fix * Added exclude-all for exe as well * Fixed code style * Try without LTO * LTO off only for onnx importer Co-authored-by: mbencer <[email protected]>
openvinotoolkit · Jul 16, 2021 · 1621c66 · 1621c66
1 parent 2a15e3e
commit 1621c66
Show file tree

Hide file tree

Showing 29 changed files with 113 additions and 275 deletions.
diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml
@@ -109,7 +109,6 @@ jobs:
         -DENABLE_WHEEL=ON
         -DENABLE_TESTS=ON
         -DNGRAPH_ONNX_IMPORT_ENABLE=ON
-        -DNGRAPH_ONNX_EDITOR_ENABLE=ON
         -DENABLE_FASTER_BUILD=ON
         -DENABLE_STRICT_DEPENDENCIES=OFF
         -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules

diff --git a/.ci/azure/linux_onnxruntime.yml b/.ci/azure/linux_onnxruntime.yml
@@ -95,7 +95,6 @@ jobs:
         -DENABLE_SAMPLES=OFF
         -DENABLE_SPEECH_DEMO=OFF
         -DNGRAPH_ONNX_IMPORT_ENABLE=ON
-        -DNGRAPH_ONNX_EDITOR_ENABLE=ON
         -DNGRAPH_DEBUG_ENABLE=OFF
         $(REPO_DIR)
       workingDirectory: $(BUILD_DIR)

diff --git a/.ci/openvino-onnx/Dockerfile b/.ci/openvino-onnx/Dockerfile
@@ -69,7 +69,6 @@ RUN cmake .. \
     -DENABLE_PYTHON=ON \
     -DPYTHON_EXECUTABLE=/usr/bin/python3 \
     -DNGRAPH_ONNX_IMPORT_ENABLE=ON \
-    -DNGRAPH_ONNX_EDITOR_ENABLE=ON \
     -DNGRAPH_DEBUG_ENABLE=OFF \
     -DCMAKE_INSTALL_PREFIX=/openvino/dist \
     -DNGRAPH_USE_PROTOBUF_LITE=${PROTOBUF_LITE}

diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake
@@ -93,15 +93,8 @@ ie_coverage_genhtml(INFO_FILE "ngraph"
 if(NGRAPH_ONNX_IMPORT_ENABLE)
     ie_coverage_extract(INPUT "openvino" OUTPUT "onnx_importer"
         PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/ngraph/frontend/onnx_common*"
+                 "${OV_COVERAGE_BASE_DIRECTORY}/ngraph/frontend/onnx_editor*"
         "${OV_COVERAGE_BASE_DIRECTORY}/ngraph/frontend/onnx_import*")
     ie_coverage_genhtml(INFO_FILE "onnx_importer"
         PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
 endif()
-
-if(NGRAPH_ONNX_EDITOR_ENABLE)
-    ie_coverage_extract(INPUT "openvino" OUTPUT "onnx_editor"
-        PATTERNS "${OV_COVERAGE_BASE_DIRECTORY}/ngraph/frontend/onnx_editor*")
-    ie_coverage_genhtml(INFO_FILE "onnx_editor"
-        PREFIX "${OV_COVERAGE_BASE_DIRECTORY}")
-endif()
-
diff --git a/cmake/developer_package/compile_flags/os_flags.cmake b/cmake/developer_package/compile_flags/os_flags.cmake
@@ -313,5 +313,6 @@ else()
     elseif(LINUX)
         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -Wl,--exclude-libs,ALL")
         set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--gc-sections -Wl,--exclude-libs,ALL")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections -Wl,--exclude-libs,ALL")
     endif()
 endif()
diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
@@ -39,7 +39,7 @@
 # pragma GCC system_header
 #endif
 
-#include <CL/cl2.hpp>
+#include <CL/opencl.hpp>
 
 #ifdef __GNUC__
 # pragma GCC diagnostic pop

diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
@@ -21,64 +21,20 @@ option(NGRAPH_UNIT_TEST_ENABLE "Control the building of unit tests" ON)
 option(NGRAPH_UNIT_TEST_BACKENDS_ENABLE "Control the building of unit tests using backends" ON)
 option(NGRAPH_DEBUG_ENABLE "Enable output for NGRAPH_DEBUG statements" OFF)
 option(NGRAPH_ONNX_IMPORT_ENABLE "Enable ONNX importer" OFF)
-option(NGRAPH_ONNX_EDITOR_ENABLE "Enable ONNX Editor" OFF)
 option(NGRAPH_PDPD_FRONTEND_ENABLE "Enable PaddlePaddle FrontEnd" OFF)
 option(NGRAPH_USE_PROTOBUF_LITE "Compiles and links with protobuf-lite" OFF)
 
 if (NGRAPH_ONNX_IMPORT_ENABLE OR NGRAPH_PDPD_FRONTEND_ENABLE)
     option(NGRAPH_USE_SYSTEM_PROTOBUF "Use system provided Protobuf shared object" OFF)
 endif()
-if(NGRAPH_ONNX_EDITOR_ENABLE AND NOT NGRAPH_ONNX_IMPORT_ENABLE)
-    message(FATAL_ERROR "ONNX Editor component requires ONNX Importer. Set NGRAPH_ONNX_IMPORT_ENABLE=ON.")
-endif()
 
 message(STATUS "NGRAPH_DEBUG_ENABLE:                  ${NGRAPH_DEBUG_ENABLE}")
 message(STATUS "NGRAPH_ONNX_IMPORT_ENABLE:            ${NGRAPH_ONNX_IMPORT_ENABLE}")
-message(STATUS "NGRAPH_ONNX_EDITOR_ENABLE:            ${NGRAPH_ONNX_EDITOR_ENABLE}")
 message(STATUS "NGRAPH_PDPD_FRONTEND_ENABLE:          ${NGRAPH_PDPD_FRONTEND_ENABLE}")
 message(STATUS "NGRAPH_USE_PROTOBUF_LITE:             ${NGRAPH_USE_PROTOBUF_LITE}")
 message(STATUS "NGRAPH_UNIT_TEST_ENABLE:              ${NGRAPH_UNIT_TEST_ENABLE}")
 message(STATUS "NGRAPH_UNIT_TEST_BACKENDS_ENABLE:     ${NGRAPH_UNIT_TEST_BACKENDS_ENABLE}")
 
-# Setup CMAKE_ARGS to be forwarded to External Projects
-set(NGRAPH_FORWARD_CMAKE_ARGS
-    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-    -DCMAKE_CXX_STANDARD:STRING=${CMAKE_CXX_STANDARD}
-    -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=${CMAKE_CXX_STANDARD_REQUIRED}
-    -DCMAKE_CXX_EXTENSIONS:BOOL=${CMAKE_CXX_EXTENSIONS}
-    -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=${CMAKE_EXPORT_COMPILE_COMMANDS}
-    -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=${CMAKE_POSITION_INDEPENDENT_CODE}
-    -DCMAKE_DEBUG_POSTFIX=${CMAKE_DEBUG_POSTFIX}
-    -DCMAKE_RELEASE_POSTFIX=${CMAKE_RELEASE_POSTFIX}
-    )
-
-if(CMAKE_TOOLCHAIN_FILE)
-    set(NGRAPH_FORWARD_CMAKE_ARGS
-            ${NGRAPH_FORWARD_CMAKE_ARGS}
-            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-            )
-endif()
-
-if (CMAKE_OSX_SYSROOT)
-    set(NGRAPH_FORWARD_CMAKE_ARGS
-            ${NGRAPH_FORWARD_CMAKE_ARGS}
-            -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
-            )
-endif()
-
-if (NOT MSVC)
-    if(NOT CMAKE_BUILD_TYPE)
-        set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
-    endif()
-
-    set(NGRAPH_FORWARD_CMAKE_ARGS
-            ${NGRAPH_FORWARD_CMAKE_ARGS}
-            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-            )
-endif()
-message(STATUS "NGRAPH_FORWARD_CMAKE_ARGS ${NGRAPH_FORWARD_CMAKE_ARGS}")
-
 #-----------------------------------------------------------------------------------------------
 # Installation logic...
 #-----------------------------------------------------------------------------------------------
@@ -154,12 +110,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
     DESTINATION "deployment_tools/ngraph/cmake"
     COMPONENT ngraph_dev)
 
-set(USE_STATIC_PROTOBUF OFF)
-if (NGRAPH_PDPD_FRONTEND_ENABLE) # add more frontends here which depend on static protobuf
-    set(USE_STATIC_PROTOBUF ON)
-endif()
-
-if (NGRAPH_ONNX_IMPORT_ENABLE OR USE_STATIC_PROTOBUF)
+if (NGRAPH_ONNX_IMPORT_ENABLE OR NGRAPH_PDPD_FRONTEND_ENABLE)
     if (MSVC)
         # When we build dll libraries. These flags make sure onnx and protobuf build with /MD, not /MT.
         # These two options can't be mixed, because they requires link two imcompatiable runtime.
@@ -174,8 +125,7 @@ if (NGRAPH_ONNX_IMPORT_ENABLE OR USE_STATIC_PROTOBUF)
     endif()
 
     set(BEFORE_ONNX_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
-    set(BUILD_SHARED_LIBS ON)
-    set(BUILD_STANDALONE_STATIC OFF)
+    set(BUILD_SHARED_LIBS OFF)
 
     if (NOT NGRAPH_USE_SYSTEM_PROTOBUF)
         add_subdirectory(${CMAKE_SOURCE_DIR}/thirdparty/protobuf ${CMAKE_BINARY_DIR}/_deps/protobuf)
@@ -193,7 +143,6 @@ if (NGRAPH_ONNX_IMPORT_ENABLE OR USE_STATIC_PROTOBUF)
 
     set(BUILD_SHARED_LIBS ${BEFORE_ONNX_BUILD_SHARED_LIBS})
     unset(BEFORE_ONNX_BUILD_SHARED_LIBS)
-    unset(BUILD_STANDALONE_STATIC)
 endif()
 
 add_subdirectory(frontend)

diff --git a/ngraph/frontend/CMakeLists.txt b/ngraph/frontend/CMakeLists.txt
@@ -2,41 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(NOT WIN32)
-    # There seems no suitable other way to identify exact output binary name for libprotobuf
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        # Use 'protobufd' directly as it is done in the same way in protobuf cmake files
-        set(PROTOBUF_STATIC_LIB_OUTPUT
-                ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_STATIC_LIBRARY_PREFIX}protobufd${CMAKE_STATIC_LIBRARY_SUFFIX})
-    else(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        set(PROTOBUF_STATIC_LIB_OUTPUT ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${CMAKE_STATIC_LIBRARY_PREFIX}protobuf${CMAKE_STATIC_LIBRARY_SUFFIX})
-    endif()
-
-    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libprotobuf_static)
-    add_custom_command(
-            OUTPUT
-            ${PROTOBUF_STATIC_LIB_OUTPUT}
-            COMMAND ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR}/thirdparty/cmake_static_protobuf
-                    -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-                    -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
-                    -DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=${CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY}
-                    -DCMAKE_PDB_OUTPUT_DIRECTORY=${CMAKE_PDB_OUTPUT_DIRECTORY}
-                    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-                    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-                    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-                    -DCMAKE_CXX_VISIBILITY_PRESET=${CMAKE_CXX_VISIBILITY_PRESET}
-                    -DNGRAPH_INSTALL_LIB=${NGRAPH_INSTALL_LIB}
-                    -DSYSTEM_PROTOC=${SYSTEM_PROTOC}
-                     ${NGRAPH_FORWARD_CMAKE_ARGS}
-            COMMAND ${CMAKE_COMMAND} --build . --target libprotobuf
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libprotobuf_static
-            COMMENT "Build Protobuf Static Library"
-    )
-
-    add_custom_target(libprotobuf_static
-            DEPENDS ${PROTOBUF_STATIC_LIB_OUTPUT})
-endif()
-
 set(FRONTEND_INSTALL_INCLUDE "${NGRAPH_INSTALL_INCLUDE}/ngraph/frontend")
 
 add_subdirectory(frontend_manager)
@@ -46,10 +11,6 @@ if (NGRAPH_ONNX_IMPORT_ENABLE)
     add_subdirectory(onnx_import)
 endif()
 
-if (NGRAPH_ONNX_EDITOR_ENABLE)
-    add_subdirectory(onnx_editor)
-endif()
-
 if (NGRAPH_PDPD_FRONTEND_ENABLE)
     add_subdirectory(paddlepaddle)
 endif()
diff --git a/ngraph/frontend/onnx_common/CMakeLists.txt b/ngraph/frontend/onnx_common/CMakeLists.txt
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE OFF)
+
 set(TARGET_NAME "onnx_common")
 
 file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)

diff --git a/ngraph/frontend/onnx_editor/CMakeLists.txt b/ngraph/frontend/onnx_editor/CMakeLists.txt
@@ -2,39 +2,39 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-set(TARGET_NAME "onnx_editor")
+#set(TARGET_NAME "onnx_editor")
 
-file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
-file(GLOB_RECURSE LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
-file(GLOB_RECURSE LIBRARY_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
+#file(GLOB_RECURSE LIBRARY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
+#file(GLOB_RECURSE LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
+#file(GLOB_RECURSE LIBRARY_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
 
 # 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 ${LIBRARY_HEADERS})
-source_group("public include" FILES ${LIBRARY_PUBLIC_HEADERS})
+#source_group("src" FILES ${LIBRARY_SRC})
+#source_group("include" FILES ${LIBRARY_HEADERS})
+#source_group("public include" FILES ${LIBRARY_PUBLIC_HEADERS})
 
 # Create static library
 
-add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${LIBRARY_PUBLIC_HEADERS})
-add_library(ngraph::onnx_editor ALIAS ${TARGET_NAME})
+#add_library(${TARGET_NAME} OBJECT ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${LIBRARY_PUBLIC_HEADERS})
+#add_library(ngraph::onnx_editor ALIAS ${TARGET_NAME})
 
 # TODO Add handling ie_faster_build
 
-target_link_libraries(${TARGET_NAME} PRIVATE onnx_common onnx_importer
-                                     PUBLIC ngraph)
+#target_link_libraries(${TARGET_NAME} PRIVATE onnx_common
+#                                     PUBLIC ngraph)
 
-set(ONNX_EDITOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
-set(ONNX_EDITOR_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+#set(ONNX_EDITOR_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
+#set(ONNX_EDITOR_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
-target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ONNX_EDITOR_INCLUDE_DIR}>
-                                                 $<INSTALL_INTERFACE:${FRONTEND_INSTALL_INCLUDE}>)
+#target_include_directories(${TARGET_NAME} PUBLIC $<BUILD_INTERFACE:${ONNX_EDITOR_INCLUDE_DIR}>
+#                                                 $<INSTALL_INTERFACE:${FRONTEND_INSTALL_INCLUDE}>)
 
-target_include_directories(${TARGET_NAME} PRIVATE ${ONNX_EDITOR_SRC_DIR})
+#target_include_directories(${TARGET_NAME} PRIVATE ${ONNX_EDITOR_SRC_DIR})
 
-if(NGRAPH_USE_PROTOBUF_LITE)
-    target_compile_definitions(${TARGET_NAME} PRIVATE NGRAPH_USE_PROTOBUF_LITE)
-endif()
+#if(NGRAPH_USE_PROTOBUF_LITE)
+#    target_compile_definitions(${TARGET_NAME} PRIVATE NGRAPH_USE_PROTOBUF_LITE)
+#endif()
 
-add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
+#add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
diff --git a/ngraph/frontend/onnx_editor/include/onnx_editor/edge_mapper.hpp b/ngraph/frontend/onnx_editor/include/onnx_editor/edge_mapper.hpp
@@ -26,7 +26,7 @@ namespace ngraph
         class EdgeMapper
         {
         public:
-            EdgeMapper() = default;
+            ONNX_IMPORTER_API EdgeMapper() = default;
 
             /// \brief Creates an edge mapper based on a GraphProto object.
             ///
@@ -51,7 +51,8 @@ namespace ngraph
             ///
             /// \param input An EditorInput helper structure created based on a input name
             ///              or a input index.
-            InputEdge find_input_edge(const EditorNode& node, const EditorInput& input) const;
+            ONNX_IMPORTER_API InputEdge find_input_edge(const EditorNode& node,
+                                                        const EditorInput& input) const;
 
             /// \brief Returns an OutputEdge based on a node (node name or output name)
             ///        and an output (output name or output index).
@@ -68,15 +69,16 @@ namespace ngraph
             ///
             /// \param output An EditorOutput helper structure created based on a output name
             ///               or a output index.
-            OutputEdge find_output_edge(const EditorNode& node, const EditorOutput& output) const;
+            ONNX_IMPORTER_API OutputEdge find_output_edge(const EditorNode& node,
+                                                          const EditorOutput& output) const;
 
             /// \brief Returns an OutputEdge based on a output name.
             ///
             /// \note  The output name guarantees the uniqueness of the edge.
             ///
             /// \param output_name A node output name.
             ///
-            OutputEdge find_output_edge(const std::string& output_name) const;
+            ONNX_IMPORTER_API OutputEdge find_output_edge(const std::string& output_name) const;
 
             /// \brief Returns a vector of InputEdges which consume an output of a node
             ///        determined by provided output name.
@@ -85,7 +87,8 @@ namespace ngraph
             ///
             /// \param output_name A node output name.
             ///
-            std::vector<InputEdge> find_output_consumers(const std::string& output_name) const;
+            ONNX_IMPORTER_API std::vector<InputEdge>
+                find_output_consumers(const std::string& output_name) const;
 
             /// \brief Returns true if a provided node is correct (exists in a graph)
             ///        and is not ambiguous (identification of an ONNX node can be ambiguous
@@ -94,7 +97,7 @@ namespace ngraph
             /// \param node An EditorNode helper structure created based on a node name
             ///             or a node output name.
             ///
-            bool is_correct_and_unambiguous_node(const EditorNode& node) const;
+            ONNX_IMPORTER_API bool is_correct_and_unambiguous_node(const EditorNode& node) const;
 
         private:
             std::vector<int> find_node_indexes(const std::string& node_name,

diff --git a/ngraph/frontend/onnx_editor/include/onnx_editor/editor.hpp b/ngraph/frontend/onnx_editor/include/onnx_editor/editor.hpp
@@ -15,13 +15,6 @@
 #include "onnx_editor/editor.hpp"
 #include "onnx_editor/editor_types.hpp"
 
-namespace ONNX_NAMESPACE
-{
-    // forward declaration to avoid the necessity of include paths setting in components
-    // that don't directly depend on the ONNX library
-    class ModelProto;
-} // namespace ONNX_NAMESPACE
-
 namespace ngraph
 {
     namespace onnx_editor
@@ -31,7 +24,7 @@ namespace ngraph
         /// \note This class can be used to modify an ONNX model before it gets translated to
         ///       an ngraph::Function by the import_onnx_model function. It lets you modify the
         ///       model's input types and shapes, extract a subgraph and more.
-        class ONNXModelEditor final
+        class ONNX_IMPORTER_API ONNXModelEditor final
         {
         public:
             ONNXModelEditor() = delete;

diff --git a/ngraph/frontend/onnx_editor/include/onnx_editor/editor_types.hpp b/ngraph/frontend/onnx_editor/include/onnx_editor/editor_types.hpp
@@ -7,6 +7,8 @@
 #include <string>
 #include <utility>
 
+#include "onnx_import/utils/onnx_importer_visibility.hpp"
+
 namespace ngraph
 {
     enum class EdgeType
@@ -85,7 +87,7 @@ namespace ngraph
         ///
         ///        The optional argument "new_input_name" can be used to set a custom input name
         ///        which can be created during cutting a graph.
-        struct EditorInput
+        struct ONNX_IMPORTER_API EditorInput
         {
             EditorInput() = delete;
             EditorInput(std::string input_name, std::string new_input_name = "")
@@ -110,7 +112,7 @@ namespace ngraph
         ///            ----(in_A)---->  | test_node |
         ///                             +-----------+  ---(out2)--->
         ///        You can indicate out2 as EditorOutput("out2") or EditorOutput(1)
-        struct EditorOutput
+        struct ONNX_IMPORTER_API EditorOutput
         {
             EditorOutput() = delete;
             EditorOutput(std::string output_name)
@@ -135,7 +137,7 @@ namespace ngraph
         ///        You can indicate test_node by name as EditorNode("test_node")
         ///        or by assigned output as EditorNode(EditorOutput("out1"))
         ///        or EditorNode(EditorOutput("out2"))
-        struct EditorNode
+        struct ONNX_IMPORTER_API EditorNode
         {
             EditorNode(std::string node_name)
                 : m_node_name{std::move(node_name)}