From fe49d5743b16f312ba7a1b764be3dbb8bb6423d1 Mon Sep 17 00:00:00 2001 From: Alexey Suhov Date: Wed, 16 Sep 2020 16:13:41 +0300 Subject: [PATCH] update OpenCV version to 4.5.0 (#2254) * update OpenCV version to 4.5.0 * fix Azure pipelines --- azure-pipelines.yml | 4 ++-- build-instruction.md | 2 +- inference-engine/cmake/dependencies.cmake | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1d8d23bad32..35114337919 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -336,14 +336,14 @@ jobs: # Add for gtest-parallel, it hangs now (CVS-33386) #python $(BUILD_DIR)\gtest-parallel\gtest-parallel $(BIN_DIR)\MklDnnFunctionalTests --workers=$(WORKERS_NUMBER) --print_test_times --dump_json_test_results=MklDnnFunctionalTests.json -- --gtest_print_time=1 - script: | - set PATH=$(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.3.0\opencv\bin;%PATH% + set PATH=$(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.0\opencv\bin;%PATH% set DATA_PATH=$(BUILD_DIR)\testdata set MODELS_PATH=$(BUILD_DIR)\testdata $(BIN_DIR)\MklDnnFunctionalTests --gtest_print_time=1 displayName: 'MklDnnFunctionalTests' continueOnError: false - script: | - set PATH=$(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.3.0\opencv\bin;%PATH% + set PATH=$(REPO_DIR)\inference-engine\temp\tbb\bin;$(REPO_DIR)\inference-engine\temp\opencv_4.5.0\opencv\bin;%PATH% set DATA_PATH=$(BUILD_DIR)\testdata set MODELS_PATH=$(BUILD_DIR)\testdata $(BIN_DIR)\InferenceEngineCAPITests diff --git a/build-instruction.md b/build-instruction.md index c9f5341cd79..29aa48183ca 100644 --- a/build-instruction.md +++ b/build-instruction.md @@ -382,7 +382,7 @@ cmake -G "Visual Studio 15 2017 Win64" -T "Intel C++ Compiler 18.0" ^ 6. Before running the samples, add paths to the TBB and OpenCV binaries used for the build to the `%PATH%` environment variable. By default, TBB binaries are downloaded by the CMake-based script to the `/inference-engine/temp/tbb/bin` - folder, OpenCV binaries to the `/inference-engine/temp/opencv_4.3.0/opencv/bin` + folder, OpenCV binaries to the `/inference-engine/temp/opencv_4.5.0/opencv/bin` folder. ### Additional Build Options diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake index 4f0f1086ef8..473648109f2 100644 --- a/inference-engine/cmake/dependencies.cmake +++ b/inference-engine/cmake/dependencies.cmake @@ -181,9 +181,9 @@ endif () if (ENABLE_OPENCV) reset_deps_cache(OpenCV_DIR) - set(OPENCV_VERSION "4.3.0") - set(OPENCV_BUILD "060") - set(OPENCV_BUILD_YOCTO "073") + set(OPENCV_VERSION "4.5.0") + set(OPENCV_BUILD "36") + set(OPENCV_BUILD_YOCTO "337") if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") if(DEFINED ENV{THIRDPARTY_SERVER_PATH})