Internal change

PiperOrigin-RevId: 480986311

Author: tensorflower-gardener

official/projects/panoptic/dataloaders/panoptic_maskrcnn_input.py

@@ -48,18 +48,24 @@ def __init__(
           panoptic_category_mask_key:
               tf.io.FixedLenFeature((), tf.string, default_value=''),
           panoptic_instance_mask_key:
-              tf.io.FixedLenFeature((), tf.string, default_value='')})
+              tf.io.FixedLenFeature((), tf.string, default_value='')
+      })
     self._segmentation_keys_to_features = keys_to_features
 
+  def decode_segmentation_mask(self, parsed_tensors):
+    segmentation_mask = tf.io.decode_image(
+        parsed_tensors['image/segmentation/class/encoded'], channels=1)
+    segmentation_mask.set_shape([None, None, 1])
+    return segmentation_mask
+
   def decode(self, serialized_example):
     decoded_tensors = super(TfExampleDecoder, self).decode(serialized_example)
     parsed_tensors = tf.io.parse_single_example(
         serialized_example, self._segmentation_keys_to_features)
-    segmentation_mask = tf.io.decode_image(
-        parsed_tensors['image/segmentation/class/encoded'],
-        channels=1)
-    segmentation_mask.set_shape([None, None, 1])
-    decoded_tensors.update({'groundtruth_segmentation_mask': segmentation_mask})
+    decoded_tensors.update({
+        'groundtruth_segmentation_mask':
+            self.decode_segmentation_mask(parsed_tensors)
+    })
 
     if self._include_panoptic_masks:
       category_mask = tf.io.decode_image(
@@ -221,18 +227,21 @@ def _parse_train_data(self, data):
           are supposed to be used in computing the segmentation loss while
           training.
     """
+    # (height, width, num_channels = 1)
+    # All the operations below support num_channels >= 1.
     segmentation_mask = data['groundtruth_segmentation_mask']
 
     # Flips image randomly during training.
     if self.aug_rand_hflip:
       masks = data['groundtruth_instance_masks']
+      num_image_channels = data['image'].shape.as_list()[-1]
       image_mask = tf.concat([data['image'], segmentation_mask], axis=2)
 
       image_mask, boxes, masks = preprocess_ops.random_horizontal_flip(
           image_mask, data['groundtruth_boxes'], masks)
 
-      segmentation_mask = image_mask[:, :, -1:]
-      image = image_mask[:, :, :-1]
+      image = image_mask[:, :, :num_image_channels]
+      segmentation_mask = image_mask[:, :, num_image_channels:]
 
       data['image'] = image
       data['groundtruth_boxes'] = boxes
@@ -244,21 +253,22 @@ def _parse_train_data(self, data):
     image_scale = image_info[2, :]
     offset = image_info[3, :]
 
-    segmentation_mask = tf.reshape(
-        segmentation_mask, shape=[1, data['height'], data['width']])
+    # (height, width, num_channels = 1)
     segmentation_mask = tf.cast(segmentation_mask, tf.float32)
 
     # Pad label and make sure the padded region assigned to the ignore label.
     # The label is first offset by +1 and then padded with 0.
     segmentation_mask += 1
-    segmentation_mask = tf.expand_dims(segmentation_mask, axis=3)
+    # (1, height, width, num_channels = 1)
+    segmentation_mask = tf.expand_dims(segmentation_mask, axis=0)
     segmentation_mask = preprocess_ops.resize_and_crop_masks(
         segmentation_mask, image_scale, self._output_size, offset)
     segmentation_mask -= 1
     segmentation_mask = tf.where(
         tf.equal(segmentation_mask, -1),
         self._segmentation_ignore_label * tf.ones_like(segmentation_mask),
         segmentation_mask)
+    # (height, width, num_channels = 1)
     segmentation_mask = tf.squeeze(segmentation_mask, axis=0)
     segmentation_valid_mask = tf.not_equal(
         segmentation_mask, self._segmentation_ignore_label)
@@ -291,9 +301,13 @@ def _parse_eval_data(self, data):
             shape [height_l, width_l, 4] representing anchor boxes at each
             level.
     """
+
     def _process_mask(mask, ignore_label, image_info):
+      # (height, width, num_channels = 1)
+      # All the operations below support num_channels >= 1.
       mask = tf.cast(mask, dtype=tf.float32)
-      mask = tf.reshape(mask, shape=[1, data['height'], data['width'], 1])
+      # (1, height, width, num_channels = 1)
+      mask = tf.expand_dims(mask, axis=0)
       mask += 1
 
       if self._segmentation_resize_eval_groundtruth:
@@ -314,12 +328,14 @@ def _process_mask(mask, ignore_label, image_info):
           tf.equal(mask, -1),
           ignore_label * tf.ones_like(mask),
           mask)
+      # (height, width, num_channels = 1)
       mask = tf.squeeze(mask, axis=0)
       return mask
 
     image, labels = super(Parser, self)._parse_eval_data(data)
     image_info = labels['image_info']
 
+    # (height, width, num_channels = 1)
     segmentation_mask = _process_mask(
         data['groundtruth_segmentation_mask'],
         self._segmentation_ignore_label, image_info)