AC: minor fixes (#2932)

Author: eaidova

tools/accuracy_checker/openvino/tools/accuracy_checker/argparser.py

@@ -350,7 +350,7 @@ def add_openvino_specific_args(parser):
     )
     openvino_specific_args.add_argument(
         '--use_new_api', type=cast_to_bool, help='switch to processing using OpenVINO 2.0 API', required=False,
-        default=False
+        default=None
     )
 
 

tools/accuracy_checker/openvino/tools/accuracy_checker/config/config_reader.py

@@ -65,18 +65,18 @@
 }
 
 LIST_ENTRIES_PATHS = {
-        'model': 'models',
-        'weights': 'models',
-        'color_coeff': ['model_attributes', 'models'],
-        'caffe_model': 'models',
-        'caffe_weights': 'models',
-        'tf_model': 'models',
-        'tf_meta': 'models',
-        'mxnet_weights': 'models',
-        'onnx_model': 'models',
-        'kaldi_model': 'models',
-        'saved_model_dir': 'models',
-        'params': 'models'
+    'model': 'models',
+    'weights': 'models',
+    'color_coeff': ['model_attributes', 'models'],
+    'caffe_model': 'models',
+    'caffe_weights': 'models',
+    'tf_model': 'models',
+    'tf_meta': 'models',
+    'mxnet_weights': 'models',
+    'onnx_model': 'models',
+    'kaldi_model': 'models',
+    'saved_model_dir': 'models',
+    'params': 'models'
 }
 
 COMMAND_LINE_ARGS_AS_ENV_VARS = {
@@ -190,7 +190,7 @@ def _check_module_config(config):
         config_checker_func = config_checkers.get(eval_mode)
         if config_checker_func is None:
             raise ConfigError(
-                'Accuracy Checker {} mode is not supported. Please select between evaluations and models.'. format(
+                'Accuracy Checker {} mode is not supported. Please select between evaluations and models.'.format(
                     eval_mode))
         config_checker_func(config)
 
@@ -676,8 +676,8 @@ def filter_modules(config, target_devices, args):
 
 
 def process_config(
-        config_item, entries_paths, args, dataset_identifier='datasets',
-        launchers_identifier='launchers', identifiers_mapping=None, pipeline=False
+    config_item, entries_paths, args, dataset_identifier='datasets',
+    launchers_identifier='launchers', identifiers_mapping=None, pipeline=False
 ):
     def process_dataset(datasets_configs):
         for datasets_config in datasets_configs:
@@ -849,7 +849,7 @@ def _async_evaluation_args(launcher_entry):
 
     if launcher_entry['framework'].lower() not in ['dlsdk', 'openvino']:
         return launcher_entry
-    if 'use_new_api' in arguments:
+    if 'use_new_api' in arguments and arguments.use_new_api is not None:
         if launcher_entry['framework'].lower() == 'dlsdk' and arguments.use_new_api:
             launcher_entry['framework'] = 'openvino'
         elif launcher_entry['framework'].lower() == 'openvino' and not arguments.use_new_api:
@@ -912,8 +912,8 @@ def merge_device_configs(launcher_entry, device_config_file):
     if not embedded_device_config:
         embedded_device_config = external_device_config
     elif (
-            not isinstance(next(iter(external_device_config.values())), dict)
-            and not isinstance(next(iter(embedded_device_config.values())), dict)
+        not isinstance(next(iter(external_device_config.values())), dict)
+        and not isinstance(next(iter(embedded_device_config.values())), dict)
     ):
         embedded_device_config.update(external_device_config)
     else:

tools/accuracy_checker/openvino/tools/accuracy_checker/evaluators/custom_evaluators/base_models.py

@@ -164,11 +164,11 @@ def automatic_model_search(self, network_info):
             if len(model_list) > 1:
                 raise ConfigError('Several suitable models for {} found'.format(self.default_model_suffix))
             model = model_list[0]
-        accepted_suffixes = ['.blob', '.xml']
+        accepted_suffixes = ['.blob', '.xml', '.onnx']
         if model.suffix not in accepted_suffixes:
             raise ConfigError('Models with following suffixes are allowed: {}'.format(accepted_suffixes))
         print_info('{} - Found model: {}'.format(self.default_model_suffix, model))
-        if model.suffix == '.blob':
+        if model.suffix in ['.blob', '.onnx']:
             return model, None
         weights = get_path(network_info.get('weights', model.parent / model.name.replace('xml', 'bin')))
         accepted_weights_suffixes = ['.bin']
@@ -200,11 +200,14 @@ def load_model(self, network_info, launcher, log=False):
             model, weights = launcher.convert_model(network_info)
         else:
             model, weights = self.automatic_model_search(network_info)
-        if weights is not None:
-            self.network = launcher.read_network(str(model), str(weights))
-            self.load_network(self.network, launcher)
-        else:
+        if weights is None and model.suffix != '.onnx':
             self.exec_network = launcher.ie_core.import_network(str(model))
+        else:
+            if weights:
+                self.network = launcher.read_network(str(model), str(weights))
+            else:
+                self.network = launcher.ie_core.read_network(str(model))
+            self.load_network(self.network, launcher)
         self.set_input_and_output()
         if log:
             self.print_input_output_info()

tools/accuracy_checker/openvino/tools/accuracy_checker/launcher/dlsdk_launcher.py

@@ -656,7 +656,10 @@ def load_ir(self, xml_path, bin_path, log=False):
 
     def read_network(self, model, weights):
         if 'read_network' in ie.IECore.__dict__:
-            network = self.ie_core.read_network(model=str(model), weights=str(weights))
+            if weights is None:
+                network = self.ie_core.read_network(model=str(model))
+            else:
+                network = self.ie_core.read_network(model=str(model), weights=str(weights))
         else:
             network = ie.IENetwork(model=str(model), weights=str(weights))
         return network

tools/accuracy_checker/openvino/tools/accuracy_checker/launcher/dlsdk_launcher_config.py

@@ -382,6 +382,7 @@ def automatic_model_search(model_name, model_cfg, weights_cfg, model_type=None):
         'paddle': 'pdmodel',
         'tf': 'pb'
     }
+
     def get_model_by_suffix(model_name, model_dir, suffix):
         model_list = list(Path(model_dir).glob('{}.{}'.format(model_name, suffix)))
         if not model_list:

tools/accuracy_checker/openvino/tools/accuracy_checker/launcher/input_feeder.py

@@ -34,6 +34,8 @@
     'NDHWC': [0, 1, 2, 3, 4],
     'NDCWH': [0, 1, 4, 3, 2],
     'NCHWD': [0, 2, 3, 4, 1],
+    'NHWDC': [0, 2, 3, 1, 4],
+    'NHWCD': [0, 2, 3, 4, 1],
     'NC': [0, 1],
     'CN': [1, 0],
     'CNH': [1, 0, 2],

tools/accuracy_checker/openvino/tools/accuracy_checker/launcher/openvino_launcher.py

@@ -602,7 +602,10 @@ def load_ir(self, xml_path, bin_path, log=False):
         self.try_to_set_default_layout()
 
     def read_network(self, model, weights):
-        network = self.ie_core.read_model(model=str(model), weights=str(weights))
+        if weights is not None:
+            network = self.ie_core.read_model(model=str(model), weights=str(weights))
+        else:
+            network = self.ie_core.read_model(model=str(model))
         return network
 
     def inputs_info_for_meta(self):