Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New IRC package structure #6255

Merged
merged 101 commits into from
Sep 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
509867f
OV new package structure
ilya-lavrenov Jun 19, 2021
2e01b37
Fixes
ilya-lavrenov Jun 19, 2021
a0e4a83
More fixes
ilya-lavrenov Jun 19, 2021
1df2bb8
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Jun 21, 2021
b91a51e
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Jun 25, 2021
ffb9495
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Jul 5, 2021
08c3246
Fixed code style in ngraph tests
ilya-lavrenov Jul 5, 2021
851e218
Fixes
ilya-lavrenov Jul 5, 2021
65aaa01
Paths to setupvars inside demo scripts
ilya-lavrenov Jul 5, 2021
8cb4195
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Jul 6, 2021
cce1261
Fixed demo_security_barrier_camera.sh
ilya-lavrenov Jul 6, 2021
e55a461
Added setupvars.sh to old location as well
ilya-lavrenov Jul 6, 2021
e3d612d
Fixed path
ilya-lavrenov Jul 6, 2021
94e2f59
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Jul 19, 2021
b7aec28
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Jul 19, 2021
58d1bcb
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Jul 21, 2021
ab0f98b
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Aug 3, 2021
00b6b6f
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Aug 9, 2021
6fc5835
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Aug 10, 2021
970871e
Fixed MO install path in .co
ilya-lavrenov Aug 10, 2021
331a512
Fixed install of public headers
ilya-lavrenov Aug 10, 2021
d6bfa97
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Aug 10, 2021
645aa10
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Aug 30, 2021
a043499
Fixed frontends installation
ilya-lavrenov Aug 30, 2021
441d18c
Updated DM config files
ilya-lavrenov Aug 30, 2021
9bd5708
Keep opencv in the root
ilya-lavrenov Sep 1, 2021
ff3aa4e
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 1, 2021
3de9ed4
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 1, 2021
6c1b99b
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 2, 2021
69d6ecc
Improvements
ilya-lavrenov Sep 2, 2021
2c47275
Fixes for demo scripts
ilya-lavrenov Sep 2, 2021
18d30f5
Added path to TBB
ilya-lavrenov Sep 2, 2021
54fb0a1
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 3, 2021
dc70c56
Fix for MO unit-tests
ilya-lavrenov Sep 3, 2021
884eba2
Fixed tests on Windows
ilya-lavrenov Sep 3, 2021
d308eca
Reverted arch
ilya-lavrenov Sep 3, 2021
37926ee
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 3, 2021
82a0454
Removed arch
ilya-lavrenov Sep 3, 2021
35f42db
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 6, 2021
b489a18
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 6, 2021
7bedf53
Reverted arch back: second attemp
ilya-lavrenov Sep 6, 2021
f72f53f
System type
ilya-lavrenov Sep 6, 2021
ea8044b
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 7, 2021
455152e
Fix for Windows
ilya-lavrenov Sep 7, 2021
24855bc
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 7, 2021
0fe73a5
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 7, 2021
bc9db3f
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 7, 2021
362b6a5
Resolve merge conflicts
ilya-lavrenov Sep 7, 2021
ce78b3f
Fixed path
ilya-lavrenov Sep 7, 2021
d4d3790
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 7, 2021
54300d9
Path for Windows
ilya-lavrenov Sep 7, 2021
a628d24
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 8, 2021
7665bc8
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 9, 2021
75b297a
Added debug for Windows
ilya-lavrenov Sep 9, 2021
76cdd57
Added requirements_dev.txt to install
ilya-lavrenov Sep 9, 2021
1b83a69
Fixed wheel's setup.py
ilya-lavrenov Sep 9, 2021
cfca8d3
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 10, 2021
0e9d06c
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 10, 2021
7e251b7
Fixed lin build
ilya-lavrenov Sep 10, 2021
aca4e5e
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 10, 2021
8cee201
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 10, 2021
2092312
Fixes after merge
ilya-lavrenov Sep 10, 2021
2403085
Fix 2
ilya-lavrenov Sep 10, 2021
c2284d5
Fixes
ilya-lavrenov Sep 10, 2021
c1c2c7e
Frontends path
ilya-lavrenov Sep 10, 2021
ca9ac8d
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 10, 2021
454a0a8
Fixed deployment manager
ilya-lavrenov Sep 10, 2021
557fd8f
Fixed Windows
ilya-lavrenov Sep 11, 2021
6a7cc2e
Added cldnn unit tests installation
ilya-lavrenov Sep 11, 2021
9341cca
Install samples
ilya-lavrenov Sep 11, 2021
0de6c6d
Fix samples
ilya-lavrenov Sep 11, 2021
914fcb1
Fix path for samples
ilya-lavrenov Sep 11, 2021
ac89902
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 11, 2021
21ab8f1
Proper path
ilya-lavrenov Sep 11, 2021
d7cce14
Try to fix MO hardcodes
ilya-lavrenov Sep 11, 2021
30dd848
samples binary location
ilya-lavrenov Sep 12, 2021
6ec71b1
MO print
ilya-lavrenov Sep 12, 2021
955eb9c
Added install for libopencv_c_wrapper.so
ilya-lavrenov Sep 12, 2021
4bfc992
Added library destination
ilya-lavrenov Sep 12, 2021
36a5bb6
Fixed install rule for samples
ilya-lavrenov Sep 12, 2021
ad4be6b
Updated demo scripts readme.md
ilya-lavrenov Sep 12, 2021
cf4da90
Samples
ilya-lavrenov Sep 12, 2021
ef3f4e8
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 13, 2021
6ac3ba7
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 13, 2021
2f94b89
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 13, 2021
5f34bb7
Keep source permissions for Python samples
ilya-lavrenov Sep 13, 2021
c1e549c
Fixed python
ilya-lavrenov Sep 13, 2021
2f8890e
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 13, 2021
bafe8ce
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 13, 2021
54a912e
Updated path to fast run scripts
ilya-lavrenov Sep 13, 2021
40adf0c
Fixed C samples tests
ilya-lavrenov Sep 13, 2021
a92b315
Removed debug output
ilya-lavrenov Sep 13, 2021
46f4d8c
Small fixes
ilya-lavrenov Sep 14, 2021
2260c9f
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 14, 2021
5feff6a
Try to unify prefix
ilya-lavrenov Sep 14, 2021
f599b97
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 14, 2021
e37d603
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 14, 2021
c4e1c84
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 14, 2021
7e84e42
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 14, 2021
0df5ee3
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 15, 2021
06d1715
Merge remote-tracking branch 'upstream/master' into new-package-struc…
ilya-lavrenov Sep 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .ci/azure/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
INSTALL_DIR: $(WORK_DIR)/install_pkg
INSTALL_TEST_DIR: $(INSTALL_DIR)/tests
LAYER_TESTS_DIR: $(INSTALL_TEST_DIR)/layer_tests
SETUPVARS: $(INSTALL_DIR)/bin/setupvars.sh
SETUPVARS: $(INSTALL_DIR)/setupvars.sh

