diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml index efd5afba0a0..882fecad7f1 100644 --- a/.ci/azure/windows.yml +++ b/.ci/azure/windows.yml @@ -169,7 +169,7 @@ jobs: # Add for gtest-parallel, it hangs now (CVS-33386) #python $(BUILD_DIR)\gtest-parallel\gtest-parallel $(BIN_DIR)\MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --dump_json_test_results=MklDnnFunctionalTests.json --gtest_filter=*smoke* -- --gtest_print_time=1 - script: | - set PATH=$(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.0\opencv\bin;%PATH% + set PATH=$(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.1\opencv\bin;%PATH% set DATA_PATH=$(MODELS_PATH) set MODELS_PATH=$(MODELS_PATH) $(BIN_DIR)\MklDnnFunctionalTests --gtest_filter=*smoke* --gtest_print_time=1 --gtest_output=xml:TEST-MklDnnFunctionalTests.xml @@ -177,7 +177,7 @@ jobs: continueOnError: false - script: | - set PATH=$(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.0\opencv\bin;%PATH% + set PATH=$(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.1\opencv\bin;%PATH% set DATA_PATH=$(MODELS_PATH) set MODELS_PATH=$(MODELS_PATH) $(BIN_DIR)\InferenceEngineCAPITests --gtest_output=xml:TEST-InferenceEngineCAPITests.xml diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake index 4c1a7ff18d1..86822bbbfd2 100644 --- a/inference-engine/cmake/dependencies.cmake +++ b/inference-engine/cmake/dependencies.cmake @@ -194,8 +194,8 @@ endif () if (ENABLE_OPENCV) reset_deps_cache(OpenCV_DIR) - set(OPENCV_VERSION "4.5.0") - set(OPENCV_BUILD "36") + set(OPENCV_VERSION "4.5.1") + set(OPENCV_BUILD "044") set(OPENCV_BUILD_YOCTO "337") if (AARCH64) @@ -227,36 +227,36 @@ if (ENABLE_OPENCV) TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}/opencv" ENVIRONMENT "OpenCV_DIR" VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*" - SHA256 "f20bfbf47281895fe488b594090958bb37f6893e5d9845ae56bc84079987f1df") + SHA256 "5250bfe5860c15eb1b31963c78804ee9b301a19d8d6e920c06ef41de681cb99e") elseif(APPLE AND X86_64) RESOLVE_DEPENDENCY(OPENCV ARCHIVE_MAC "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_osx.txz" TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}_osx/opencv" ENVIRONMENT "OpenCV_DIR" VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*" - SHA256 "3c0d81b6450e209daea9597906b24fab2c2654fa3a966d38c7ac87e4de5043a6") + SHA256 "f3ebc5cc72c86106c30cc711ac689e02281556bb43c09a89cd45cb99b6bef9a8") elseif(LINUX) if (AARCH64) set(OPENCV_SUFFIX "yocto_kmb") set(OPENCV_BUILD "${OPENCV_BUILD_YOCTO}") elseif (ARM) set(OPENCV_SUFFIX "debian9arm") - set(OPENCV_HASH "120336ac7696779a8152c2b71ace3fa5cf868b452d03032ef66513ed8446a794") + set(OPENCV_HASH "0e787d6738092993bc92bb55975f52caabae45dc73473b5196d15e65e87d6b9d") elseif (LINUX_OS_NAME STREQUAL "CentOS 7" OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") set(OPENCV_SUFFIX "centos7") - set(OPENCV_HASH "ed68bc21ae62ac892f61ba7bad266be3a1a1937e692f9dc7eb080c167a5fd37a") + set(OPENCV_HASH "9b813af064d463b31fa1603b11b6559532a031d59bb0782d234380955fd397e0") elseif (LINUX_OS_NAME MATCHES "CentOS 8") set(OPENCV_SUFFIX "centos8") - set(OPENCV_HASH "94b6a22eecd99c1c7383ef171750b75ea8b5c13e6399937387c6fb11ec1ecd69") + set(OPENCV_HASH "8ec3e3552500dee334162386b98cc54a5608de1f1a18f283523fc0cc13ee2f83") elseif (LINUX_OS_NAME STREQUAL "Ubuntu 16.04") set(OPENCV_SUFFIX "ubuntu16") set(OPENCV_HASH "cd46831b4d8d1c0891d8d22ff5b2670d0a465a8a8285243059659a50ceeae2c3") elseif (LINUX_OS_NAME STREQUAL "Ubuntu 18.04") set(OPENCV_SUFFIX "ubuntu18") - set(OPENCV_HASH "94b6a22eecd99c1c7383ef171750b75ea8b5c13e6399937387c6fb11ec1ecd69") + set(OPENCV_HASH "8ec3e3552500dee334162386b98cc54a5608de1f1a18f283523fc0cc13ee2f83") elseif (LINUX_OS_NAME STREQUAL "Ubuntu 20.04") set(OPENCV_SUFFIX "ubuntu20") - set(OPENCV_HASH "85ddb4df514e47b8451c5416e8ba91a3caa6b0c97ea8129d0c89cd005bd4995f") + set(OPENCV_HASH "2b7808d002864acdc5fc0b19cd30dadc31a37cc267931cad605f23f2383bfc21") else() message(FATAL_ERROR "OpenCV is not available on current platform (${LINUX_OS_NAME})") endif()