AC: support mask concat for inpainting (#3514)

Co-authored-by: ekaterina.aidova <[email protected]>

Author: eaidova

tools/accuracy_checker/openvino/tools/accuracy_checker/preprocessor/README.md

@@ -160,12 +160,15 @@ Accuracy Checker supports following set of preprocessors:
   * `max_length` - Maximum line length to draw mask.
   * `max_vertex` - Maximum number vertex to draw mask.
   * `inverse_mask` - Allows mask inversion (1 - real image, 0 - masked area). Optional, default `False` (0 - real image, 1- masked area).
+  * `concat_mask` - Allows concatenate generated mask and image to one tensor by channels. Optional, default `False`.
 * `rect_mask` - Applies rectangle mask to the image.
   * `dst_width` and `dst_height` are width, and height of mask. You can also use `size` instead in case when destination sizes are equal.
-* `inverse_mask` - Allows mask inversion (1 - real image, 0 - masked area). Optional, default `False` (0 - real image, 1- masked areaa).
+  * `inverse_mask` - Allows mask inversion (1 - real image, 0 - masked area). Optional, default `False` (0 - real image, 1- masked area).
+  * `concat_mask` - Allows concatenate generated mask and image to one tensor by channels. Optional, default `False`.
 * `custom_mask` - Applies masks from custom mask dataset.
   * `mask_dir` - path to mask dataset to be used for inpainting.
   * `inverse_mask` - inverse mask before apply
+  * `concat_mask` - Allows concatenate generated mask and image to one tensor by channels. Optional, default `False`.
   * `mask_loader` - which reader to use to load masks. The following readers can be used:
     * `opencv_imread` - read images using OpenCV library. Default color space is BGR.
     * `pillow_imread` - read images using Pillow library. Default color space is RGB.

tools/accuracy_checker/openvino/tools/accuracy_checker/preprocessor/inpainting_preprocessor.py

@@ -41,6 +41,8 @@ def parameters(cls):
                 optional=True, default=20, description="Maximum number vertex to draw mask.", value_type=int
             ),
             'inverse_mask': BoolField(optional=True, default=False, description="Inverse mask"),
+            'concat_mask': BoolField(
+                optional=True, default=False, description='concatenate masked image and mask to one tensor')
         })
         return parameters
 
@@ -50,6 +52,7 @@ def configure(self):
         self.max_length = self.get_value_from_config('max_length')
         self.max_vertex = self.get_value_from_config('max_vertex')
         self.inverse_mask = self.get_value_from_config('inverse_mask')
+        self.concat_mask = self.get_value_from_config('concat_mask')
 
     @staticmethod
     def _free_form_mask(mask, max_vertex, max_length, max_brush_width, h, w, max_angle=360):
@@ -87,6 +90,10 @@ def process(self, image, annotation_meta=None):
         img = img * (1 - mask) + 255 * mask
         if self.inverse_mask:
             mask = 1 - mask
+        if self.concat_mask:
+            image.identifier = image.identifier[0]
+            image.data = np.concatenate([img, mask], axis=2)
+            return image
         image.data = [img, mask]
         identifier = image.identifier[0]
         image.identifier = ['{}_image'.format(identifier), '{}_mask'.format(identifier)]
@@ -110,7 +117,9 @@ def parameters(cls):
                 optional=True, default=128,
                 description="Size of mask, used if both dimensions are equal", value_type=int
             ),
-            'inverse_mask': BoolField(optional=True, default=False, description="Inverse mask")
+            'inverse_mask': BoolField(optional=True, default=False, description="Inverse mask"),
+            'concat_mask': BoolField(
+                optional=True, default=False, description='concatenate masked image and mask to one tensor')
 
         })
         return parameters
@@ -122,6 +131,7 @@ def configure(self):
         if self.mask_width is None:
             self.mask_width = 128
         self.inverse_mask = self.get_value_from_config('inverse_mask')
+        self.concat_mask = self.get_value_from_config('concat_mask')
 
     def process(self, image, annotation_meta=None):
         if len(image.data) == 2:
@@ -139,6 +149,10 @@ def process(self, image, annotation_meta=None):
         img = img * (1 - mask) + 255 * mask
         if self.inverse_mask:
             mask = 1 - mask
+        if self.concat_mask:
+            image.identifier = image.identifier[0]
+            image.data = np.concatenate([img, mask], axis=2)
+            return image
         image.data = [img, mask]
         identifier = image.identifier[0]
         image.identifier = ['{}_image'.format(identifier), '{}_mask'.format(identifier)]
@@ -154,14 +168,17 @@ def parameters(cls):
         parameters.update({
             'mask_dir': PathField(is_directory=True, optional=False, description="Path to mask dataset directory"),
             'inverse_mask': BoolField(optional=True, default=False, description="Inverse mask"),
-            'mask_loader': StringField(optional=True, default='numpy_reader', description="Mask loader")
+            'mask_loader': StringField(optional=True, default='numpy_reader', description="Mask loader"),
+            'concat_mask': BoolField(
+                optional=True, default=False, description='concatenate masked image and mask to one tensor')
         })
         return parameters
 
     def configure(self):
         self.mask_dir = self.get_value_from_config('mask_dir')
         self.inverse_mask = self.get_value_from_config('inverse_mask')
         self.mask_loader = self.get_value_from_config('mask_loader')
+        self.concat_mask = self.get_value_from_config('concat_mask')
 
     def process(self, image, annotation_meta=None):
         if len(image.data) == 2:
@@ -188,6 +205,10 @@ def process(self, image, annotation_meta=None):
             mask = np.expand_dims(mask, axis=2)
 
         img = img * (1 - mask) + 255 * mask
+        if self.concat_mask:
+            image.identifier = image.identifier[0]
+            image.data = np.concatenate([img, mask], axis=2)
+            return image
         image.data = [img, mask]
         identifier = image.identifier[0]
         image.identifier = ['{}_image'.format(identifier), '{}_mask'.format(identifier)]