steps:
- script: |
Expand Down Expand Up @@ -171,11 +171,11 @@ jobs:
- script: ls -alR $(INSTALL_DIR)
displayName: 'List install files'

- script: $(INSTALL_DIR)/deployment_tools/inference_engine/samples/cpp/build_samples.sh
- script: $(INSTALL_DIR)/samples/cpp/build_samples.sh
workingDirectory: $(BUILD_SAMPLES_DIR)
displayName: 'Build cpp samples'

- script: $(INSTALL_DIR)/deployment_tools/inference_engine/samples/c/build_samples.sh
- script: $(INSTALL_DIR)/samples/c/build_samples.sh
workingDirectory: $(BUILD_SAMPLES_DIR)
displayName: 'Build c samples'

Expand All @@ -189,8 +189,8 @@ jobs:
continueOnError: false

- script: |
export MO_ROOT=$(INSTALL_DIR)/deployment_tools/model_optimizer
. $(SETUPVARS) -pyver 3.8 && python3 -m pytest -s $(INSTALL_DIR)/deployment_tools/model_optimizer/unit_tests --junitxml=TEST-ModelOptimizer.xml
export MO_ROOT=$(INSTALL_DIR)/tools/model_optimizer
. $(SETUPVARS) -pyver 3.8 && python3 -m pytest -s $(INSTALL_DIR)/tools/model_optimizer/unit_tests --junitxml=TEST-ModelOptimizer.xml
displayName: 'Model Optimizer UT'
continueOnError: false

Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
- script: |
. $(SETUPVARS)
python3 -m pip install -r requirements.txt
export MO_ROOT=$(INSTALL_DIR)/deployment_tools/model_optimizer
export MO_ROOT=$(INSTALL_DIR)/tools/model_optimizer
export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH
python3 -m pytest tensorflow_tests/test_tf_Roll.py --ir_version=10 --junitxml=TEST-tf_Roll.xmlTEST
workingDirectory: $(LAYER_TESTS_DIR)
Expand Down
2 changes: 1 addition & 1 deletion .ci/azure/linux_conditional_compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
WORK_DIR: $(Pipeline.Workspace)/_w
BUILD_DIR: $(WORK_DIR)/build
INSTALL_DIR: $(WORK_DIR)/install_pkg
SETUPVARS: $(INSTALL_DIR)/bin/setupvars.sh
SETUPVARS: $(INSTALL_DIR)/setupvars.sh

