Merge branch 'master' into ak/yolo_models_github

Author: akorobeinikov

CONTRIBUTING.md

@@ -1,5 +1,7 @@
 # How to Contribute Models to Open Model Zoo
 
+> Open Model Zoo is deprecated as a source of public models. Consider adding new models to https://github.com/openvinotoolkit/openvino_notebooks
+
 We appreciate your intention to contribute model to the OpenVINO™ Open Model Zoo (OMZ). OMZ is licensed under the Apache\* License, Version 2.0. By contributing to the project, you agree to the license and copyright terms therein and release your contribution under these terms. Note that we accept models under permissive licenses, such as **MIT**, **Apache 2.0**, and **BSD-3-Clause**. Otherwise, it might take longer time to get your model approved.
 
 Frameworks supported by the Open Model Zoo:

data/dataset_definitions.yml

@@ -1462,6 +1462,17 @@ datasets:
       input_suffix: in
       reference_suffix: out
 
+  -   name: online_mstcn_plus_encoder_dataset
+      data_source: annotation
+      reader: numpy_reader
+      annotation_conversion:
+          converter: feature_regression
+          reference_dir: image
+          input_dir: image
+          input_suffix: in
+          reference_suffix: out
+          use_bin_data: True
+
   - name: smartlab_detection_10cl_top
     data_source: object_detection/streams_1/top/images
     annotation_conversion:

demos/README.md

@@ -295,7 +295,7 @@ python -mpip install --user -r <omz_dir>/demos/requirements.txt
 
 ### <a name="python_model_api"></a>Python\* model API package
 
-To run Python demo applications, you need to install the Python* Model API package. Refer to the [Python Model API documentation](https://github.com/openvinotoolkit/open_model_zoo/blob/master/demos/common/python/openvino/model_zoo/model_api/README.md#installing-python-model-api-package)) to learn about its installation.
+Python* ModelAPI is factored out as a sepparate package. Refer to the [Python Model API documentation](https://github.com/openvinotoolkit/open_model_zoo/blob/master/demos/common/python/openvino/model_zoo/model_api/README.md#installing-python-model-api-package)) to learn about its installation. At the same time demos can find this package on their own. It's not required to install ModelAPI for demos.
 
 ### <a name="build_python_extensions"></a>Build the Native Python\* Extension Modules
 

demos/background_subtraction_demo/python/background_subtraction_demo.py

@@ -25,15 +25,16 @@
 import numpy as np
 
 sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python'))
+sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python/openvino/model_zoo'))
 
-from openvino.model_zoo.model_api.models import (
+from model_api.models import (
     MaskRCNNModel, OutputTransform, RESIZE_TYPES, YolactModel,
     ImageMattingWithBackground, VideoBackgroundMatting, PortraitBackgroundMatting
 )
-from openvino.model_zoo.model_api.models.utils import load_labels
-from openvino.model_zoo.model_api.performance_metrics import PerformanceMetrics
-from openvino.model_zoo.model_api.pipelines import get_user_config, AsyncPipeline
-from openvino.model_zoo.model_api.adapters import create_core, OpenvinoAdapter, OVMSAdapter
+from model_api.models.utils import load_labels
+from model_api.performance_metrics import PerformanceMetrics
+from model_api.pipelines import get_user_config, AsyncPipeline
+from model_api.adapters import create_core, OpenvinoAdapter, OVMSAdapter
 
 import monitors
 from images_capture import open_images_capture

demos/bert_named_entity_recognition_demo/python/bert_named_entity_recognition_demo.py

@@ -24,13 +24,14 @@
 from time import perf_counter
 
 sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python'))
+sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python/openvino/model_zoo'))
 
 from html_reader import get_paragraphs
 
-from openvino.model_zoo.model_api.models import BertNamedEntityRecognition
-from openvino.model_zoo.model_api.models.tokens_bert import text_to_tokens, load_vocab_file
-from openvino.model_zoo.model_api.pipelines import get_user_config, AsyncPipeline
-from openvino.model_zoo.model_api.adapters import create_core, OpenvinoAdapter, OVMSAdapter
+from model_api.models import BertNamedEntityRecognition
+from model_api.models.tokens_bert import text_to_tokens, load_vocab_file
+from model_api.pipelines import get_user_config, AsyncPipeline
+from model_api.adapters import create_core, OpenvinoAdapter, OVMSAdapter
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)
 

demos/bert_question_answering_demo/python/bert_question_answering_demo.py

@@ -25,13 +25,14 @@
 import numpy as np
 
 sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python'))
+sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python/openvino/model_zoo'))
 
 from html_reader import get_paragraphs
 
-from openvino.model_zoo.model_api.models import BertQuestionAnswering
-from openvino.model_zoo.model_api.models.tokens_bert import text_to_tokens, load_vocab_file, ContextWindow
-from openvino.model_zoo.model_api.pipelines import get_user_config, AsyncPipeline
-from openvino.model_zoo.model_api.adapters import create_core, OpenvinoAdapter, OVMSAdapter
+from model_api.models import BertQuestionAnswering
+from model_api.models.tokens_bert import text_to_tokens, load_vocab_file, ContextWindow
+from model_api.pipelines import get_user_config, AsyncPipeline
+from model_api.adapters import create_core, OpenvinoAdapter, OVMSAdapter
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)
 

demos/bert_question_answering_embedding_demo/python/bert_question_answering_embedding_demo.py

@@ -25,13 +25,14 @@
 import numpy as np
 
 sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python'))
+sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python/openvino/model_zoo'))
 
 from html_reader import get_paragraphs
 
-from openvino.model_zoo.model_api.models import BertEmbedding, BertQuestionAnswering
-from openvino.model_zoo.model_api.models.tokens_bert import text_to_tokens, load_vocab_file, ContextWindow
-from openvino.model_zoo.model_api.pipelines import get_user_config, AsyncPipeline
-from openvino.model_zoo.model_api.adapters import create_core, OpenvinoAdapter
+from model_api.models import BertEmbedding, BertQuestionAnswering
+from model_api.models.tokens_bert import text_to_tokens, load_vocab_file, ContextWindow
+from model_api.pipelines import get_user_config, AsyncPipeline
+from model_api.adapters import create_core, OpenvinoAdapter
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)
 

