diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index f2c0f077479..df5ce14d489 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -234,95 +234,6 @@ Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake update_deps_cache(TBBBIND_2_5_DIR "${TBBBIND_2_5}/cmake" "Path to TBBBIND_2_5 cmake folder") endfunction() -## OpenCV -if(ENABLE_OPENCV) - reset_deps_cache(OpenCV_DIR) - - set(OPENCV_VERSION "4.5.2") - set(OPENCV_BUILD "076") - set(OPENCV_BUILD_YOCTO "772") - - if(YOCTO_AARCH64) - if(DEFINED ENV{THIRDPARTY_SERVER_PATH}) - set(IE_PATH_TO_DEPS "$ENV{THIRDPARTY_SERVER_PATH}") - elseif(DEFINED THIRDPARTY_SERVER_PATH) - set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}") - else() - message(WARNING "OpenCV is not found!") - endif() - - if(DEFINED IE_PATH_TO_DEPS) - set(OPENCV_SUFFIX "yocto_kmb") - set(OPENCV_BUILD "${OPENCV_BUILD_YOCTO}") - - RESOLVE_DEPENDENCY(OPENCV - ARCHIVE_LIN "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_${OPENCV_SUFFIX}.txz" - TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}_${OPENCV_SUFFIX}/opencv" - ENVIRONMENT "OpenCV_DIR" - VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*" - SHA256 "23c250796ad5fc9db810e1680ccdb32c45dc0e50cace5e0f02b30faf652fe343") - - unset(IE_PATH_TO_DEPS) - endif() - else() - if(WIN32 AND X86_64) - RESOLVE_DEPENDENCY(OPENCV - ARCHIVE_WIN "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}.txz" - TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}/opencv" - ENVIRONMENT "OpenCV_DIR" - VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*" - SHA256 "a14f872e6b63b6ac12c7ff47fa49e578d14c14433b57f5d85ab5dd48a079938c") - 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 "3e162f96e86cba8836618134831d9cf76df0438778b3e27e261dedad9254c514") - elseif(LINUX) - if(YOCTO_AARCH64) - set(OPENCV_SUFFIX "yocto_kmb") - set(OPENCV_BUILD "${OPENCV_BUILD_YOCTO}") - elseif((OV_GLIBC_VERSION VERSION_GREATER_EQUAL 2.17 AND - CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") AND X86_64) - set(OPENCV_SUFFIX "centos7") - set(OPENCV_HASH "5fa76985c84fe7c64531682ef0b272510c51ac0d0565622514edf1c88b33404a") - elseif(OV_GLIBC_VERSION VERSION_GREATER_EQUAL 2.31 AND X86_64) - set(OPENCV_SUFFIX "ubuntu20") - set(OPENCV_HASH "2fe7bbc40e1186eb8d099822038cae2821abf617ac7a16fadf98f377c723e268") - elseif(OV_GLIBC_VERSION VERSION_GREATER_EQUAL 2.27 AND X86_64) - set(OPENCV_SUFFIX "ubuntu18") - set(OPENCV_HASH "db087dfd412eedb8161636ec083ada85ff278109948d1d62a06b0f52e1f04202") - elseif(OV_GLIBC_VERSION VERSION_GREATER_EQUAL 2.24 AND ARM) - set(OPENCV_SUFFIX "debian9arm") - set(OPENCV_HASH "4274f8c40b17215f4049096b524e4a330519f3e76813c5a3639b69c48633d34e") - elseif(OV_GLIBC_VERSION VERSION_GREATER_EQUAL 2.23 AND X86_64) - set(OPENCV_SUFFIX "ubuntu16") - set(OPENCV_HASH "cd46831b4d8d1c0891d8d22ff5b2670d0a465a8a8285243059659a50ceeae2c3") - elseif(NOT DEFINED OpenCV_DIR AND NOT DEFINED ENV{OpenCV_DIR}) - message(FATAL_ERROR "OpenCV is not available on current platform (OS = ${CMAKE_SYSTEM_NAME}, glibc ${OV_GLIBC_VERSION})") - endif() - RESOLVE_DEPENDENCY(OPENCV - ARCHIVE_LIN "opencv/opencv_${OPENCV_VERSION}-${OPENCV_BUILD}_${OPENCV_SUFFIX}.txz" - TARGET_PATH "${TEMP}/opencv_${OPENCV_VERSION}_${OPENCV_SUFFIX}/opencv" - ENVIRONMENT "OpenCV_DIR" - VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*" - SHA256 ${OPENCV_HASH}) - endif() - endif() - - if(ANDROID) - set(ocv_cmake_path "${OPENCV}/sdk/native/jni/") - else() - set(ocv_cmake_path "${OPENCV}/cmake") - endif() - - update_deps_cache(OpenCV_DIR "${ocv_cmake_path}" "Path to OpenCV package folder") - debug_message(STATUS "opencv=" ${OPENCV}) -else() - reset_deps_cache(OpenCV_DIR) -endif() - if(ENABLE_INTEL_GNA) reset_deps_cache( GNA_EXT_DIR diff --git a/cmake/features.cmake b/cmake/features.cmake index e0ab1b0b683..1070fb69159 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -110,8 +110,6 @@ ie_dependent_option (ENABLE_FUNCTIONAL_TESTS "functional tests" ON "ENABLE_TESTS ie_option (ENABLE_SAMPLES "console samples are part of OpenVINO Runtime package" ON) -ie_option (ENABLE_OPENCV "enables custom OpenCV download" OFF) - set(OPENVINO_EXTRA_MODULES "" CACHE STRING "Extra paths for extra modules to include into OpenVINO build") ie_dependent_option(ENABLE_TBB_RELEASE_ONLY "Only Release TBB libraries are linked to the OpenVINO Runtime binaries" ON "THREADING MATCHES TBB;LINUX" OFF) diff --git a/docs/dev/build_android.md b/docs/dev/build_android.md index 6fd888405b5..7db455e297e 100644 --- a/docs/dev/build_android.md +++ b/docs/dev/build_android.md @@ -31,8 +31,7 @@ This article describes how to build Inference Engine for Android operating syste -DCMAKE_TOOLCHAIN_FILE=~/Downloads/android-ndk/build/cmake/android.toolchain.cmake \ -DANDROID_ABI=x86_64 \ -DANDROID_PLATFORM=21 \ - -DANDROID_STL=c++_shared \ - -DENABLE_OPENCV=OFF + -DANDROID_STL=c++_shared make --jobs=$(nproc --all) ``` diff --git a/docs/dev/cmake_options_for_custom_compilation.md b/docs/dev/cmake_options_for_custom_compilation.md index d79dcbb2c07..5142645d8bc 100644 --- a/docs/dev/cmake_options_for_custom_compilation.md +++ b/docs/dev/cmake_options_for_custom_compilation.md @@ -115,15 +115,13 @@ This document provides description and default values for CMake options that can * `SELECTIVE_BUILD` enables [[Conditional compilation|ConditionalCompilation]] feature. * `OFF` is default. -## Building with custom OpenCV +## Building with OpenCV -When OpenVINO CMake scripts are run with enabled OpenCV (`-DENABLE_OPENCV=ON` which is default), CMake OpenVINO scripts automatically download prebuilt OpenCV -from shared drive, such OpenCV is ABI-compatible with the default compiler of your system. If you have a non-default compiler or want to use custom version of OpenCV, you can pass it via CMake option: +Some OpenVINO samples can benefit from OpenCV usage, e.g. can read more image formats as inputs. If you have OpenCV on your machine, you can pass it via CMake option: ```sh cmake -DOpenCV_DIR= ... ``` -In this case, default OpenCV will not downloaded and provided one will be used. ## Building with custom TBB