From 442bb4e23a1725ecf6cf452e2daaad4be2dad759 Mon Sep 17 00:00:00 2001 From: Ilya Churaev Date: Mon, 31 May 2021 16:24:53 +0300 Subject: [PATCH 1/2] Fixed nGraph lib files for Windows (#5904) * Fixed nGraph lib files for Windows * Fixed comments --- ngraph/cmake/external_onnx.cmake | 1 - ngraph/cmake/external_protobuf.cmake | 1 - 2 files changed, 2 deletions(-) diff --git a/ngraph/cmake/external_onnx.cmake b/ngraph/cmake/external_onnx.cmake index 2629d489fc5fd4..3246370112f878 100644 --- a/ngraph/cmake/external_onnx.cmake +++ b/ngraph/cmake/external_onnx.cmake @@ -49,7 +49,6 @@ macro(onnx_set_target_properties) install(TARGETS onnx_proto RUNTIME DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT ngraph - ARCHIVE DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT ngraph LIBRARY DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT ngraph) if (NGRAPH_EXPORT_TARGETS_ENABLE) diff --git a/ngraph/cmake/external_protobuf.cmake b/ngraph/cmake/external_protobuf.cmake index 502a23d572f42f..feb27d8754c4e6 100644 --- a/ngraph/cmake/external_protobuf.cmake +++ b/ngraph/cmake/external_protobuf.cmake @@ -119,7 +119,6 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE "${PUSH_CMAKE_INTERPROCEDURAL_OPT install(TARGETS ${Protobuf_LIBRARIES} RUNTIME DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT ngraph - ARCHIVE DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT ngraph LIBRARY DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT ngraph) if (NGRAPH_EXPORT_TARGETS_ENABLE) export(TARGETS ${Protobuf_LIBRARIES} NAMESPACE ngraph:: APPEND FILE "${NGRAPH_TARGETS_FILE}") From 315c8d4eec75d1efbce553434ed5db5df6d97665 Mon Sep 17 00:00:00 2001 From: Artyom Anokhov Date: Mon, 31 May 2021 16:31:50 +0300 Subject: [PATCH 2/2] install_NEO_OCL_driver.sh: Added auto_mode option (#5864) --- .../install_NEO_OCL_driver.sh | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/scripts/install_dependencies/install_NEO_OCL_driver.sh b/scripts/install_dependencies/install_NEO_OCL_driver.sh index b9dfa1d71edbe2..51c5c5ec638bef 100755 --- a/scripts/install_dependencies/install_NEO_OCL_driver.sh +++ b/scripts/install_dependencies/install_NEO_OCL_driver.sh @@ -32,6 +32,7 @@ Download and installs the Intel® Graphics Compute Runtime for OpenCL™ Driver Available options: -y Replace the currently installed driver with the newer version. + -a, --auto Auto-mode for detecting best driver for current OS and hardware. -d, --install_driver Manually select driver version to one of available to install drivers. Default value: $INSTALL_DRIVER_VERSION Available to install drivers: ${AVAILABLE_DRIVERS[*]} @@ -59,6 +60,10 @@ do -y) agreement=true shift + ;; + -a|--auto) + auto_mode=true + shift ;; --no_numa) no_numa=true @@ -523,14 +528,19 @@ check_specific_generation() if [[ ! -z "$specific_generation" && "$INSTALL_DRIVER_VERSION" != '20.35.17767' ]]; then echo "$(basename "$0"): Detected 10th generation Intel® Core™ processor (formerly Ice Lake) or 11th generation Intel® Core™ processor (formerly Tiger Lake)." echo "Driver version 20.35.17767 is going to be installed to fully utilize hardware features and performance." - while true; do - read -p "You are still able to use the older version 19.41.14441. Use the older driver? (y/n) [n] " yn - yn=${yn:=n} - case $yn in - [Yy]*) return 0 ;; - [Nn]*) INSTALL_DRIVER_VERSION='20.35.17767' && return 0 ;; - esac - done + if [ "$auto_mode" == true ]; then + INSTALL_DRIVER_VERSION='20.35.17767' + return 0 + else + while true; do + read -p "You are still able to use the older version 19.41.14441. Use the older driver? (y/n) [n] " yn + yn=${yn:=n} + case $yn in + [Yy]*) return 0 ;; + [Nn]*) INSTALL_DRIVER_VERSION='20.35.17767' && return 0 ;; + esac + done + fi fi }