Install all python build artifacts to a single folder (#17883)
This commit is contained in:
@@ -106,7 +106,7 @@ if %pyversion_major% equ %PYTHON_VERSION_MAJOR% (
|
||||
)
|
||||
|
||||
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/
|
||||
echo Unsupported Python version %pyversion_major%.%pyversion_minor%. 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 0
|
||||
)
|
||||
|
||||
@@ -126,7 +126,7 @@ if not "%bitness%"=="64" (
|
||||
exit /B 0
|
||||
)
|
||||
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\python\python%pyversion_major%.%pyversion_minor%;%INTEL_OPENVINO_DIR%\python\python3;%PYTHONPATH%
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\python;%INTEL_OPENVINO_DIR%\python\python3;%PYTHONPATH%
|
||||
exit /B 0
|
||||
|
||||
:GetFullPath
|
||||
|
||||
@@ -116,7 +116,7 @@ check_python_version () {
|
||||
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] WARNING: Unsupported Python version. Please install one of Python" \
|
||||
echo "[setupvars.sh] WARNING: Unsupported Python version ${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 0
|
||||
@@ -136,14 +136,8 @@ check_python_version () {
|
||||
if [[ -d $INTEL_OPENVINO_DIR/python ]]; then
|
||||
# add path to OpenCV API for Python 3.x
|
||||
export PYTHONPATH="$INTEL_OPENVINO_DIR/python/python3:$PYTHONPATH"
|
||||
pydir=$INTEL_OPENVINO_DIR/python/python$python_version
|
||||
if [[ -d $pydir ]]; then
|
||||
# add path to Inference Engine Python API
|
||||
export PYTHONPATH="${pydir}:${PYTHONPATH}"
|
||||
else
|
||||
echo "[setupvars.sh] WARNING: Can not find OpenVINO Python module for python${python_version} by path ${pydir}"
|
||||
echo "[setupvars.sh] WARNING: OpenVINO Python environment does not set properly"
|
||||
fi
|
||||
# add path to OpenVINO Python API
|
||||
export PYTHONPATH="$INTEL_OPENVINO_DIR/python:${PYTHONPATH}"
|
||||
else
|
||||
echo "[setupvars.sh] WARNING: Can not find OpenVINO Python binaries by path ${INTEL_OPENVINO_DIR}/python"
|
||||
echo "[setupvars.sh] WARNING: OpenVINO Python environment does not set properly"
|
||||
|
||||
Reference in New Issue
Block a user