align with c++

Author: akorobeinikov

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

@@ -101,7 +101,7 @@ def get_layout_for_input(self, input) -> str:
         if not input_layout:
             if not layout_helpers.get_layout(input).empty:
                 input_layout = Layout.from_openvino(input)
-            elif len(input.shape) == 4:
+            else:
                 input_layout = Layout.from_shape(input.shape)
         return input_layout
 

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

@@ -28,11 +28,15 @@ def from_shape(shape):
         '''
         Create Layout from given shape
         '''
-        if len(shape) != 4:
-            raise RuntimeError('Get layout from shape method supports only 4D input shape')
+        if len(shape) == 2:
+            return 'NC'
+        if len(shape) == 3:
+            return 'CHW' if shape[0] in range(1, 5) else 'HWC'
+        if len(shape) == 4:
+            return 'NCHW' if shape[1] in range(1, 5) else 'NHWC'
+
+        raise RuntimeError("Get layout from shape method doesn't support {}D shape".format(len(shape)))
 
-        layout = 'NCHW' if shape[1] in range(1, 4) else 'NHWC'
-        return layout
 
     @staticmethod
     def from_openvino(input):