diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml index 33e19d63cf6..e8831030ed8 100644 --- a/.ci/azure/linux.yml +++ b/.ci/azure/linux.yml @@ -208,7 +208,7 @@ jobs: - script: | set -e - mkdir $(INSTALL_DIR)/opencv/ + mkdir -p $(INSTALL_DIR)/opencv/ cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P cmake_install.cmake cp -R $(REPO_DIR)/temp/opencv_4.5.2_ubuntu20/opencv/* $(INSTALL_DIR)/opencv/ workingDirectory: $(BUILD_DIR) diff --git a/.ci/azure/mac.yml b/.ci/azure/mac.yml index 804ce171362..366792f283e 100644 --- a/.ci/azure/mac.yml +++ b/.ci/azure/mac.yml @@ -119,7 +119,7 @@ jobs: - script: | set -e - mkdir $(INSTALL_DIR)/opencv/ + mkdir -p $(INSTALL_DIR)/opencv/ cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P cmake_install.cmake cp -R $(REPO_DIR)/temp/opencv_4.5.2_osx/opencv/* $(INSTALL_DIR)/opencv/ workingDirectory: $(BUILD_DIR) diff --git a/scripts/setupvars/setupvars.bat b/scripts/setupvars/setupvars.bat index c5235b9158a..34a859b39ef 100644 --- a/scripts/setupvars/setupvars.bat +++ b/scripts/setupvars/setupvars.bat @@ -3,11 +3,9 @@ :: Copyright (C) 2018-2021 Intel Corporation :: SPDX-License-Identifier: Apache-2.0 -set ROOT=%~dp0 set SCRIPT_NAME=%~nx0 -set "INTEL_OPENVINO_DIR=%ROOT%" -set "INTEL_CVSDK_DIR=%INTEL_OPENVINO_DIR%" +set "INTEL_OPENVINO_DIR=%~dp0" set "python_version=" @@ -23,21 +21,16 @@ if not "%1"=="" ( ) :: OpenCV -if exist "%INTEL_OPENVINO_DIR%\extras\opencv\setupvars.bat" ( -call "%INTEL_OPENVINO_DIR%\extras\opencv\setupvars.bat" -goto :opencv_done -) if exist "%INTEL_OPENVINO_DIR%\opencv\setupvars.bat" ( call "%INTEL_OPENVINO_DIR%\opencv\setupvars.bat" goto :opencv_done ) -:opencv_done -:: Model Optimizer -if exist %INTEL_OPENVINO_DIR%\tools\mo ( -set PYTHONPATH=%INTEL_OPENVINO_DIR%\tools\mo;%PYTHONPATH% -set "PATH=%INTEL_OPENVINO_DIR%\tools\mo;%PATH%" +if exist "%INTEL_OPENVINO_DIR%\extras\opencv\setupvars.bat" ( +call "%INTEL_OPENVINO_DIR%\extras\opencv\setupvars.bat" +goto :opencv_done ) +:opencv_done :: OpenVINO runtime set "InferenceEngine_DIR=%INTEL_OPENVINO_DIR%\runtime\cmake" @@ -61,14 +54,17 @@ set "PATH=%INTEL_OPENVINO_DIR%\tools\compile_tool;%PATH%" set "PATH=%OPENVINO_LIB_PATHS%;%PATH%" :: Check if Python is installed +set PYTHON_VERSION_MAJOR=3 +set MIN_REQUIRED_PYTHON_VERSION_MINOR=6 +set MAX_SUPPORTED_PYTHON_VERSION_MINOR=9 + python --version 2>NUL if errorlevel 1 ( - echo Error^: Python is not installed. Please install one of Python 3.6 - 3.8 ^(64-bit^) from https://www.python.org/downloads/ + echo Error^: Python is not installed. Please install one of Python %PYTHON_VERSION_MAJOR%.%MIN_REQUIRED_PYTHON_VERSION_MINOR% - %PYTHON_VERSION_MAJOR%.%MAX_SUPPORTED_PYTHON_VERSION_MINOR% ^(64-bit^) from https://www.python.org/downloads/ exit /B 1 ) :: Check Python version if user did not pass -pyver - if "%python_version%" == "" ( for /F "tokens=* USEBACKQ" %%F IN (`python -c "import sys; print(str(sys.version_info[0])+'.'+str(sys.version_info[1]))" 2^>^&1`) DO ( set python_version=%%F @@ -80,14 +76,16 @@ for /F "tokens=1,2 delims=. " %%a in ("%python_version%") do ( set pyversion_minor=%%b ) -if "%pyversion_major%" geq "3" ( - if "%pyversion_minor%" geq "6" ( - set check_pyversion=okay - ) +if "%pyversion_major%" equ "%PYTHON_VERSION_MAJOR%" ( + if "%pyversion_minor%" geq "%MIN_REQUIRED_PYTHON_VERSION_MINOR%" ( + if "%pyversion_minor%" leq "%MAX_SUPPORTED_PYTHON_VERSION_MINOR%" ( + set "check_pyversion=true" + ) + ) ) -if not "%check_pyversion%"=="okay" ( - echo Unsupported Python version. Please install one of Python 3.6 - 3.8 ^(64-bit^) from https://www.python.org/downloads/ +if not "%check_pyversion%"=="true" ( + echo Unsupported Python version. Please install one of Python %PYTHON_VERSION_MAJOR%.%MIN_REQUIRED_PYTHON_VERSION_MINOR% - %PYTHON_VERSION_MAJOR%.%MAX_SUPPORTED_PYTHON_VERSION_MINOR% ^(64-bit^) from https://www.python.org/downloads/ exit /B 1 ) @@ -103,16 +101,12 @@ for /F "tokens=* USEBACKQ" %%F IN (`python -c "import sys; print(64 if sys.maxsi ) if not "%bitness%"=="64" ( - echo Unsupported Python bitness. Please install one of Python 3.6 - 3.8 ^(64-bit^) from https://www.python.org/downloads/ + echo Unsupported Python bitness. Please install one of Python %PYTHON_VERSION_MAJOR%.%MIN_REQUIRED_PYTHON_VERSION_MINOR% - %PYTHON_VERSION_MAJOR%.%MAX_SUPPORTED_PYTHON_VERSION_MINOR%^(64-bit^) from https://www.python.org/downloads/ exit /B 1 ) set PYTHONPATH=%INTEL_OPENVINO_DIR%\python\python%pyversion_major%.%pyversion_minor%;%INTEL_OPENVINO_DIR%\python\python3;%PYTHONPATH% -if exist %INTEL_OPENVINO_DIR%\tools\post_training_optimization_toolkit ( - set PYTHONPATH=%INTEL_OPENVINO_DIR%\tools\post_training_optimization_toolkit;%PYTHONPATH% -) - echo [setupvars.bat] OpenVINO environment initialized exit /B 0 diff --git a/scripts/setupvars/setupvars.sh b/scripts/setupvars/setupvars.sh index 99b651f545d..99e787c90a5 100755 --- a/scripts/setupvars/setupvars.sh +++ b/scripts/setupvars/setupvars.sh @@ -59,29 +59,25 @@ if [ -e "$INSTALLDIR/tools/compile_tool" ]; then export LD_LIBRARY_PATH=$INSTALLDIR/tools/compile_tool${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} fi - # OpenCV environment -for _loc in "extras/opencv" "opencv" ; do - _fname="$INSTALLDIR/${_loc}/setupvars.sh" - [ -f "${_fname}" ] && source "${_fname}" && break -done - - -if [ -f "$INTEL_OPENVINO_DIR/extras/dl_streamer/setupvars.sh" ]; then - source "$INTEL_OPENVINO_DIR/extras/dl_streamer/setupvars.sh" +if [ -f "$INSTALLDIR/opencv/setupvars.sh" ]; then + source "$INSTALLDIR/opencv/setupvars.sh" fi -export PATH="$INTEL_OPENVINO_DIR/tools/mo${PATH:+:$PATH}" -export PYTHONPATH="$INTEL_OPENVINO_DIR/tools/mo${PYTHONPATH:+:$PYTHONPATH}" - -if [ -e "$INTEL_OPENVINO_DIR/tools/post_training_optimization_toolkit" ]; then - export PYTHONPATH="$INTEL_OPENVINO_DIR/tools/post_training_optimization_toolkit:$PYTHONPATH" +if [ -f "$INSTALLDIR/extras/opencv/setupvars.sh" ]; then + source "$INSTALLDIR/extras/opencv/setupvars.sh" fi if [ -z "$python_version" ]; then python_version=$(python3 -c 'import sys; print(str(sys.version_info[0])+"."+str(sys.version_info[1]))') fi +version_arr=(${python_version//./ }) +if [ "${#version_arr[@]}" -ge "2" ]; then + python_version_major=${version_arr[0]} + python_version_minor=${version_arr[1]} +fi + OS_NAME="" if command -v lsb_release >/dev/null 2>&1; then OS_NAME=$(lsb_release -i -s) @@ -92,14 +88,19 @@ if [ "$python_bitness" != "" ] && [ "$python_bitness" != "64" ] && [ "$OS_NAME" echo "[setupvars.sh] 64 bitness for Python $python_version is required" fi -MINIMUM_REQUIRED_PYTHON_VERSION="3.6" -MAX_SUPPORTED_PYTHON_VERSION=$([[ "$OSTYPE" == "darwin"* ]] && echo '3.7' || echo '3.8') -if [[ -n "$python_version" && "$(printf '%s\n' "$python_version" "$MINIMUM_REQUIRED_PYTHON_VERSION" | sort -V | head -n 1)" != "$MINIMUM_REQUIRED_PYTHON_VERSION" ]]; then - echo "[setupvars.sh] ERROR: Unsupported Python version. Please install one of Python 3.6-${MAX_SUPPORTED_PYTHON_VERSION} (64-bit) from https://www.python.org/downloads/" +PYTHON_VERSION_MAJOR="3" +MIN_REQUIRED_PYTHON_VERSION_MINOR="6" +MAX_SUPPORTED_PYTHON_VERSION_MINOR="9" + +if [ "$PYTHON_VERSION_MAJOR" != "$python_version_major" ] || + [ "$python_version_minor" -lt "$MIN_REQUIRED_PYTHON_VERSION_MINOR" ] || + [ "$python_version_minor" -gt "$MAX_SUPPORTED_PYTHON_VERSION_MINOR" ] ; then + echo "[setupvars.sh] ERROR: Unsupported Python version. Please install one of Python" \ + "${PYTHON_VERSION_MAJOR}.${MIN_REQUIRED_PYTHON_VERSION_MINOR} -" \ + "${PYTHON_VERSION_MAJOR}.${MAX_SUPPORTED_PYTHON_VERSION_MINOR} (64-bit) from https://www.python.org/downloads/" return 1 fi - if [ -n "$python_version" ]; then if [[ -d $INTEL_OPENVINO_DIR/python ]]; then # add path to OpenCV API for Python 3.x