Merge pull request #3080 from akorobeinikov/ak/model_api_2.0

Update python ModelAPI to OV 2.0

Author: Wovchena

demos/background_subtraction_demo/python/background_subtraction_demo.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
- Copyright (C) 2021 Intel Corporation
+ Copyright (C) 2021-2022 Intel Corporation
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -68,6 +68,10 @@ def build_argparser():
                            'same shape as an input image.')
     args.add_argument('--blur_bgr', default=0, type=int,
                       help='Optional. Background blur strength (by default with value 0 is not applied).')
+    args.add_argument('--layout', type=str, default=None,
+                      help='Optional. Model inputs layouts. '
+                           'Format "[<layout>]" or "<input1>[<layout1>],<input2>[<layout2>]" in case of more than one input.'
+                           'To define layout you should use only capital letters')
 
     infer_args = parser.add_argument_group('Inference options')
     infer_args.add_argument('-nireq', '--num_infer_requests', help='Optional. Number of infer requests.',
@@ -211,7 +215,7 @@ def main():
     if args.adapter == 'openvino':
         plugin_config = get_user_config(args.device, args.num_streams, args.num_threads)
         model_adapter = OpenvinoAdapter(create_core(), args.model, device=args.device, plugin_config=plugin_config,
-                                        max_num_requests=args.num_infer_requests)
+                                        max_num_requests=args.num_infer_requests, model_parameters = {'input_layouts': args.layout})
     elif args.adapter == 'ovms':
         model_adapter = OVMSAdapter(args.model)
 

demos/bert_named_entity_recognition_demo/python/bert_named_entity_recognition_demo.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
- Copyright (c) 2021 Intel Corporation
+ Copyright (c) 2021-2022 Intel Corporation
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -56,6 +56,11 @@ def build_argparser():
                       help="Optional. Inputs names for the network. "
                            "Default values are \"input_ids,attention_mask,token_type_ids\" ",
                       required=False, type=str, default="input_ids,attention_mask,token_type_ids")
+    args.add_argument('--layout',
+                      help='Optional. Model inputs layouts. '
+                           'Format "[<layout>]" or "<input1>[<layout1>],<input2>[<layout2>]" in case of more than one input.'
+                           'To define layout you should use only capital letters',
+                      type=str, default=None)
     args.add_argument("-d", "--device",
                       help="Optional. Target device to perform inference on."
                            "Default value is CPU", default="CPU", type=str)
@@ -108,7 +113,7 @@ def main():
     if args.adapter == 'openvino':
         plugin_config = get_user_config(args.device, args.num_streams, args.num_threads)
         model_adapter = OpenvinoAdapter(create_core(), args.model, device=args.device, plugin_config=plugin_config,
-                                        max_num_requests=args.num_infer_requests)
+                                        max_num_requests=args.num_infer_requests, model_parameters = {'input_layouts': args.layout})
     elif args.adapter == 'ovms':
         model_adapter = OVMSAdapter(args.model)
 

demos/bert_question_answering_demo/python/bert_question_answering_demo.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
- Copyright (c) 2020-2021 Intel Corporation
+ Copyright (c) 2020-2022 Intel Corporation
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -55,6 +55,10 @@ def build_argparser():
                       help="Optional. Inputs names for the network. "
                            "Default values are \"input_ids,attention_mask,token_type_ids\" ",
                       required=False, type=str, default="input_ids,attention_mask,token_type_ids")
+    args.add_argument('--layout', type=str, default=None,
+                      help='Optional. Model inputs layouts. '
+                           'Format "[<layout>]" or "<input1>[<layout1>],<input2>[<layout2>]" in case of more than one input.'
+                           'To define layout you should use only capital letters')
     args.add_argument("--output_names",
                       help="Optional. Outputs names for the network. "
                            "Default values are \"output_s,output_e\" ",
@@ -166,7 +170,7 @@ def main():
     if args.adapter == 'openvino':
         plugin_config = get_user_config(args.device, args.num_streams, args.num_threads)
         model_adapter = OpenvinoAdapter(create_core(), args.model, device=args.device, plugin_config=plugin_config,
-                                        max_num_requests=args.num_infer_requests)
+                                        max_num_requests=args.num_infer_requests, model_parameters = {'input_layouts': args.layout})
     elif args.adapter == 'ovms':
         model_adapter = OVMSAdapter(args.model)
 
