Skip to content

Commit 8599215

Browse files
fix deployment_tools in docs (#3364) (#3370)
* remove old and deprecated deployment_tools path * Apply suggestions from code review Co-authored-by: Ekaterina Aidova <[email protected]> * restore auto-generated files * rm VS2017 * restore DAV file Co-authored-by: Ekaterina Aidova <[email protected]> Co-authored-by: Ekaterina Aidova <[email protected]>
1 parent cf9003a commit 8599215

File tree

8 files changed

+22
-17
lines changed

8 files changed

+22
-17
lines changed

demos/README.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ You can download the [Intel pre-trained models](../models/intel/index.md) or [pu
167167
## Build the Demo Applications
168168

169169
To build the demos, you need to source OpenVINO™ and OpenCV environment. You can install the OpenVINO™ toolkit using the installation package for [Intel® Distribution of OpenVINO™ toolkit](https://www.intel.com/content/www/us/en/developer/tools/openvino-toolkit-download.html) or build the open-source version available in the [OpenVINO GitHub repository](https://github.com/openvinotoolkit/openvino) using the [build instructions](https://github.com/openvinotoolkit/openvino/wiki/BuildingCode).
170-
For the Intel® Distribution of OpenVINO™ toolkit installed to the `<INSTALL_DIR>` directory on your machine, run the following commands to download OpenCV and set environment variables before building the demos:
170+
For the Intel® Distribution of OpenVINO™ toolkit installed to the `<INSTALL_DIR>` directory on your machine, run the following commands to download prebuilt OpenCV and set environment variables before building the demos:
171171

172172
```sh
173173
<INSTALL_DIR>/extras/scripts/download_opencv.sh
@@ -236,10 +236,8 @@ for the debug configuration — in `<path_to_build_directory>/intel64/Debug/`.
236236
The recommended Windows* build environment is the following:
237237
238238
- Microsoft Windows* 10
239-
- Microsoft Visual Studio* 2017, or 2019
240-
- CMake* version 3.10 or higher
241-
242-
> **NOTE**: If you want to use Microsoft Visual Studio 2019, you are required to install CMake 3.14.
239+
- Microsoft Visual Studio* 2019
240+
- CMake* version 3.14 or higher
243241
244242
To build the demo applications for Windows, go to the directory with the `build_demos_msvc.bat`
245243
batch file and run it:
@@ -250,13 +248,19 @@ build_demos_msvc.bat
250248
251249
By default, the script automatically detects the highest Microsoft Visual Studio version installed on the machine and uses it to create and build
252250
a solution for a demo code. Optionally, you can also specify the preferred Microsoft Visual Studio version to be used by the script. Supported
253-
versions are: `VS2017`, `VS2019`. For example, to build the demos using the Microsoft Visual Studio 2017, use the following command:
251+
version is: `VS2019`. For example, to build the demos using the Microsoft Visual Studio 2019, use the following command:
252+
253+
```bat
254+
build_demos_msvc.bat VS2019
255+
```
256+
257+
By default, the demo applications binaries are build into the `C:\Users\<username>\Documents\Intel\OpenVINO\omz_demos_build\intel64\Release` directory.
258+
The default build folder can be changed with `-b` option. For example, following command will buid Open Model Zoo demos into `c:\temp\omz-demos-build` folder:
254259
255260
```bat
256-
build_demos_msvc.bat VS2017
261+
build_demos_msvc.bat -b c:\temp\omz-demos-build
257262
```
258263
259-
The demo applications binaries are in the `C:\Users\<username>\Documents\Intel\OpenVINO\omz_demos_build\intel64\Release` directory.
260264
261265
You can also build a generated solution by yourself, for example, if you want to
262266
build binaries in Debug configuration. Run the appropriate version of the
@@ -415,7 +419,7 @@ For example, for the **Debug** configuration, go to the project's
415419
variable in the **Environment** field to the following:
416420
417421
```
418-
PATH=<INSTALL_DIR>\deployment_tools\inference_engine\bin\intel64\Debug;<INSTALL_DIR>\opencv\bin;%PATH%
422+
PATH=<INSTALL_DIR>\runtime\bin\intel64\Debug;<INSTALL_DIR>\extras\opencv\bin;%PATH%
419423
```
420424
421425
where `<INSTALL_DIR>` is the directory in which the OpenVINO toolkit is installed.

demos/security_barrier_camera_demo/cpp/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ For example, to run the sample on one Intel® Vision Accelerator Design with Int
125125
./security_barrier_camera_demo -i <path_to_video>/inputVideo.mp4 -m <path_to_model>/vehicle-license-plate-detection-barrier-0106.xml -m_va <path_to_model>/vehicle-attributes-recognition-barrier-0039.xml -m_lpr <path_to_model>/license-plate-recognition-barrier-0001.xml -d HDDL -d_va HDDL -d_lpr HDDL -n_iqs 10 -n_wt 4 -nireq 10
126126
```
127127

128-
> **NOTE**: For the `-tag` option (HDDL plugin only), you must specify the number of VPUs for each network in the `hddl_service.config` file located in the `<INSTALL_DIR>/deployment_tools/inference_engine/external/hddl/config/` directory using the following tags:
128+
> **NOTE**: For the `-tag` option (HDDL plugin only), you must specify the number of VPUs for each network in the `hddl_service.config` file located in the `<INSTALL_DIR>/runtime/3rdparty/hddl/config/` directory using the following tags:
129129
> * `tagDetect` for the Vehicle and License Plate Detection network
130130
> * `tagAttr` for the Vehicle Attributes Recognition network
131131
> * `tagLPR` for the License Plate Recognition network

demos/social_distance_demo/cpp/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ For example, to run the sample on one Intel® Vision Accelerator Design with Int
118118
./social_distance_demo -i <path_to_video>/inputVideo.mp4 -m_det <path_to_model>/person-detection-retail-0013.xml -m_reid <path_to_model>/person-reidentification-retail-0277.xml -d_det HDDL -d_reid HDDL -n_iqs 10 -n_wt 4 -nireq 10
119119
```
120120

121-
> **NOTE**: For the `-tag` option (HDDL plugin only), you must specify the number of VPUs for each network in the `hddl_service.config` file located in the `<INSTALL_DIR>/deployment_tools/inference_engine/external/hddl/config/` directory using the following tags:
121+
> **NOTE**: For the `-tag` option (HDDL plugin only), you must specify the number of VPUs for each network in the `hddl_service.config` file located in the `<INSTALL_DIR>/runtime/3rdparty/hddl/config/` directory using the following tags:
122122
> * `tagDetect` for the Person Detection network
123123
> * `tagReId` for the Person Re-Identification network
124124
>

demos/speech_recognition_deepspeech_demo/python/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ To run in *simulated real-time mode* add command-line option `--realtime`.
127127

128128
> **NOTE**: Only 16-bit, 16 kHz, mono-channel WAVE audio files are supported.
129129
130-
Optional (but highly recommended) language model files, `deepspeech-0.8.2-models.kenlm` or `lm.binary` are part of corresponding model downloaded content and will be located in the Model Downloader output folder after model downloading and conversion. An example audio file can be taken from `<openvino_dir>/deployment_tools/demo/how_are_you_doing.wav`.
130+
Optional (but highly recommended) language model files, `deepspeech-0.8.2-models.kenlm` or `lm.binary` are part of corresponding model downloaded content and will be located in the Model Downloader output folder after model downloading and conversion.
131+
An example audio file can be taken from OpenVINO [test data](https://storage.openvinotoolkit.org/data/test_data/) folder.
131132

132133
## Demo Output
133134

demos/speech_recognition_quartznet_demo/python/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ python3 speech_recognition_quartznet_demo.py -m quartznet-15x5-en.xml -i audio.w
5757

5858
> **NOTE**: Only 16-bit, 16 kHz, mono-channel WAVE audio files are supported.
5959
60-
An example audio file can be taken from `<openvino_dir>/deployment_tools/demo/how_are_you_doing.wav`.
60+
An example audio file can be taken from OpenVINO [test data](https://storage.openvinotoolkit.org/data/test_data/) folder.
6161

6262
## Demo Output
6363

demos/speech_recognition_wav2vec_demo/python/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ python3 speech_recognition_wav2vec_demo.py -m wav2vec2-base.xml -i audio.wav
5858

5959
> **NOTE**: Only 16-bit, 16 kHz, mono-channel WAVE audio files are supported.
6060
61-
An example audio file can be taken from `<openvino_dir>/deployment_tools/demo/how_are_you_doing.wav`.
61+
An example audio file can be taken from OpenVINO [test data](https://storage.openvinotoolkit.org/data/test_data/) folder.
6262

6363
## Demo Output
6464

demos/tests/run_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* a "Image_Retrieval" subdirectory with image retrieval dataset (images, videos) (see https://github.com/19900531/test)
2525
and list of images (see https://github.com/openvinotoolkit/training_extensions/blob/089de2f/misc/tensorflow_toolkit/image_retrieval/data/gallery/gallery.txt)
2626
* a "msasl" subdirectory with the MS-ASL dataset (https://www.microsoft.com/en-us/research/project/ms-asl/)
27-
* a file how_are_you_doing.wav from <openvino_dir>/deployment_tools/demo/how_are_you_doing.wav
27+
* a file how_are_you_doing.wav from (https://storage.openvinotoolkit.org/data/test_data/)
2828
* a file stream_8_high.mp4 from https://storage.openvinotoolkit.org/data/test_data/videos/smartlab/stream_8_high.mp4
2929
* a file stream_8_top.mp4 from https://storage.openvinotoolkit.org/data/test_data/videos/smartlab/stream_8_top.mp4
3030
"""

tools/accuracy_checker/configs/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ See how to evaluate model with using predefined configuration file for [densenet
7878
```sh
7979
OMZ_ROOT/tools/model_tools/downloader.py --name densenet-121-tf --output_dir MODEL_DIR
8080
```
81-
3. Convert model in the Inference Engine IR format using Model Optimizer via [Model Converter](../../../tools/model_tools/README.md)
81+
3. Convert model in the OpenVINO IR format using Model Optimizer via [Model Converter](../../../tools/model_tools/README.md)
8282
```sh
83-
OMZ_ROOT/tools/model_tools/converter.py --name densenet-121-tf --download_dir MODEL_DIR --mo OPENVINO_DIR/deployment_tools/model_optimizer/mo.py
83+
omz_converter --name densenet-121-tf --download_dir MODEL_DIR
8484
```
8585
4. Run evaluation for model in FP32 precision using [Accuracy Checker](../README.md)
8686
```sh

0 commit comments

Comments
 (0)