steps:
- script: |
Expand Down
14 changes: 7 additions & 7 deletions .ci/azure/linux_onnxruntime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,44 +110,44 @@ jobs:
displayName: 'Install'

- script: |
source $(INSTALL_DIR)/bin/setupvars.sh
source $(INSTALL_DIR)/setupvars.sh
CXXFLAGS="-Wno-error=deprecated-declarations" ./build.sh --config RelWithDebInfo --use_openvino CPU_FP32 --build_shared_lib --parallel --skip_tests --build_dir $(ONNXRUNTIME_BUILD_DIR)
workingDirectory: $(ONNXRUNTIME_REPO_DIR)
displayName: 'Build Lin ONNX Runtime'

- script: |
source $(INSTALL_DIR)/bin/setupvars.sh
source $(INSTALL_DIR)/setupvars.sh
skip_tests=`tr -s '\n ' ':' < $(ONNXRUNTIME_UTILS)/skip_tests`
./onnxruntime_test_all --gtest_filter=-$skip_tests
workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
displayName: 'Run onnxruntime_test_all'

- script: |
source $(INSTALL_DIR)/bin/setupvars.sh
source $(INSTALL_DIR)/setupvars.sh
./onnxruntime_shared_lib_test
workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
displayName: 'Run onnxruntime_shared_lib_test'

- script: |
source $(INSTALL_DIR)/bin/setupvars.sh
source $(INSTALL_DIR)/setupvars.sh
./onnxruntime_global_thread_pools_test
workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
displayName: 'Run onnxruntime_global_thread_pools_test'

- script: |
source $(INSTALL_DIR)/bin/setupvars.sh
source $(INSTALL_DIR)/setupvars.sh
./onnxruntime_api_tests_without_env
workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
displayName: 'Run onnxruntime_api_tests_without_env'

- script: |
source $(INSTALL_DIR)/bin/setupvars.sh
source $(INSTALL_DIR)/setupvars.sh
./onnx_test_runner "$(ONNXRUNTIME_REPO_DIR)/cmake/external/onnx/onnx/backend/test/data/pytorch-converted"
workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
displayName: 'Run pytorch-converted tests'

- script: |
source $(INSTALL_DIR)/bin/setupvars.sh
source $(INSTALL_DIR)/setupvars.sh
./onnx_test_runner "$(ONNXRUNTIME_REPO_DIR)/cmake/external/onnx/onnx/backend/test/data/pytorch-operator"
workingDirectory: $(ONNXRUNTIME_BUILD_DIR)/RelWithDebInfo
displayName: 'Run pytorch-operator tests'
2 changes: 1 addition & 1 deletion .ci/azure/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
BUILD_DIR: $(WORK_DIR)/build
INSTALL_DIR: $(WORK_DIR)/install_pkg
INSTALL_TEST_DIR: $(INSTALL_DIR)/tests
SETUPVARS: $(INSTALL_DIR)/bin/setupvars.sh
SETUPVARS: $(INSTALL_DIR)/setupvars.sh

steps:
- script: |
Expand Down
6 changes: 3 additions & 3 deletions .ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
MSVC_COMPILER_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx64\x64\cl.exe
INSTALL_DIR: $(WORK_DIR)\install_pkg
INSTALL_TEST_DIR: $(INSTALL_DIR)\tests
SETUPVARS: $(INSTALL_DIR)\bin\setupvars.bat
SETUPVARS: $(INSTALL_DIR)\setupvars.bat
IB_DIR: C:\Program Files (x86)\IncrediBuild
IB_TESTCONSOLE: $(IB_DIR)\IBTestConsole.exe