@@ -227,7 +231,7 @@ def questions():
             if pipeline.is_ready():
                 if source.is_over():
                     break
-                pipeline.submit_data(source.get_data(), next_window_id, None)
+                pipeline.submit_data(source.get_data(), next_window_id)
                 next_window_id += 1
             else:
                 pipeline.await_any()

demos/bert_question_answering_embedding_demo/python/bert_question_answering_embedding_demo.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
- Copyright (c) 2020-2021 Intel Corporation
+ Copyright (c) 2020-2022 Intel Corporation
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -60,6 +60,10 @@ def build_argparser():
                            "For example 'input_ids,attention_mask,token_type_ids','position_ids'",
                       default='input_ids,attention_mask,token_type_ids,position_ids',
                       required=False, type=str)
+    args.add_argument('--layout_emb', type=str, default=None,
+                      help='Optional. MODEL_EMB inputs layouts. '
+                           'Format "[<layout>]" or "<input1>[<layout1>],<input2>[<layout2>]" in case of more than one input.'
+                           'To define layout you should use only capital letters')
     args.add_argument("-m_qa", "--model_qa",
                       help="Optional. Path to an .xml file with a trained model to give exact answer",
                       default = None,
@@ -75,6 +79,10 @@ def build_argparser():
                       required=False, type=str)
     args.add_argument("--model_qa_squad_ver", help="Optional. SQUAD version used for QuestionAnswering model fine tuning",
                       default="1.2", required=False, type=str)
