change delimeter for layouts

Author: akorobeinikov

demos/bert_named_entity_recognition_demo/python/bert_named_entity_recognition_demo.py

@@ -58,7 +58,7 @@ def build_argparser():
                       required=False, type=str, default="input_ids,attention_mask,token_type_ids")
     args.add_argument('--layout',
                       help='Optional. Model inputs layouts. '
-                           'Format "NCHW" or "<input1>:<layout1>,<input2>:<layout2>" in case of more than one input.'
+                           '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",

demos/bert_question_answering_demo/python/bert_question_answering_demo.py

@@ -57,7 +57,7 @@ def build_argparser():
                       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 "NCHW" or "<input1>:<layout1>,<input2>:<layout2>" in case of more than one input.'
+                           '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. "

demos/bert_question_answering_embedding_demo/python/bert_question_answering_embedding_demo.py

@@ -62,7 +62,7 @@ def build_argparser():
                       required=False, type=str)
     args.add_argument('--layout_emb', type=str, default=None,
                       help='Optional. MODEL_EMB inputs layouts. '
-                           'Format "NCHW" or "<input1>:<layout1>,<input2>:<layout2>" in case of more than one input.'
+                           '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",
@@ -81,7 +81,7 @@ def build_argparser():
                       default="1.2", required=False, type=str)
     args.add_argument('--layout_qa', type=str, default=None,
                       help='Optional. MODEL_QA inputs layouts. '
-                           'Format "NCHW" or "<input1>:<layout1>,<input2>:<layout2>" in case of more than one input.'
+                           '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",

demos/classification_demo/python/classification_demo.py

@@ -60,7 +60,7 @@ def build_argparser():
                                    type=int, choices=range(1, 11))
     common_model_args.add_argument('--layout', type=str, default=None,
                                    help='Optional. Model inputs layouts. '
-                                        'Format "NCHW" or "<input1>:<layout1>,<input2>:<layout2>" in case of more than one input.'
+                                        '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')

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

@@ -49,6 +49,7 @@ def __init__(self, core, model_path, weights_path=None, model_parameters = {}, d
         self.plugin_config = plugin_config
         self.max_num_requests = max_num_requests
         self.model_parameters = model_parameters
+        self.model_parameters['input_layouts'] = Layout.parse_layouts(self.model_parameters.get('input_layouts', None))
 
         if isinstance(model_path, (str, Path)):
             if Path(model_path).suffix == ".onnx" and weights_path:
@@ -87,7 +88,6 @@ def log_runtime_settings(self):
 
     def get_input_layers(self):
         inputs = {}
-        self.model_parameters['input_layouts'] = Layout.parse_layouts(self.model_parameters.get('input_layouts', None))
         for input in self.model.inputs:
             input_layout = self.get_layout_for_input(input)
             inputs[input.get_any_name()] = Metadata(input.get_names(), list(input.shape), input_layout, input.get_element_type().get_type_name())

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

@@ -55,21 +55,17 @@ def from_user_layouts(input_names: set, user_layouts: dict):
     @staticmethod
     def parse_layouts(layout_regex: str) -> Optional[dict]:
         '''
-        Parse layout parameter in format "input0:NCHW,input1:NC" or "NCHW" (applied to all inputs)
+        Parse layout parameter in format "input0[NCHW],input1[NC]" or "[NCHW]" (applied to all inputs)
         '''
         if not layout_regex:
             return None
         inputs_layouts = layout_regex.split(',')
         user_layouts = {}
         for layout in inputs_layouts:
-            layout_list = layout.split(':')
-            if len(layout_list) == 2:
-                input_name, input_layout = layout_list
-            else:
-                input_name = ''
-                input_layout = layout_list[0]
-            if re.fullmatch(r"[A-Z]+", input_layout):
-                user_layouts[input_name] = input_layout
-            else:
+            if not re.fullmatch(r"[^\[\]]*\[[A-Z]+\]", layout):
                 raise ValueError("invalid --layout option format")
+            layout_list = layout.split('[')
+            input_name = layout_list[0]
+            input_layout = layout_list[1].strip('[]')
+            user_layouts[input_name] = input_layout
         return user_layouts

demos/common/python/openvino/model_zoo/model_api/models/deblurring.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.
  You may obtain a copy of the License at

demos/deblurring_demo/python/deblurring_demo.py

@@ -54,7 +54,7 @@ def build_argparser():
                            'Default value is CPU.')
     args.add_argument('--layout', type=str, default=None,
                       help='Optional. Model inputs layouts. '
-                           'Format "NCHW" or "<input1>:<layout1>,<input2>:<layout2>" in case of more than one input.'
+                           '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')

demos/human_pose_estimation_demo/python/human_pose_estimation_demo.py

@@ -80,7 +80,7 @@ def build_argparser():
                                         'is the length of a short first image side.')
     common_model_args.add_argument('--layout', type=str, default=None,
                                    help='Optional. Model inputs layouts. '
-                                        'Format "NCHW" or "<input1>:<layout1>,<input2>:<layout2>" in case of more than one input.'
+                                        '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')

demos/monodepth_demo/python/monodepth_demo.py

@@ -60,7 +60,7 @@ def build_argparser():
                            'Default value is CPU.')
     args.add_argument('--layout', type=str, default=None,
                       help='Optional. Model inputs layouts. '
-                           'Format "NCHW" or "<input1>:<layout1>,<input2>:<layout2>" in case of more than one input.'
+                           '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')