From b90d55b7ea9e1e86624827145c85fbc3db9eec5b Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 14 Nov 2019 04:49:00 +0300 Subject: [PATCH] Fixed compilation with ngraph (#2388) --- cmake/CMakeLists.txt | 2 +- cmake/external/ngraph.cmake | 5 +++-- cmake/onnxruntime_providers.cmake | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 52f0d60458..e8c7b39366 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -539,7 +539,7 @@ if (onnxruntime_USE_NGRAPH) add_definitions(-DUSE_NGRAPH=1) include(ngraph) list(APPEND onnxruntime_EXTERNAL_LIBRARIES ngraph) - list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES ngraph) + list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES project_ngraph) endif() if(onnxruntime_USE_OPENVINO) diff --git a/cmake/external/ngraph.cmake b/cmake/external/ngraph.cmake index 18b61b2103..1a84fac64d 100644 --- a/cmake/external/ngraph.cmake +++ b/cmake/external/ngraph.cmake @@ -71,8 +71,9 @@ if (MSVC) -Dprebuilt_ONNX_SOURCE_DIR=${prebuilt_ONNX_SOURCE_DIR} DEPENDS onnx ) - add_library(ngraph STATIC IMPORTED) - set_property(TARGET ngraph PROPERTY IMPORTED_LOCATION ${ngraph_LIBRARIES}/ngraph.lib) + add_library(ngraph SHARED IMPORTED) + set_property(TARGET ngraph PROPERTY IMPORTED_LOCATION ${ngraph_LIBRARIES}/${NGRAPH_SHARED_LIB}) + set_property(TARGET ngraph PROPERTY IMPORTED_IMPLIB ${ngraph_LIBRARIES}/ngraph.lib) else() ExternalProject_Add(project_ngraph PREFIX ngraph diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake index f73bb121a8..51d5883995 100644 --- a/cmake/onnxruntime_providers.cmake +++ b/cmake/onnxruntime_providers.cmake @@ -273,7 +273,7 @@ if (onnxruntime_USE_NGRAPH) source_group(TREE ${ONNXRUNTIME_ROOT}/core FILES ${onnxruntime_providers_ngraph_cc_srcs}) add_library(onnxruntime_providers_ngraph ${onnxruntime_providers_ngraph_cc_srcs}) onnxruntime_add_include_to_target(onnxruntime_providers_ngraph onnxruntime_common onnxruntime_framework onnx onnx_proto protobuf::libprotobuf) - add_dependencies(onnxruntime_providers_ngraph ngraph onnx ${onnxruntime_EXTERNAL_DEPENDENCIES}) + add_dependencies(onnxruntime_providers_ngraph project_ngraph onnx ${onnxruntime_EXTERNAL_DEPENDENCIES}) set_target_properties(onnxruntime_providers_ngraph PROPERTIES FOLDER "ONNXRuntime") target_include_directories(onnxruntime_providers_ngraph PRIVATE ${ONNXRUNTIME_ROOT} ${ngraph_INCLUDE_DIRS}) set_target_properties(onnxruntime_providers_ngraph PROPERTIES LINKER_LANGUAGE CXX)