From fcfc10e56c94d407d68e9198c67e85f021440338 Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Fri, 29 May 2020 17:46:40 +0300 Subject: [PATCH] Do not use ONNX reader if ONNX importer was disabled (#683) --- inference-engine/src/inference_engine/CMakeLists.txt | 5 +++++ inference-engine/src/inference_engine/ie_network_reader.cpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt index ce94bb3567fea8..4ae0d560700aa1 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt @@ -119,6 +119,11 @@ add_library(${TARGET_NAME}_obj OBJECT target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API) +# TODO: Remove this definitios when readers will be loaded from xml +if(NGRAPH_ONNX_IMPORT_ENABLE) + target_compile_definitions(${TARGET_NAME}_obj PRIVATE ONNX_IMPORT_ENABLE) +endif() + target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $ $) diff --git a/inference-engine/src/inference_engine/ie_network_reader.cpp b/inference-engine/src/inference_engine/ie_network_reader.cpp index 9d739b6afb3c46..eabfb3dbbbc6b0 100644 --- a/inference-engine/src/inference_engine/ie_network_reader.cpp +++ b/inference-engine/src/inference_engine/ie_network_reader.cpp @@ -103,9 +103,11 @@ void registerReaders() { std::lock_guard lock(readerMutex); if (initialized) return; // TODO: Read readers info from XML +#ifdef ONNX_IMPORT_ENABLE auto onnxReader = std::make_shared("ONNX", std::string("inference_engine_onnx_reader") + std::string(IE_BUILD_POSTFIX)); readers.emplace("onnx", onnxReader); readers.emplace("prototxt", onnxReader); +#endif auto irReader = std::make_shared("IR", std::string("inference_engine_ir_reader") + std::string(IE_BUILD_POSTFIX)); readers.emplace("xml", irReader); initialized = true;