fixes

Author: ivikhrev

demos/common/cpp/models/src/classification_model.cpp

@@ -116,7 +116,7 @@ void ClassificationModel::prepareInputsOutputs(std::shared_ptr<ov::Model>& model
             " 2-dimensional or 4-dimensional output");
     }
 
-    const ov::Layout outputLayout("NC...");
+    const ov::Layout outputLayout("NCHW");
     if (outputShape.size() == 4 && (outputShape[ov::layout::height_idx(outputLayout)] != 1
         || outputShape[ov::layout::width_idx(outputLayout)] != 1)) {
         throw std::logic_error("Classification model wrapper supports topologies only"

demos/common/cpp/models/src/super_resolution_model.cpp

@@ -44,8 +44,8 @@ void SuperResolutionModel::prepareInputsOutputs(std::shared_ptr<ov::Model>& mode
     if (lrShape.size() != 4) {
         throw std::logic_error("Number of dimensions for an input must be 4");
     }
-    // in case of 2 inputs they have same layouts
-    ov::Layout inputLayout = getInputLayout(model->input());
+    // in case of 2 inputs they have the same layouts
+    ov::Layout inputLayout = getInputLayout(model->inputs().front());
 
     auto channelsId = ov::layout::channels_idx(inputLayout);
     auto heightId = ov::layout::height_idx(inputLayout);

demos/common/cpp/utils/include/utils/ocv_common.hpp

@@ -204,11 +204,15 @@ static inline void resize2tensor(const cv::Mat& mat, const ov::Tensor& tensor) {
 
 static inline ov::Layout getLayoutFromShape(const ov::Shape& shape) {
     if (shape.size() == 2) {
-        return { "NC" };
+        return "NC";
+    }
+    else if (shape.size() == 3) {
+        return (shape[0] >= 1 && shape[0] <= 4) ? "CHW" :
+                                                  "HWC";
     }
     else if (shape.size() == 4) {
-        return (shape[1] >= 1 && shape[1] <= 4) ? ov::Layout{"NCHW"} :
-                                                  ov::Layout{"NHWC"};
+        return (shape[1] >= 1 && shape[1] <= 4) ? "NCHW" :
+                                                  "NHWC";
     }
     else {
         throw std::runtime_error("Usupported " + std::to_string(shape.size()) + "D shape");