saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-01 23:30:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compilation with ngraph (#2388)

Browse source
This commit is contained in:
Ilya Lavrenov 2019-11-14 04:49:00 +03:00 committed by George Wu
parent dde410e073
commit b90d55b7ea
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/CMakeLists.txt
View file

@ -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)

5
cmake/external/ngraph.cmake vendored
View file

@ -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

2
cmake/onnxruntime_providers.cmake
View file

@ -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)