demos/classification_demo/python/classification_demo.py

@@ -24,11 +24,12 @@
 import cv2
 
 sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python'))
+sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python/openvino/model_zoo'))
 
-from openvino.model_zoo.model_api.models import Classification, OutputTransform
-from openvino.model_zoo.model_api.performance_metrics import put_highlighted_text, PerformanceMetrics
-from openvino.model_zoo.model_api.pipelines import get_user_config, AsyncPipeline
-from openvino.model_zoo.model_api.adapters import create_core, OpenvinoAdapter, OVMSAdapter
+from model_api.models import Classification, OutputTransform
+from model_api.performance_metrics import put_highlighted_text, PerformanceMetrics
+from model_api.pipelines import get_user_config, AsyncPipeline
+from model_api.adapters import create_core, OpenvinoAdapter, OVMSAdapter
 
 import monitors
 from images_capture import open_images_capture

demos/colorization_demo/python/colorization_demo.py

@@ -25,10 +25,11 @@
 from pathlib import Path
 
 sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python'))
+sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python/openvino/model_zoo'))
 
 import monitors
 from images_capture import open_images_capture
-from openvino.model_zoo.model_api.performance_metrics import PerformanceMetrics
+from model_api.performance_metrics import PerformanceMetrics
 
 log.basicConfig(format='[ %(levelname)s ] %(message)s', level=log.DEBUG, stream=sys.stdout)
 

demos/common/python/images_capture.py

@@ -1,12 +1,14 @@
 import os
 import sys
+from pathlib import Path
 import copy
 from time import perf_counter
 
 import cv2
 
+sys.path.append(str(Path(__file__).resolve().parents[2] / 'common/python/openvino/model_zoo'))
 
-from openvino.model_zoo.model_api.performance_metrics import PerformanceMetrics
+from model_api.performance_metrics import PerformanceMetrics
 
 
 class InvalidInput(Exception):