Fixed setting of NCH input layout (#3451)

Author: Anna Grebneva

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

@@ -43,6 +43,8 @@
     'NC': [0, 1],
     'CN': [1, 0],
     'CNH': [1, 0, 2],
+    'NCH': [0, 1, 2],
+    'NSH': [0, 1, 2],
     'N': [0]
 }
 
@@ -54,7 +56,8 @@
     (0, 1, 4, 3, 2): 'NDCWH',
     (0, 1): 'NC',
     (1, 0): 'CN',
-    (1, 0, 2): 'CNH'
+    (1, 0, 2): 'CNH',
+    (0, 1, 2): 'NCH'
 }
 
 PRECISION_TO_DTYPE = {

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

@@ -104,11 +104,9 @@ def __init__(self, config_entry, model_name='', delayed_model_loading=False,
         self._num_requests = None
 
         if not delayed_model_loading:
-            self._model, self._weights = automatic_model_search(
-                    self._model_name, self.get_value_from_config('model'),
-                    self.get_value_from_config('weights'),
-                    self.get_value_from_config('_model_type')
-            )
+            self._model, self._weights = automatic_model_search(self._model_name, self.get_value_from_config('model'),
+                                                                self.get_value_from_config('weights'),
+                                                                self.get_value_from_config('_model_type'))
             self.load_network(log=not postpone_inputs_configuration, preprocessing=preprocessor)
             self.allow_reshape_input = self.get_value_from_config('allow_reshape_input') and self.network is not None
             if not postpone_inputs_configuration:
@@ -153,10 +151,7 @@ def device(self):
 
     @property
     def inputs(self):
-        if self.network is None:
-            inputs = self.exec_network.inputs
-        else:
-            inputs = self.network.inputs
+        inputs = self.exec_network.inputs if self.network is None else self.network.inputs
         return {input_info.get_node().friendly_name: input_info.get_node() for input_info in inputs}
 
     @property
@@ -835,7 +830,9 @@ def _data_to_blob(self, layer_shape, data, layout):  # pylint:disable=R0911,R091
                 if len(np.squeeze(np.zeros(layer_shape))) == len(np.squeeze(np.zeros(data_shape))):
                     return np.resize(data, layer_shape)
         if len(layer_shape) == 3 and len(data_shape) == 4:
-            return np.transpose(data, layout)[0] if layout is not None else data[0]
+            if layout is not None:
+                return np.transpose(data[0], layout) if len(layout) == 3 else np.transpose(data, layout)[0]
+            return data[0]
         if len(layer_shape) == 1:
             return np.resize(data, layer_shape)
         if (len(data_shape) == 3) and (len(layer_shape) == 2) and (data_shape[0] == 1) and (