Expand Down Expand Up @@ -132,11 +132,11 @@ jobs:
- script: dir $(INSTALL_DIR) /s
displayName: 'List install files'

- script: $(INSTALL_DIR)\deployment_tools\inference_engine\samples\cpp\build_samples_msvc.bat
- script: $(INSTALL_DIR)\samples\cpp\build_samples_msvc.bat
workingDirectory: $(BUILD_SAMPLES_DIR)
displayName: 'Build cpp samples'

- script: $(INSTALL_DIR)\deployment_tools\inference_engine\samples\c\build_samples_msvc.bat
- script: $(INSTALL_DIR)\samples\c\build_samples_msvc.bat
workingDirectory: $(BUILD_SAMPLES_DIR)
displayName: 'Build c samples'

Expand Down
2 changes: 1 addition & 1 deletion .ci/azure/windows_conditional_compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
MSVS_VARS_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
MSVC_COMPILER_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.24.28314\bin\Hostx64\x64\cl.exe
INSTALL_DIR: $(WORK_DIR)\install_pkg
SETUPVARS: $(INSTALL_DIR)\bin\setupvars.bat
SETUPVARS: $(INSTALL_DIR)\setupvars.bat

steps:
- script: |
Expand Down
4 changes: 2 additions & 2 deletions .ci/openvino-onnx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ RUN make -j $(nproc) install

# Run tests via tox
WORKDIR /openvino/runtime/bindings/python
ENV OpenVINO_DIR=/openvino/dist/deployment_tools/inference_engine/share
ENV LD_LIBRARY_PATH=/openvino/dist/deployment_tools/ngraph/lib
ENV OpenVINO_DIR=/openvino/dist/runtime/cmake
ENV LD_LIBRARY_PATH=/openvino/dist/runtime/lib:/openvino/dist/runtime/3rdparty/tbb/lib
ENV PYTHONPATH=/openvino/bin/intel64/${BUILD_TYPE}/lib/python_api/python3.8:${PYTHONPATH}
CMD tox
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ include(cmake/test_model_zoo.cmake)
add_subdirectory(thirdparty)
add_subdirectory(openvino)
add_subdirectory(ngraph)

