Fixed compilation with ENABLE_V7_SERIALIZE=ON (#2898)

* Fixed compilation with ENABLE_V7_SERIALIZE=ON

* Removed legacy code

diff --git a/inference-engine/cmake/plugins/plugins.cmake b/inference-engine/cmake/plugins/plugins.cmake
index 3fa6839..ef1dccc 100644 (file)
--- a/inference-engine/cmake/plugins/plugins.cmake
+++ b/inference-engine/cmake/plugins/plugins.cmake
@@ -56,11 +56,9 @@ function(ie_add_plugin)
     target_compile_definitions(${IE_PLUGIN_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN)
 
     if(TARGET IE::inference_engine_plugin_api)
-        target_link_libraries(${IE_PLUGIN_NAME} PRIVATE IE::inference_engine_plugin_api
-                                                        IE::inference_engine_legacy)
+        target_link_libraries(${IE_PLUGIN_NAME} PRIVATE IE::inference_engine_plugin_api)
     else()
-        target_link_libraries(${IE_PLUGIN_NAME} PRIVATE inference_engine_plugin_api
-                                                        inference_engine_legacy)
+        target_link_libraries(${IE_PLUGIN_NAME} PRIVATE inference_engine_plugin_api)
     endif()
 
     if(WIN32)

diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt
index f427760..8e70e5a 100644 (file)
--- a/inference-engine/ie_bridges/python/CMakeLists.txt
+++ b/inference-engine/ie_bridges/python/CMakeLists.txt
@@ -19,11 +19,9 @@ endif()
 
 if(DEFINED IE_MAIN_SOURCE_DIR)
     set(InferenceEngine_LIBRARIES inference_engine)
-    list(APPEND InferenceEngine_LIBRARIES inference_engine_legacy)  # TODO: remove in PR #2755
 else()
     find_package(InferenceEngineDeveloperPackage REQUIRED)
     set(InferenceEngine_LIBRARIES IE::inference_engine)
-    list(APPEND InferenceEngine_LIBRARIES IE::inference_engine_legacy) # TODO: remove in PR #2755
 endif()
 
 if(UNIX)

diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
index b530469..9a12b58 100644 (file)
--- a/inference-engine/src/inference_engine/CMakeLists.txt
+++ b/inference-engine/src/inference_engine/CMakeLists.txt
@@ -57,11 +57,6 @@ if(ENABLE_SSE42)
     add_definitions(-DHAVE_SSE=1)
 endif()
 
-if(ENABLE_V7_SERIALIZE)
-    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/cnn_network_ngraph_impl.cpp"
-        PROPERTIES COMPILE_DEFINITIONS ENABLE_V7_SERIALIZE)
-endif()
-
 addVersionDefines(ie_version.cpp CI_BUILD_NUMBER)
 
 set (PUBLIC_HEADERS_DIR "${IE_MAIN_SOURCE_DIR}/include")

diff --git a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
index dea2821..5fba5a9 100644 (file)
--- a/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
+++ b/inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
@@ -404,26 +404,16 @@ StatusCode CNNNetworkNGraphImpl::serialize(const std::string& xmlPath,
                                            const std::string& binPath,
                                            ResponseDesc* resp) const noexcept {
     try {
-        if (getFunction()) {
-            std::map<std::string, ngraph::OpSet> custom_opsets;
-            for (auto extension : _ie_extensions) {
-                auto opset = extension->getOpSets();
-                custom_opsets.insert(begin(opset), end(opset));
-            }
-            ngraph::pass::Manager manager;
-            manager.register_pass<ngraph::pass::Serialize>(
-                xmlPath, binPath, ngraph::pass::Serialize::Version::IR_V10,
-                custom_opsets);
-            manager.run_passes(_ngraph_function);
-        } else {
-#ifdef ENABLE_V7_SERIALIZE
-            auto network = std::make_shared<details::CNNNetworkImpl>(*this);
-            return network->serialize(xmlPath, binPath, resp);
-#else
-            return DescriptionBuffer(NOT_IMPLEMENTED, resp)
-                   << "The serialization of legacy IR is not implemented";
-#endif
+        std::map<std::string, ngraph::OpSet> custom_opsets;
+        for (auto extension : _ie_extensions) {
+            auto opset = extension->getOpSets();
+            custom_opsets.insert(begin(opset), end(opset));
         }
+        ngraph::pass::Manager manager;
+        manager.register_pass<ngraph::pass::Serialize>(
+            xmlPath, binPath, ngraph::pass::Serialize::Version::IR_V10,
+            custom_opsets);
+        manager.run_passes(_ngraph_function);
     } catch (const InferenceEngineException& e) {
         return DescriptionBuffer(GENERAL_ERROR, resp) << e.what();
     } catch (const std::exception& e) {