New IRC package structure (#6255)
* OV new package structure * Fixes * More fixes * Fixed code style in ngraph tests * Fixes * Paths to setupvars inside demo scripts * Fixed demo_security_barrier_camera.sh * Added setupvars.sh to old location as well * Fixed path * Fixed MO install path in .co * Fixed install of public headers * Fixed frontends installation * Updated DM config files * Keep opencv in the root * Improvements * Fixes for demo scripts * Added path to TBB * Fix for MO unit-tests * Fixed tests on Windows * Reverted arch * Removed arch * Reverted arch back: second attemp * System type * Fix for Windows * Resolve merge conflicts * Fixed path * Path for Windows * Added debug for Windows * Added requirements_dev.txt to install * Fixed wheel's setup.py * Fixed lin build * Fixes after merge * Fix 2 * Fixes * Frontends path * Fixed deployment manager * Fixed Windows * Added cldnn unit tests installation * Install samples * Fix samples * Fix path for samples * Proper path * Try to fix MO hardcodes * samples binary location * MO print * Added install for libopencv_c_wrapper.so * Added library destination * Fixed install rule for samples * Updated demo scripts readme.md * Samples * Keep source permissions for Python samples * Fixed python * Updated path to fast run scripts * Fixed C samples tests * Removed debug output * Small fixes * Try to unify prefix
This commit is contained in:
Ilya Lavrenov authored and 
GitHub committed
1 parent
08ea036a36
commit
0df7dab345
109 files changed
+608
-614
No files matched your search
@@ -4,7 +4,6 @@
|
||||
:: SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
set ROOT=%~dp0
|
||||
call :GetFullPath "%ROOT%\.." ROOT
|
||||
set SCRIPT_NAME=%~nx0
|
||||
|
||||
set "INTEL_OPENVINO_DIR=%ROOT%"
|
||||
@@ -32,49 +31,35 @@ set "PATH=%INTEL_OPENVINO_DIR%\opencv\x64\vc14\bin;%PATH%"
|
||||
)
|
||||
|
||||
:: Model Optimizer
|
||||
if exist %INTEL_OPENVINO_DIR%\deployment_tools\model_optimizer (
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\deployment_tools\model_optimizer;%PYTHONPATH%
|
||||
set "PATH=%INTEL_OPENVINO_DIR%\deployment_tools\model_optimizer;%PATH%"
|
||||
if exist %INTEL_OPENVINO_DIR%\tools\model_optimizer (
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\tools\model_optimizer;%PYTHONPATH%
|
||||
set "PATH=%INTEL_OPENVINO_DIR%\tools\model_optimizer;%PATH%"
|
||||
)
|
||||
|
||||
|
||||
:: Model Downloader
|
||||
if exist %INTEL_OPENVINO_DIR%\deployment_tools\open_model_zoo\tools\downloader (
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\deployment_tools\open_model_zoo\tools\downloader;%PYTHONPATH%
|
||||
set "PATH=%INTEL_OPENVINO_DIR%\deployment_tools\open_model_zoo\tools\downloader;%PATH%"
|
||||
if exist %INTEL_OPENVINO_DIR%\extras\open_model_zoo\tools\downloader (
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\extras\open_model_zoo\tools\downloader;%PYTHONPATH%
|
||||
set "PATH=%INTEL_OPENVINO_DIR%\extras\open_model_zoo\tools\downloader;%PATH%"
|
||||
)
|
||||
|
||||
:: Inference Engine
|
||||
set "InferenceEngine_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\share"
|
||||
set "OpenVINO_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\share"
|
||||
set "HDDL_INSTALL_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\hddl"
|
||||
set "OPENMP_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\omp\lib"
|
||||
set "GNA_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\gna\lib"
|
||||
|
||||
set "OPENVINO_LIB_PATHS=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\Release;%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\Debug;%HDDL_INSTALL_DIR%\bin;%OPENMP_DIR%;%GNA_DIR%;%OPENVINO_LIB_PATHS%"
|
||||
if exist %INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\arch_descriptions (
|
||||
set ARCH_ROOT_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\arch_descriptions
|
||||
)
|
||||
if exist %INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\arch_descriptions (
|
||||
set ARCH_ROOT_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\arch_descriptions
|
||||
)
|
||||
:: OpenVINO runtime
|
||||
set "InferenceEngine_DIR=%INTEL_OPENVINO_DIR%\runtime\cmake"
|
||||
set "ngraph_DIR=%INTEL_OPENVINO_DIR%\runtime\cmake"
|
||||
set "OpenVINO_DIR=%INTEL_OPENVINO_DIR%\runtime\cmake"
|
||||
set "HDDL_INSTALL_DIR=%INTEL_OPENVINO_DIR%\runtime\3rdparty\hddl"
|
||||
set "OPENVINO_LIB_PATHS=%INTEL_OPENVINO_DIR%\runtime\bin\intel64\Release;%INTEL_OPENVINO_DIR%\runtime\bin\intel64\Debug;%HDDL_INSTALL_DIR%\bin;%OPENVINO_LIB_PATHS%"
|
||||
set "OV_FRONTEND_PATH=%INTEL_OPENVINO_DIR%\runtime\bin\intel64\Release;%INTEL_OPENVINO_DIR%\runtime\bin\intel64\Debug;%OV_FRONTEND_PATH%"
|
||||
|
||||
:: TBB
|
||||
if exist %INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\tbb (
|
||||
set "OPENVINO_LIB_PATHS=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\tbb\bin;%OPENVINO_LIB_PATHS%"
|
||||
set "TBB_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\tbb\cmake"
|
||||
)
|
||||
|
||||
:: nGraph
|
||||
if exist %INTEL_OPENVINO_DIR%\deployment_tools\ngraph (
|
||||
set "OPENVINO_LIB_PATHS=%INTEL_OPENVINO_DIR%\deployment_tools\ngraph\lib;%OPENVINO_LIB_PATHS%"
|
||||
set "ngraph_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\ngraph\cmake"
|
||||
set "OV_FRONTEND_PATH=%INTEL_OPENVINO_DIR%\deployment_tools\ngraph\lib;%OV_FRONTEND_PATH%"
|
||||
if exist %INTEL_OPENVINO_DIR%\runtime\3rdparty\tbb (
|
||||
set "OPENVINO_LIB_PATHS=%INTEL_OPENVINO_DIR%\runtime\3rdparty\tbb\bin;%OPENVINO_LIB_PATHS%"
|
||||
set "TBB_DIR=%INTEL_OPENVINO_DIR%\runtime\3rdparty\tbb\cmake"
|
||||
)
|
||||
|
||||
:: Compile tool
|
||||
if exist %INTEL_OPENVINO_DIR%\deployment_tools\tools\compile_tool (
|
||||
set "PATH=%INTEL_OPENVINO_DIR%\deployment_tools\tools\compile_tool;%PATH%"
|
||||
if exist %INTEL_OPENVINO_DIR%\tools\compile_tool (
|
||||
set "PATH=%INTEL_OPENVINO_DIR%\tools\compile_tool;%PATH%"
|
||||
)
|
||||
|
||||
:: Add libs dirs to the PATH
|
||||
@@ -129,12 +114,12 @@ if not "%bitness%"=="64" (
|
||||
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\python\python%pyversion_major%.%pyversion_minor%;%INTEL_OPENVINO_DIR%\python\python3;%PYTHONPATH%
|
||||
|
||||
if exist %INTEL_OPENVINO_DIR%\deployment_tools\open_model_zoo\tools\accuracy_checker (
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\deployment_tools\open_model_zoo\tools\accuracy_checker;%PYTHONPATH%
|
||||
if exist %INTEL_OPENVINO_DIR%\tools\accuracy_checker (
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\tools\accuracy_checker;%PYTHONPATH%
|
||||
)
|
||||
|
||||
if exist %INTEL_OPENVINO_DIR%\deployment_tools\tools\post_training_optimization_toolkit (
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\deployment_tools\tools\post_training_optimization_toolkit;%PYTHONPATH%
|
||||
if exist %INTEL_OPENVINO_DIR%\post_training_optimization_toolkit (
|
||||
set PYTHONPATH=%INTEL_OPENVINO_DIR%\post_training_optimization_toolkit;%PYTHONPATH%
|
||||
)
|
||||
|
||||
echo [setupvars.bat] OpenVINO environment initialized
|
||||
|
||||
@@ -4,13 +4,8 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]-$0}" )" >/dev/null 2>&1 && pwd )"
|
||||
BASE_DIR="$( dirname "$SCRIPT_DIR" )"
|
||||
|
||||
INSTALLDIR="${BASE_DIR}"
|
||||
|
||||
|
||||
INSTALLDIR="${SCRIPT_DIR}"
|
||||
export INTEL_OPENVINO_DIR="$INSTALLDIR"
|
||||
export INTEL_CVSDK_DIR="$INTEL_OPENVINO_DIR"
|
||||
|
||||
# parse command line options
|
||||
while [[ $# -gt 0 ]]
|
||||
@@ -29,47 +24,40 @@ esac
|
||||
shift
|
||||
done
|
||||
|
||||
if [ -e "$INSTALLDIR/deployment_tools/inference_engine" ]; then
|
||||
export InferenceEngine_DIR=$INTEL_OPENVINO_DIR/deployment_tools/inference_engine/share
|
||||
export OpenVINO_DIR=$INTEL_OPENVINO_DIR/deployment_tools/inference_engine/share
|
||||
system_type=$(ls "$INTEL_OPENVINO_DIR/deployment_tools/inference_engine/lib/")
|
||||
IE_PLUGINS_PATH=$INTEL_OPENVINO_DIR/deployment_tools/inference_engine/lib/$system_type
|
||||
if [ -e "$INSTALLDIR/runtime" ]; then
|
||||
export InferenceEngine_DIR=$INSTALLDIR/runtime/cmake
|
||||
export ngraph_DIR=$INSTALLDIR/runtime/cmake
|
||||
export OpenVINO_DIR=$INSTALLDIR/runtime/cmake
|
||||
|
||||
if [[ -e ${IE_PLUGINS_PATH}/arch_descriptions ]]; then
|
||||
export ARCH_ROOT_DIR=${IE_PLUGINS_PATH}/arch_descriptions
|
||||
fi
|
||||
system_type=$(ls "$INSTALLDIR/runtime/lib/")
|
||||
IE_PLUGINS_PATH=$INSTALLDIR/runtime/lib/$system_type
|
||||
export OV_FRONTEND_PATH=${IE_PLUGINS_PATH}${OV_FRONTEND_PATH:+:$OV_FRONTEND_PATH}
|
||||
|
||||
export HDDL_INSTALL_DIR=$INSTALLDIR/deployment_tools/inference_engine/external/hddl
|
||||
export HDDL_INSTALL_DIR=$INSTALLDIR/runtime/3rdparty/hddl
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
export DYLD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/inference_engine/external/omp/lib:$INSTALLDIR/deployment_tools/inference_engine/external/mkltiny_mac/lib:${IE_PLUGINS_PATH}${DYLD_LIBRARY_PATH:+:DYLD_LIBRARY_PATH}
|
||||
export LD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/inference_engine/external/omp/lib:$INSTALLDIR/deployment_tools/inference_engine/external/mkltiny_mac/lib:${IE_PLUGINS_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
export DYLD_LIBRARY_PATH=${IE_PLUGINS_PATH}${DYLD_LIBRARY_PATH:+:DYLD_LIBRARY_PATH}
|
||||
export LD_LIBRARY_PATH=${IE_PLUGINS_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
else
|
||||
export LD_LIBRARY_PATH=$HDDL_INSTALL_DIR/lib:$INSTALLDIR/deployment_tools/inference_engine/external/omp/lib:$INSTALLDIR/deployment_tools/inference_engine/external/gna/lib:$INSTALLDIR/deployment_tools/inference_engine/external/mkltiny_lnx/lib:${IE_PLUGINS_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
export LD_LIBRARY_PATH=$HDDL_INSTALL_DIR/lib:${IE_PLUGINS_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
fi
|
||||
|
||||
HDDL_UNITE_DIR=$INSTALLDIR/deployment_tools/inference_engine/external/hddl_unite
|
||||
HDDL_UNITE_DIR=$INSTALLDIR/runtime/3rdparty/hddl_unite
|
||||
|
||||
if [ -e "$HDDL_UNITE_DIR" ]; then
|
||||
export LD_LIBRARY_PATH=$HDDL_UNITE_DIR/lib:$HDDL_UNITE_DIR/thirdparty/XLink/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -e "$INSTALLDIR/deployment_tools/inference_engine/external/tbb" ]; then
|
||||
if [ -e "$INSTALLDIR/runtime/3rdparty/tbb" ]; then
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
export DYLD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/inference_engine/external/tbb/lib:${DYLD_LIBRARY_PATH:+:DYLD_LIBRARY_PATH}
|
||||
export DYLD_LIBRARY_PATH=$INSTALLDIR/runtime/3rdparty/tbb/lib:${DYLD_LIBRARY_PATH:+:DYLD_LIBRARY_PATH}
|
||||
fi
|
||||
export LD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/inference_engine/external/tbb/lib:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
export TBB_DIR=$INSTALLDIR/deployment_tools/inference_engine/external/tbb/cmake
|
||||
export LD_LIBRARY_PATH=$INSTALLDIR/runtime/3rdparty/tbb/lib:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
export TBB_DIR=$INSTALLDIR/runtime/3rdparty/tbb/cmake
|
||||
fi
|
||||
|
||||
if [ -e "$INSTALLDIR/deployment_tools/tools/compile_tool" ]; then
|
||||
export LD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/tools/compile_tool${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
fi
|
||||
|
||||
if [ -e "$INSTALLDIR/deployment_tools/ngraph" ]; then
|
||||
export LD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/ngraph/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
export ngraph_DIR=$INSTALLDIR/deployment_tools/ngraph/cmake
|
||||
export OV_FRONTEND_PATH=$INSTALLDIR/deployment_tools/ngraph/lib${OV_FRONTEND_PATH:+:$OV_FRONTEND_PATH}
|
||||
if [ -e "$INSTALLDIR/tools/compile_tool" ]; then
|
||||
export LD_LIBRARY_PATH=$INSTALLDIR/tools/compile_tool${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
|
||||
fi
|
||||
|
||||
if [ -e "$INSTALLDIR/opencv" ]; then
|
||||
@@ -83,26 +71,26 @@ if [ -e "$INSTALLDIR/opencv" ]; then
|
||||
fi
|
||||
|
||||
|
||||
if [ -f "$INTEL_OPENVINO_DIR/data_processing/dl_streamer/bin/setupvars.sh" ]; then
|
||||
source "$INTEL_OPENVINO_DIR/data_processing/dl_streamer/bin/setupvars.sh"
|
||||
if [ -f "$INTEL_OPENVINO_DIR/extras/dl_streamer/setupvars.sh" ]; then
|
||||
source "$INTEL_OPENVINO_DIR/extras/dl_streamer/setupvars.sh"
|
||||
fi
|
||||
|
||||
export PATH="$INTEL_OPENVINO_DIR/deployment_tools/model_optimizer${PATH:+:$PATH}"
|
||||
export PYTHONPATH="$INTEL_OPENVINO_DIR/deployment_tools/model_optimizer${PYTHONPATH:+:$PYTHONPATH}"
|
||||
export PATH="$INTEL_OPENVINO_DIR/tools/model_optimizer${PATH:+:$PATH}"
|
||||
export PYTHONPATH="$INTEL_OPENVINO_DIR/tools/model_optimizer${PYTHONPATH:+:$PYTHONPATH}"
|
||||
|
||||
|
||||
|
||||
if [ -e "$INTEL_OPENVINO_DIR/deployment_tools/open_model_zoo/tools/downloader" ]; then
|
||||
export PYTHONPATH="$INTEL_OPENVINO_DIR/deployment_tools/open_model_zoo/tools/downloader:$PYTHONPATH"
|
||||
export PATH="$INTEL_OPENVINO_DIR/deployment_tools/open_model_zoo/tools/downloader:$PATH"
|
||||
if [ -e "$INTEL_OPENVINO_DIR/extras/open_model_zoo/tools/downloader" ]; then
|
||||
export PYTHONPATH="$INTEL_OPENVINO_DIR/extras/open_model_zoo/tools/downloader:$PYTHONPATH"
|
||||
export PATH="$INTEL_OPENVINO_DIR/extras/open_model_zoo/tools/downloader:$PATH"
|
||||
fi
|
||||
|
||||
if [ -e "$INTEL_OPENVINO_DIR/deployment_tools/open_model_zoo/tools/accuracy_checker" ]; then
|
||||
export PYTHONPATH="$INTEL_OPENVINO_DIR/deployment_tools/open_model_zoo/tools/accuracy_checker:$PYTHONPATH"
|
||||
if [ -e "$INTEL_OPENVINO_DIR/tools/accuracy_checker" ]; then
|
||||
export PYTHONPATH="$INTEL_OPENVINO_DIR/tools/accuracy_checker:$PYTHONPATH"
|
||||
fi
|
||||
|
||||
if [ -e "$INTEL_OPENVINO_DIR/deployment_tools/tools/post_training_optimization_toolkit" ]; then
|
||||
export PYTHONPATH="$INTEL_OPENVINO_DIR/deployment_tools/tools/post_training_optimization_toolkit:$PYTHONPATH"
|
||||
if [ -e "$INTEL_OPENVINO_DIR/tools/post_training_optimization_toolkit" ]; then
|
||||
export PYTHONPATH="$INTEL_OPENVINO_DIR/tools/post_training_optimization_toolkit:$PYTHONPATH"
|
||||
fi
|
||||
|
||||
if [ -z "$python_version" ]; then
|
||||
|
||||
Reference in new issue
Block a user