From 7465673e3306f5f2e5ed670c5a18468824daf6fa Mon Sep 17 00:00:00 2001 From: Maajid khan Date: Thu, 25 Feb 2021 18:42:57 +0530 Subject: [PATCH] [OpenVINO-EP] Find package changes (#6801) * Find package changes to cmake * Removing unwanted code from cmake Signed-off-by: MaajidKhan Co-authored-by: suryasidd --- cmake/onnxruntime_providers.cmake | 59 ++----------------- .../linux/docker/Dockerfile.ubuntu_openvino | 3 +- 2 files changed, 7 insertions(+), 55 deletions(-) diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake index 4ce604158c..a4ea17d7b4 100644 --- a/cmake/onnxruntime_providers.cmake +++ b/cmake/onnxruntime_providers.cmake @@ -568,60 +568,13 @@ if (onnxruntime_USE_OPENVINO) ) # Header paths - list(APPEND OPENVINO_INCLUDE_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/include) - list(APPEND OPENVINO_INCLUDE_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/tbb/include) - list(APPEND OPENVINO_INCLUDE_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/mkltiny_lnx/include) + find_package(InferenceEngine REQUIRED) + find_package(ngraph REQUIRED) - # Library paths - list(APPEND OPENVINO_LIB_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/tbb/lib) - list(APPEND OPENVINO_LIB_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/tbb/bin) - list(APPEND OPENVINO_LIB_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/mkltiny_lnx/lib) - - # Lib names - if (WIN32) - if (CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND OPENVINO_LIB_LIST inference_engined.lib inference_engine_legacyd.lib tbb.lib ${PYTHON_LIBRARIES}) - else() - list(APPEND OPENVINO_LIB_LIST inference_engine.lib inference_engine_legacy.lib tbb.lib ${PYTHON_LIBRARIES}) - endif() + if (OPENVINO_VERSION VERSION_EQUAL "2020.3") + list(APPEND OPENVINO_LIB_LIST ${InferenceEngine_LIBRARIES} ${NGRAPH_LIBRARIES} ${PYTHON_LIBRARIES}) else() - list(APPEND OPENVINO_LIB_LIST -linference_engine -linference_engine_legacy -ltbb ${PYTHON_LIBRARIES}) - endif() - - # Link to nGraph from OpenVINO installation - list(APPEND OPENVINO_INCLUDE_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/ngraph/include) - list(APPEND OPENVINO_INCLUDE_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/ngraph/include/ngraph/frontend) - list(APPEND OPENVINO_LIB_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/ngraph/lib) - if (OPENVINO_VERSION VERSION_EQUAL "2020.4") - if (WIN32) - list(APPEND OPENVINO_LIB_LIST ngraph.lib onnx_importer.lib) - else() - list(APPEND OPENVINO_LIB_LIST -lngraph -lonnx_importer) - endif() - endif() - - if (OPENVINO_VERSION VERSION_GREATER "2020.4") - if (WIN32) - if (CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND OPENVINO_LIB_LIST ngraphd.lib onnx_importerd.lib) - else() - list(APPEND OPENVINO_LIB_LIST ngraph.lib onnx_importer.lib) - endif() - else() - list(APPEND OPENVINO_LIB_LIST -lngraph -lonnx_importer) - endif() - endif() - - if(WIN32) - if (CMAKE_BUILD_TYPE STREQUAL "Debug") - list(APPEND OPENVINO_LIB_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/lib/intel64/Debug) - else() - list(APPEND OPENVINO_LIB_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/lib/intel64/Release) - endif() - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") - list(APPEND OPENVINO_LIB_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/lib/aarch64) - else() - list(APPEND OPENVINO_LIB_DIR_LIST $ENV{INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/lib/intel64) + list(APPEND OPENVINO_LIB_LIST ${InferenceEngine_LIBRARIES} ${NGRAPH_LIBRARIES} ngraph::onnx_importer ${PYTHON_LIBRARIES}) endif() source_group(TREE ${ONNXRUNTIME_ROOT}/core FILES ${onnxruntime_providers_openvino_cc_srcs}) @@ -630,10 +583,8 @@ if (onnxruntime_USE_OPENVINO) install(DIRECTORY ${PROJECT_SOURCE_DIR}/../include/onnxruntime/core/providers/openvino DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnxruntime/core/providers) set_target_properties(onnxruntime_providers_openvino PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(onnxruntime_providers_openvino PROPERTIES FOLDER "ONNXRuntime") - target_link_directories(onnxruntime_providers_openvino PRIVATE ${OPENVINO_LIB_DIR_LIST}) add_dependencies(onnxruntime_providers_openvino onnxruntime_providers_shared ${onnxruntime_EXTERNAL_DEPENDENCIES}) target_include_directories(onnxruntime_providers_openvino SYSTEM PUBLIC ${ONNXRUNTIME_ROOT} ${CMAKE_CURRENT_BINARY_DIR} ${eigen_INCLUDE_DIRS} ${OPENVINO_INCLUDE_DIR_LIST} ${PYTHON_INCLUDE_DIRS}) - # ${CMAKE_CURRENT_BINARY_DIR} is so that #include "onnxruntime_config.h" inside tensor_shape.h is found target_link_libraries(onnxruntime_providers_openvino onnxruntime_providers_shared ${OPENVINO_LIB_LIST}) if(MSVC) diff --git a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino index 00358c0052..7ece031362 100644 --- a/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino +++ b/tools/ci_build/github/linux/docker/Dockerfile.ubuntu_openvino @@ -15,7 +15,8 @@ WORKDIR /root ENV INTEL_OPENVINO_DIR /opt/intel/openvino_${OPENVINO_VERSION}.200 ENV LD_LIBRARY_PATH $INTEL_OPENVINO_DIR/deployment_tools/inference_engine/lib/intel64:$INTEL_OPENVINO_DIR/deployment_tools/ngraph/lib:$INTEL_OPENVINO_DIR/deployment_tools/inference_engine/external/tbb/lib:/usr/local/openblas/lib:$LD_LIBRARY_PATH - +ENV InferenceEngine_DIR $INTEL_OPENVINO_DIR/deployment_tools/inference_engine/share +ENV ngraph_DIR $INTEL_OPENVINO_DIR/deployment_tools/ngraph/cmake ENV PYTHONPATH $INTEL_OPENVINO_DIR/tools:$PYTHONPATH ENV IE_PLUGINS_PATH $INTEL_OPENVINO_DIR/deployment_tools/inference_engine/lib/intel64 ENV DEBIAN_FRONTEND=noninteractive