add_subdirectory(runtime)
add_subdirectory(inference-engine)

Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ if(THREADING STREQUAL "OMP")
ie_cpack_add_component(omp REQUIRED)
file(GLOB_RECURSE source_list "${OMP}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
install(FILES ${source_list}
DESTINATION "deployment_tools/inference_engine/external/omp/lib"
DESTINATION "runtime/3rdparty/omp/lib"
COMPONENT omp)
endif()

Expand Down
13 changes: 6 additions & 7 deletions cmake/developer_package/packaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@ include(CPackComponent)
#
# Set library directory for cpack
#
set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
function(ie_cpack_set_library_dir)
if(WIN32)
set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
set(IE_CPACK_RUNTIME_PATH runtime/bin/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
else()
set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE)
endif()
endfunction()

Expand Down
2 changes: 1 addition & 1 deletion docs/HOWTO/Custom_Layers_Guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ operation for the CPU plugin. The code of the library is described in the [Exte
To build the extension, run the following:<br>
```bash
mkdir build && cd build
source /opt/intel/openvino_2021/bin/setupvars.sh
source /opt/intel/openvino_2022/setupvars.sh
cmake .. -DCMAKE_BUILD_TYPE=Release
make --jobs=$(nproc)
```
Expand Down
4 changes: 2 additions & 2 deletions docs/IE_DG/Cross_Check_Tool.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ The Cross Check Tool can compare metrics per layer or all over the model.

On Linux* OS, before running the Cross Check Tool binary, make sure your application can find the
Deep Learning Inference Engine libraries.
Navigate to the `<INSTALL_DIR>/deployment_tools/inference_engine/bin` folder and run the `setvars.sh` script to
Navigate to the `<INSTALL_DIR>` folder and run the `setupvars.sh` script to
set all necessary environment variables:

```sh
source setvars.sh
source setupvars.sh
```

## Running the Cross Check Tool
Expand Down
4 changes: 2 additions & 2 deletions docs/IE_DG/Deep_Learning_Inference_Engine_DevGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ Make sure those libraries are in your computer's path or in the place you pointe
* Windows: `PATH`
* macOS: `DYLD_LIBRARY_PATH`

On Linux and macOS, use the script `bin/setupvars.sh` to set the environment variables.
On Linux and macOS, use the script `setupvars.sh` to set the environment variables.

On Windows, run the `bin\setupvars.bat` batch file to set the environment variables.
On Windows, run the `setupvars.bat` batch file to set the environment variables.

To learn more about supported devices and corresponding plugins, see the [Supported Devices](supported_plugins/Supported_Devices.md) chapter.

Expand Down
2 changes: 1 addition & 1 deletion docs/IE_DG/Extensibility_DG/GPU_Kernel.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The GPU codepath abstracts many details about OpenCL\*. You need to provide the

There are two options of using the custom operation configuration file:

* Include a section with your kernels into the global automatically-loaded `cldnn_global_custom_kernels/cldnn_global_custom_kernels.xml` file, which is hosted in the `<INSTALL_DIR>/deployment_tools/inference_engine/bin/intel64/{Debug/Release}` folder
* Include a section with your kernels into the global automatically-loaded `cldnn_global_custom_kernels/cldnn_global_custom_kernels.xml` file, which is hosted in the `<INSTALL_DIR>/runtime/bin` folder
* Call the `InferenceEngine::Core::SetConfig()` method from your application with the `InferenceEngine::PluginConfigParams::KEY_CONFIG_FILE` key and the configuration file name as a value before loading the network that uses custom operations to the plugin:

@snippet snippets/GPU_Kernel.cpp part0
Expand Down
12 changes: 6 additions & 6 deletions docs/IE_DG/Extensibility_DG/VPU_Kernel.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ To customize your topology with an OpenCL layer, follow the steps below:
> **NOTE:** OpenCL compiler, targeting Intel® Neural Compute Stick 2 for the SHAVE* processor only, is redistributed with OpenVINO.
OpenCL support is provided by ComputeAorta*, and is distributed under a license agreement between Intel® and Codeplay* Software Ltd.

The OpenCL toolchain for the Intel® Neural Compute Stick 2 supports offline compilation only, so first compile OpenCL C code using the standalone `clc` compiler. You can find the compiler binary at `<INSTALL_DIR>/deployment_tools/tools/cl_compiler`.
The OpenCL toolchain for the Intel® Neural Compute Stick 2 supports offline compilation only, so first compile OpenCL C code using the standalone `clc` compiler. You can find the compiler binary at `<INSTALL_DIR>/tools/cl_compiler`.

> **NOTE:** By design, custom OpenCL layers support any OpenCL kernels written with 1.2 version assumed. It also supports half float extension and is optimized for this type, because it is a native type for Intel® Movidius™ VPUs.

1. Prior to running a compilation, make sure that the following variables are set:
* `SHAVE_MA2X8XLIBS_DIR=<INSTALL_DIR>/deployment_tools/tools/cl_compiler/lib/`
* `SHAVE_LDSCRIPT_DIR=<INSTALL_DIR>/deployment_tools/tools/cl_compiler/ldscripts/`
* `SHAVE_MYRIAD_LD_DIR=<INSTALL_DIR>/deployment_tools/tools/cl_compiler/bin/`
* `SHAVE_MOVIASM_DIR=<INSTALL_DIR>/deployment_tools/tools/cl_compiler/bin/`
* `SHAVE_MA2X8XLIBS_DIR=<INSTALL_DIR>/tools/cl_compiler/lib/`
* `SHAVE_LDSCRIPT_DIR=<INSTALL_DIR>/tools/cl_compiler/ldscripts/`
* `SHAVE_MYRIAD_LD_DIR=<INSTALL_DIR>/tools/cl_compiler/bin/`
* `SHAVE_MOVIASM_DIR=<INSTALL_DIR>/tools/cl_compiler/bin/`
2. Run the compilation with the command below. You should use `--strip-binary-header` to make an OpenCL runtime-agnostic binary runnable with the Inference Engine.
```bash
cd <INSTALL_DIR>/deployment_tools/tools/cl_compiler/bin
cd <INSTALL_DIR>/tools/cl_compiler/bin
./clc --strip-binary-header custom_layer.cl -o custom_layer.bin
```

Expand Down
4 changes: 2 additions & 2 deletions docs/IE_DG/Integrate_with_customer_application_new_API.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ Note that casting `Blob` to `TBlob` via `std::dynamic_pointer_cast` is not the r
## Build Your Application

For details about building your application, refer to the CMake files for the sample applications.
All samples source code is located in the `<INSTALL_DIR>/openvino/inference_engine/samples` directory, where `INSTALL_DIR` is the OpenVINO™ installation directory.
All samples source code is located in the `<INSTALL_DIR>/samples` directory, where `INSTALL_DIR` is the OpenVINO™ installation directory.

### CMake project creation

Expand All @@ -199,7 +199,7 @@ add_executable(${PROJECT_NAME} src/main.cpp)
target_link_libraries(${PROJECT_NAME} PRIVATE openvino::runtime ${OpenCV_LIBS})
```
3. **To build your project** using CMake with the default build tools currently available on your machine, execute the following commands:
> **NOTE**: Make sure you set environment variables first by running `<INSTALL_DIR>/bin/setupvars.sh` (or setupvars.bat for Windows)`. Otherwise the `InferenceEngine_DIR` and `OpenCV_DIR` variables won't be configured properly to pass `find_package` calls.
> **NOTE**: Make sure you set environment variables first by running `<INSTALL_DIR>/setupvars.sh` (or setupvars.bat for Windows)`. Otherwise the `InferenceEngine_DIR` and `OpenCV_DIR` variables won't be configured properly to pass `find_package` calls.
```sh
cd build/
cmake ../project
Expand Down
30 changes: 15 additions & 15 deletions docs/IE_DG/Samples_Overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
The Inference Engine sample applications are simple console applications that show how to utilize specific Inference Engine capabilities within an application, assist developers in executing specific tasks such as loading a model, running inference, querying specific device capabilities and etc.

After installation of Intel® Distribution of OpenVINO™ toolkit, С, C++ and Python* sample applications are available in the following directories, respectively:
* `<INSTALL_DIR>/inference_engine/samples/c`
* `<INSTALL_DIR>/inference_engine/samples/cpp`
* `<INSTALL_DIR>/inference_engine/samples/python`
* `<INSTALL_DIR>/samples/c`
* `<INSTALL_DIR>/samples/cpp`
* `<INSTALL_DIR>/samples/python`

Inference Engine sample applications include the following:

Expand Down Expand Up @@ -64,7 +64,7 @@ The officially supported Linux* build environment is the following:

> **NOTE**: For building samples from the open-source version of OpenVINO™ toolkit, see the [build instructions on GitHub](https://github.com/openvinotoolkit/openvino/wiki/BuildingCode).

To build the C or C++ sample applications for Linux, go to the `<INSTALL_DIR>/inference_engine/samples/c` or `<INSTALL_DIR>/inference_engine/samples/cpp` directory, respectively, and run the `build_samples.sh` script:
To build the C or C++ sample applications for Linux, go to the `<INSTALL_DIR>/samples/c` or `<INSTALL_DIR>/samples/cpp` directory, respectively, and run the `build_samples.sh` script:
```sh
build_samples.sh
```
Expand All @@ -91,11 +91,11 @@ cd build
3. Run CMake to generate the Make files for release or debug configuration. For example, for C++ samples:
- For release configuration:
```sh
cmake -DCMAKE_BUILD_TYPE=Release <INSTALL_DIR>/inference_engine/samples/cpp
cmake -DCMAKE_BUILD_TYPE=Release <INSTALL_DIR>/samples/cpp
```
- For debug configuration:
```sh
cmake -DCMAKE_BUILD_TYPE=Debug <INSTALL_DIR>/inference_engine/samples/cpp
cmake -DCMAKE_BUILD_TYPE=Debug <INSTALL_DIR>/samples/cpp
```
4. Run `make` to build the samples:
```sh
Expand All @@ -114,7 +114,7 @@ The recommended Windows* build environment is the following:

> **NOTE**: If you want to use Microsoft Visual Studio 2019, you are required to install CMake 3.14.

To build the C or C++ sample applications on Windows, go to the `<INSTALL_DIR>\inference_engine\samples\c` or `<INSTALL_DIR>\inference_engine\samples\cpp` directory, respectively, and run the `build_samples_msvc.bat` batch file:
To build the C or C++ sample applications on Windows, go to the `<INSTALL_DIR>\samples\c` or `<INSTALL_DIR>\samples\cpp` directory, respectively, and run the `build_samples_msvc.bat` batch file:
```sh
build_samples_msvc.bat
```
Expand All @@ -123,7 +123,7 @@ By default, the script automatically detects the highest Microsoft Visual Studio
a solution for a sample code. Optionally, you can also specify the preferred Microsoft Visual Studio version to be used by the script. Supported
versions are `VS2017` and `VS2019`. For example, to build the C++ samples using the Microsoft Visual Studio 2017, use the following command:
```sh
<INSTALL_DIR>\inference_engine\samples\cpp\build_samples_msvc.bat VS2017
<INSTALL_DIR>\samples\cpp\build_samples_msvc.bat VS2017
```

Once the build is completed, you can find sample binaries in the following folders:
Expand All @@ -144,7 +144,7 @@ The officially supported macOS* build environment is the following:

> **NOTE**: For building samples from the open-source version of OpenVINO™ toolkit, see the [build instructions on GitHub](https://github.com/openvinotoolkit/openvino/wiki/BuildingCode).

To build the C or C++ sample applications for macOS, go to the `<INSTALL_DIR>/inference_engine/samples/c` or `<INSTALL_DIR>/inference_engine/samples/cpp` directory, respectively, and run the `build_samples.sh` script:
To build the C or C++ sample applications for macOS, go to the `<INSTALL_DIR>/samples/c` or `<INSTALL_DIR>/samples/cpp` directory, respectively, and run the `build_samples.sh` script:
```sh
build_samples.sh
```
Expand Down Expand Up @@ -177,11 +177,11 @@ cd build
3. Run CMake to generate the Make files for release or debug configuration. For example, for C++ samples:
- For release configuration:
```sh
cmake -DCMAKE_BUILD_TYPE=Release <INSTALL_DIR>/inference_engine/samples/cpp
cmake -DCMAKE_BUILD_TYPE=Release <INSTALL_DIR>/samples/cpp
```
- For debug configuration:
```sh
cmake -DCMAKE_BUILD_TYPE=Debug <INSTALL_DIR>/inference_engine/samples/cpp
cmake -DCMAKE_BUILD_TYPE=Debug <INSTALL_DIR>/samples/cpp
```
4. Run `make` to build the samples:
```sh
Expand All @@ -199,7 +199,7 @@ Before running compiled binary files, make sure your application can find the
Inference Engine and OpenCV libraries.
Run the `setupvars` script to set all necessary environment variables:
```sh
source <INSTALL_DIR>/bin/setupvars.sh
source <INSTALL_DIR>/setupvars.sh
```

**(Optional)**: The OpenVINO environment variables are removed when you close the
Expand All @@ -212,7 +212,7 @@ vi <user_home_directory>/.bashrc

2. Add this line to the end of the file:
```sh
source /opt/intel/openvino_2021/bin/setupvars.sh
source /opt/intel/openvino_2022/setupvars.sh
```

3. Save and close the file: press the **Esc** key, type `:wq` and press the **Enter** key.
Expand All @@ -228,7 +228,7 @@ Before running compiled binary files, make sure your application can find the
Inference Engine and OpenCV libraries.
Use the `setupvars` script, which sets all necessary environment variables:
```sh
<INSTALL_DIR>\bin\setupvars.bat
<INSTALL_DIR>\setupvars.bat
```

To debug or run the samples on Windows in Microsoft Visual Studio, make sure you
Expand All @@ -240,7 +240,7 @@ For example, for the **Debug** configuration, go to the project's
variable in the **Environment** field to the following:

```sh
PATH=<INSTALL_DIR>\deployment_tools\inference_engine\bin\intel64\Debug;<INSTALL_DIR>\opencv\bin;%PATH%
PATH=<INSTALL_DIR>\runtime\bin;<INSTALL_DIR>\opencv\bin;%PATH%
```
where `<INSTALL_DIR>` is the directory in which the OpenVINO toolkit is installed.

Expand Down
Loading