+    args.add_argument('--layout_qa', type=str, default=None,
+                      help='Optional. MODEL_QA inputs layouts. '
+                           'Format "[<layout>]" or "<input1>[<layout1>],<input2>[<layout2>]" in case of more than one input.'
+                           'To define layout you should use only capital letters')
     args.add_argument("-a", "--max_answer_token_num",
                       help="Optional. Maximum number of tokens in exact answer",
                       default=15,
@@ -167,10 +175,10 @@ def main():
     visualizer = Visualizer(args.colors)
     total_latency = (perf_counter() - vocab_start_time) * 1e3
 
-    ie = create_core()
+    core = create_core()
     plugin_config = get_user_config(args.device, args.num_streams, args.num_threads)
-    model_emb_adapter = OpenvinoAdapter(ie, args.model_emb, device=args.device, plugin_config=plugin_config,
-                                        max_num_requests=args.num_infer_requests)
+    model_emb_adapter = OpenvinoAdapter(core, args.model_emb, device=args.device, plugin_config=plugin_config,
+                                        max_num_requests=args.num_infer_requests, model_parameters = {'input_layouts': args.layout_emb})
     model_emb = BertEmbedding(model_emb_adapter, {'vocab': vocab, 'input_names': args.input_names_emb})
     model_emb.log_layers_info()
 
@@ -181,13 +189,13 @@ def main():
     for new_length in [max_len_question, max_len_context]:
         model_emb.reshape(new_length)
         if new_length == max_len_question:
-            emb_exec_net = ie.load_network(model_emb_adapter.net, args.device)
+            emb_request = core.compile_model(model_emb_adapter.model, args.device).create_infer_request()
         else:
             emb_pipeline = AsyncPipeline(model_emb)
 
     if args.model_qa:
-        model_qa_adapter = OpenvinoAdapter(ie, args.model_qa, device=args.device, plugin_config=plugin_config,
-                                           max_num_requests=args.num_infer_requests)
+        model_qa_adapter = OpenvinoAdapter(core, args.model_qa, device=args.device, plugin_config=plugin_config,
+                                           max_num_requests=args.num_infer_requests, model_parameters = {'input_layouts': args.layout_qa})
         config = {
             'vocab': vocab,
             'input_names': args.input_names_qa,
@@ -216,7 +224,8 @@ def main():
     def calc_question_embedding(tokens_id):
         num = min(max_len_question - 2, len(tokens_id))
         inputs, _ = model_emb.preprocess((tokens_id[:num], max_len_question))
-        raw_result = emb_exec_net.infer(inputs)
+        emb_request.infer(inputs)
+        raw_result = model_emb_adapter.get_raw_result(emb_request)
         return model_emb.postprocess(raw_result, None)
 
     source = ContextSource(paragraphs, vocab, c_window_len)

demos/classification_demo/python/classification_demo.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
- Copyright (C) 2018-2021 Intel Corporation
+ Copyright (C) 2018-2022 Intel Corporation
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -58,6 +58,10 @@ def build_argparser():
     common_model_args.add_argument('--labels', help='Optional. Labels mapping file.', default=None, type=str)
     common_model_args.add_argument('-topk', help='Optional. Number of top results. Default value is 5. Must be from 1 to 10.', default=5,
                                    type=int, choices=range(1, 11))
+    common_model_args.add_argument('--layout', type=str, default=None,
+                                   help='Optional. Model inputs layouts. '
+                                        'Format "[<layout>]" or "<input1>[<layout1>],<input2>[<layout2>]" in case of more than one input.'
+                                        'To define layout you should use only capital letters')
 
     infer_args = parser.add_argument_group('Inference options')
     infer_args.add_argument('-nireq', '--num_infer_requests', help='Optional. Number of infer requests',
@@ -106,11 +110,11 @@ def build_argparser():
 
 def draw_labels(frame, classifications, output_transform):
     frame = output_transform.resize(frame)
-    сlass_label = ""
+    class_label = ""
     if classifications:
-        сlass_label = classifications[0][1]
+        class_label = classifications[0][1]
     font_scale = 0.7
-    label_height = cv2.getTextSize(сlass_label, cv2.FONT_HERSHEY_COMPLEX, font_scale, 2)[0][1]
+    label_height = cv2.getTextSize(class_label, cv2.FONT_HERSHEY_COMPLEX, font_scale, 2)[0][1]
     initial_labels_pos =  frame.shape[0] - label_height * (int(1.5 * len(classifications)) + 1)
 
     if (initial_labels_pos < 0):
@@ -123,8 +127,8 @@ def draw_labels(frame, classifications, output_transform):
     put_highlighted_text(frame, header, (frame.shape[1] - label_width, offset_y),
         cv2.FONT_HERSHEY_COMPLEX, font_scale, (255, 0, 0), 2)
 
-    for idx, сlass_label, score in classifications:
-        label = '{}. {}    {:.2f}'.format(idx, сlass_label, score)
+    for idx, class_label, score in classifications:
+        label = '{}. {}    {:.2f}'.format(idx, class_label, score)
         label_width = cv2.getTextSize(label, cv2.FONT_HERSHEY_COMPLEX, font_scale, 2)[0][0]
         offset_y += int(label_height * 1.5)
         put_highlighted_text(frame, label, (frame.shape[1] - label_width, offset_y),
@@ -160,7 +164,7 @@ def main():
     if args.adapter == 'openvino':
         plugin_config = get_user_config(args.device, args.num_streams, args.num_threads)
         model_adapter = OpenvinoAdapter(create_core(), args.model, device=args.device, plugin_config=plugin_config,
-                                        max_num_requests=args.num_infer_requests)
+                                        max_num_requests=args.num_infer_requests, model_parameters = {'input_layouts': args.layout})
     elif args.adapter == 'ovms':
         model_adapter = OVMSAdapter(args.model)
 

demos/common/python/openvino/model_zoo/model_api/adapters/__init__.py

@@ -1,5 +1,5 @@
 """
- Copyright (C) 2021 Intel Corporation
+ Copyright (C) 2021-2022 Intel Corporation
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -17,9 +17,11 @@
 
 from .openvino_adapter import create_core, OpenvinoAdapter
 from .ovms_adapter import OVMSAdapter
+from .utils import Layout
 
 __all__ = [
     'create_core',
+    'Layout',
     'OpenvinoAdapter',
     'OVMSAdapter',
 ]

demos/common/python/openvino/model_zoo/model_api/adapters/model_adapter.py

@@ -1,5 +1,5 @@
 """
- Copyright (c) 2021 Intel Corporation
+ Copyright (c) 2021-2022 Intel Corporation
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -16,12 +16,14 @@
 
 import abc
 from dataclasses import dataclass, field
-from typing import Dict, List
+from typing import Dict, List, Set
 
 
 @dataclass
 class Metadata:
+    names: Set[str] = field(default_factory=set)
     shape: List[int] = field(default_factory=list)
+    layout: str = ''
     precision: str = ''
     type: str = ''
     meta: Dict = field(default_factory=dict)