Add a test for MRCNN resize_letterbox

Author: sovrasov

src/cpp/include/tasks/instance_segmentation.h

@@ -34,6 +34,7 @@ class InstanceSegmentation {
             utils::get_from_any_maps("confidence_threshold", user_config, model_config, confidence_threshold);
         input_shape.width = utils::get_from_any_maps("orig_width", user_config, model_config, input_shape.width);
         input_shape.height = utils::get_from_any_maps("orig_height", user_config, model_config, input_shape.width);
+        resize_mode = utils::get_from_any_maps("resize_type", user_config, model_config, resize_mode);
     }
 
     static void serialize(std::shared_ptr<ov::Model>& ov_model);
@@ -61,4 +62,5 @@ class InstanceSegmentation {
 
     cv::Size input_shape;
     float confidence_threshold = 0.5f;
+    utils::RESIZE_MODE resize_mode = utils::RESIZE_MODE::RESIZE_FILL;
 };

src/cpp/include/utils/config.h

@@ -42,7 +42,7 @@ inline bool get_from_any_maps(const std::string& key,
     return low_priority;
 }
 
-enum class RESIZE_MODE  {
+enum class RESIZE_MODE {
     RESIZE_FILL,
     RESIZE_KEEP_ASPECT,
     RESIZE_KEEP_ASPECT_LETTERBOX,
@@ -72,7 +72,6 @@ inline RESIZE_MODE get_from_any_maps(const std::string& key,
     return resize;
 }
 
-
 ov::AnyMap get_config_from_onnx(const std::string& model_path);
 
 void add_ov_model_info(std::shared_ptr<ov::Model> model, const ov::AnyMap& config);

src/cpp/src/tasks/detection/ssd.cpp

@@ -208,7 +208,8 @@ DetectionResult SSD::postprocessMultipleOutputs(InferenceResult& infResult) {
     float invertedScaleX = floatInputImgWidth / input_shape.width,
           invertedScaleY = floatInputImgHeight / input_shape.height;
     int padLeft = 0, padTop = 0;
-    if (utils::RESIZE_MODE::RESIZE_KEEP_ASPECT == resize_mode || utils::RESIZE_MODE::RESIZE_KEEP_ASPECT_LETTERBOX == resize_mode) {
+    if (utils::RESIZE_MODE::RESIZE_KEEP_ASPECT == resize_mode ||
+        utils::RESIZE_MODE::RESIZE_KEEP_ASPECT_LETTERBOX == resize_mode) {
         invertedScaleX = invertedScaleY = std::max(invertedScaleX, invertedScaleY);
         if (utils::RESIZE_MODE::RESIZE_KEEP_ASPECT_LETTERBOX == resize_mode) {
             padLeft = (input_shape.width - int(std::round(floatInputImgWidth / invertedScaleX))) / 2;

src/cpp/src/tasks/instance_segmentation.cpp

@@ -234,10 +234,10 @@ InstanceSegmentationResult InstanceSegmentation::postprocess(InferenceResult& in
     float invertedScaleX = floatInputImgWidth / input_shape.width,
           invertedScaleY = floatInputImgHeight / input_shape.height;
     int padLeft = 0, padTop = 0;
-    auto resizeMode = utils::RESIZE_MODE::RESIZE_FILL;
-    if (utils::RESIZE_MODE::RESIZE_KEEP_ASPECT == resizeMode || utils::RESIZE_MODE::RESIZE_KEEP_ASPECT_LETTERBOX == resizeMode) {
+    if (utils::RESIZE_MODE::RESIZE_KEEP_ASPECT == resize_mode ||
+        utils::RESIZE_MODE::RESIZE_KEEP_ASPECT_LETTERBOX == resize_mode) {
         invertedScaleX = invertedScaleY = std::max(invertedScaleX, invertedScaleY);
-        if (utils::RESIZE_MODE::RESIZE_KEEP_ASPECT_LETTERBOX == resizeMode) {
+        if (utils::RESIZE_MODE::RESIZE_KEEP_ASPECT_LETTERBOX == resize_mode) {
             padLeft = (input_shape.width - int(std::round(floatInputImgWidth / invertedScaleX))) / 2;
             padTop = (input_shape.height - int(std::round(floatInputImgHeight / invertedScaleY))) / 2;
         }

tests/python/accuracy/public_scope.json

@@ -243,5 +243,17 @@
         ]
       }
     ]
+  },
+  {
+    "name": "otx_models/maskrcnn_xai_tiling.xml",
+    "type": "MaskRCNNModel",
+    "test_data": [
+      {
+        "image": "coco128/images/train2017/000000000074.jpg",
+        "reference": [
+          "281, 71, 303, 84, 2 (ellipse): 0.553, 224, RotatedRect: 291.500 77.000 12.000 19.000 90.000; 496, 7, 523, 38, 1 (rectangle): 0.497, 775, RotatedRect: 509.000 23.000 30.000 26.000 90.000; 2; [1,1280,1,1]; "
+        ]
+      }
+    ]
   }
 ]