Merge branch 'master' into demos/multi_channel-move-to-ov-2.0

Author: Wovchena

ci/dependencies.yml

@@ -1,6 +1,6 @@
-opencv_linux: '20220126_0626-4.5.5_023'
-opencv_windows: '20220126_0626-4.5.5_023'
-openvino_linux: '2022.1.0.553'
-openvino_windows: '2022.1.0.553'
-wheel_linux: '2022.1.0.dev20220126-6311'
-wheel_windows: '2022.1.0.dev20220126-6311'
+opencv_linux: '2022.1.0.dev20220131'
+opencv_windows: '2022.1.0.dev20220131'
+openvino_linux: '2022.1.0.dev20220131'
+openvino_windows: '2022.1.0.dev20220131'
+wheel_linux: '2022.1.0.dev20220131-6386'
+wheel_windows: '2022.1.0.dev20220131-6386'

ci/requirements-demos.txt

@@ -154,6 +154,7 @@ xmltodict==0.12.0
     # via motmetrics
 zipp==3.5.0
     # via importlib-metadata
+inflect==5.3.0
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

data/dataset_definitions.yml

@@ -12,11 +12,11 @@ datasets:
   - name: ms_coco_mask_rcnn_short_80_classes
     annotation_conversion:
       converter: mscoco_mask_rcnn
-      annotation_file: annotations/instances_val2017_short.json
+      annotation_file: annotations/instances_val2017.json
       has_background: True
       sort_annotations: True
-    annotation: mscoco_mask_rcnn_short_80.pickle
-    dataset_meta: mscoco_mask_rcnn_short_80.json
+    annotation: mscoco_mask_rcnn_80.pickle
+    dataset_meta: mscoco_mask_rcnn_80.json
     data_source: val2017
 
   - name: ms_coco_mask_rcnn_short_80_classes_without_background
@@ -25,19 +25,19 @@ datasets:
       annotation_file: annotations/instances_val2017.json
       has_background: False
       sort_annotations: True
-    annotation: mscoco_mask_rcnn_short_80_without_bkgr.pickle
-    dataset_meta: mscoco_mask_rcnn_short_80_without_bkgr.json
+    annotation: mscoco_mask_rcnn_80_without_bkgr.pickle
+    dataset_meta: mscoco_mask_rcnn_80_without_bkgr.json
     data_source: val2017
 
   - name: ms_coco_mask_rcnn_short_91_classes
     annotation_conversion:
       converter: mscoco_mask_rcnn
-      annotation_file: annotations/instances_val2017_short.json
+      annotation_file: annotations/instances_val2017.json
       has_background: True
       sort_annotations: True
       use_full_label_map: True
-    annotation: mscoco_mask_rcnn_short_91.pickle
-    dataset_meta: mscoco_mask_rcnn_short_91.json
+    annotation: mscoco_mask_rcnn_91.pickle
+    dataset_meta: mscoco_mask_rcnn_91.json
     data_source: val2017
     preprocessing:
       - type: resize

demos/3d_segmentation_demo/python/requirements.txt

@@ -48,6 +48,10 @@ An example of using the Model Converter:
 omz_converter --list models.lst
 ```
 
+### Supported Models
+
+* instance-segmentation-person-????
+
 > **NOTE**: Refer to the tables [Intel's Pre-Trained Models Device Support](../../../models/intel/device_support.md) and [Public Pre-Trained Models Device Support](../../../models/public/device_support.md) for the details on models inference support at different devices.
 
 ## Running

demos/background_subtraction_demo/cpp_gapi/README.md

@@ -1,3 +1,3 @@
 # This file can be used with the --list option of the model downloader.
-# TODO: instance-segmentation-person-????
+instance-segmentation-person-????
 instance-segmentation-security-????

demos/background_subtraction_demo/cpp_gapi/models.lst

@@ -58,7 +58,7 @@ omz_converter --list models.lst
 
 ### Supported Models
 
-* instance-segmentation-person-0007
+* instance-segmentation-person-????
 * yolact-resnet50-fpn-pytorch
 
 > **NOTE**: Refer to the tables [Intel's Pre-Trained Models Device Support](../../../models/intel/device_support.md) and [Public Pre-Trained Models Device Support](../../../models/public/device_support.md) for the details on models inference support at different devices.

demos/background_subtraction_demo/python/README.md

@@ -1,3 +1,3 @@
 # This file can be used with the --list option of the model downloader.
-# TODO: instance-segmentation-person-????
+instance-segmentation-person-????
 yolact-resnet50-fpn-pytorch

demos/background_subtraction_demo/python/models.lst

@@ -113,7 +113,7 @@ Options:
 
 ```sh
     python3 bert_question_answering_demo.py
-            --vocab=<omz_dir>/models/intel/bert-small-uncased-whole-word-masking-squad-0001/vocab.txt
+            --vocab=<models_dir>/models/intel/bert-small-uncased-whole-word-masking-squad-0001/vocab.txt
             --model=<path_to_model>/bert-small-uncased-whole-word-masking-squad-0001.xml
             --input_names="input_ids,attention_mask,token_type_ids"
             --output_names="output_s,output_e"
@@ -131,7 +131,7 @@ Exemplary command:
 
 ```sh
     python3 bert_question_answering_demo.py
-            --vocab=<omz_dir>/models/intel/bert-small-uncased-whole-word-masking-squad-0001/vocab.txt
+            --vocab=<models_dir>/models/intel/bert-small-uncased-whole-word-masking-squad-0001/vocab.txt
             --model=localhost:9000/models/bert
             --input_names="input_ids,attention_mask,token_type_ids"
             --output_names="output_s,output_e"