Merge branch 'panoptic-segmentation' into panoptic-deeplab-modeling

official/vision/beta/projects/centernet/modeling/backbones/hourglass_test.py

@@ -18,10 +18,10 @@ from absl.testing import parameterized
 import numpy as np
 import tensorflow as tf
 
-from official.vision.beta.configs import common
 from official.vision.beta.projects.centernet.common import registry_imports  # pylint: disable=unused-import
 from official.vision.beta.projects.centernet.configs import backbones
 from official.vision.beta.projects.centernet.modeling.backbones import hourglass
+from official.vision.configs import common
 
 
 class HourglassTest(tf.test.TestCase, parameterized.TestCase):

official/vision/beta/projects/centernet/ops/box_list_ops.py

@@ -16,8 +16,8 @@
 
 import tensorflow as tf
 
-from official.vision.beta.ops import sampling_ops
 from official.vision.beta.projects.centernet.ops import box_list
+from official.vision.ops import sampling_ops
 
 
 def _copy_extra_fields(boxlist_to_copy_to, boxlist_to_copy_from):

official/vision/beta/projects/centernet/ops/loss_ops.py

@@ -16,7 +16,7 @@
 
 import tensorflow as tf
 
-from official.vision.beta.ops import sampling_ops
+from official.vision.ops import sampling_ops
 
 
 def _get_shape(tensor, num_dims):

official/vision/beta/projects/centernet/ops/target_assigner.py

@@ -18,7 +18,7 @@ from typing import Dict, List
 
 import tensorflow as tf
 
-from official.vision.beta.ops import sampling_ops
+from official.vision.ops import sampling_ops
 
 
 def smallest_positive_root(a, b, c):

official/vision/beta/projects/centernet/ops/target_assigner_test.py

@@ -17,8 +17,8 @@
 from absl.testing import parameterized
 import tensorflow as tf
 
-from official.vision.beta.ops import preprocess_ops
 from official.vision.beta.projects.centernet.ops import target_assigner
+from official.vision.ops import preprocess_ops
 
 
 class TargetAssignerTest(tf.test.TestCase, parameterized.TestCase):

official/vision/beta/projects/centernet/tasks/centernet.py

@@ -22,11 +22,6 @@ import tensorflow as tf
 from official.core import base_task
 from official.core import input_reader
 from official.core import task_factory
-from official.vision.beta.dataloaders import tf_example_decoder
-from official.vision.beta.dataloaders import tfds_factory
-from official.vision.beta.dataloaders import tf_example_label_map_decoder
-from official.vision.beta.evaluation import coco_evaluator
-from official.vision.beta.modeling.backbones import factory
 from official.vision.beta.projects.centernet.configs import centernet as exp_cfg
 from official.vision.beta.projects.centernet.dataloaders import centernet_input
 from official.vision.beta.projects.centernet.losses import centernet_losses
@@ -35,6 +30,11 @@ from official.vision.beta.projects.centernet.modeling.heads import centernet_hea
 from official.vision.beta.projects.centernet.modeling.layers import detection_generator
 from official.vision.beta.projects.centernet.ops import loss_ops
 from official.vision.beta.projects.centernet.ops import target_assigner
+from official.vision.dataloaders import tf_example_decoder
+from official.vision.dataloaders import tfds_factory
+from official.vision.dataloaders.google import tf_example_label_map_decoder
+from official.vision.evaluation import coco_evaluator
+from official.vision.modeling.backbones import factory
 
 
 @task_factory.register_task_cls(exp_cfg.CenterNetTask)

official/vision/beta/projects/centernet/utils/tf2_centernet_checkpoint_converter.py

@@ -19,7 +19,6 @@ from absl import flags
 from absl import logging
 import tensorflow as tf
 
-from official.vision.beta.modeling.backbones import factory
 from official.vision.beta.projects.centernet.common import registry_imports  # pylint: disable=unused-import
 from official.vision.beta.projects.centernet.configs import backbones
 from official.vision.beta.projects.centernet.configs import centernet
@@ -28,6 +27,7 @@ from official.vision.beta.projects.centernet.modeling.heads import centernet_hea
 from official.vision.beta.projects.centernet.modeling.layers import detection_generator
 from official.vision.beta.projects.centernet.utils.checkpoints import load_weights
 from official.vision.beta.projects.centernet.utils.checkpoints import read_checkpoints
+from official.vision.modeling.backbones import factory
 
 FLAGS = flags.FLAGS
 

official/vision/beta/projects/deepmac_maskrcnn/configs/deep_mask_head_rcnn.py

@@ -14,19 +14,18 @@
 
 """Configuration for Mask R-CNN with deep mask heads."""
 
+import dataclasses
 import os
 from typing import Optional
 
-import dataclasses
-
 from official.core import config_definitions as cfg
 from official.core import exp_factory
 from official.modeling import optimization
-from official.vision.beta.configs import backbones
-from official.vision.beta.configs import common
-from official.vision.beta.configs import decoders
-from official.vision.beta.configs import maskrcnn as maskrcnn_config
-from official.vision.beta.configs import retinanet as retinanet_config
+from official.vision.configs import backbones
+from official.vision.configs import common
+from official.vision.configs import decoders
+from official.vision.configs import maskrcnn as maskrcnn_config
+from official.vision.configs import retinanet as retinanet_config
 
 
 @dataclasses.dataclass

official/vision/beta/projects/deepmac_maskrcnn/modeling/maskrcnn_model.py

@@ -21,7 +21,7 @@ from typing import List, Mapping, Optional, Union
 from absl import logging
 import tensorflow as tf
 
-from official.vision.beta.modeling import maskrcnn_model
+from official.vision.modeling import maskrcnn_model
 
 
 def resize_as(source, size):

official/vision/beta/projects/deepmac_maskrcnn/modeling/maskrcnn_model_test.py

@@ -21,18 +21,18 @@ from absl.testing import parameterized
 import numpy as np
 import tensorflow as tf
 
-from official.vision.beta.modeling.backbones import resnet
-from official.vision.beta.modeling.decoders import fpn
-from official.vision.beta.modeling.heads import dense_prediction_heads
-from official.vision.beta.modeling.heads import instance_heads
-from official.vision.beta.modeling.layers import detection_generator
-from official.vision.beta.modeling.layers import mask_sampler
-from official.vision.beta.modeling.layers import roi_aligner
-from official.vision.beta.modeling.layers import roi_generator
-from official.vision.beta.modeling.layers import roi_sampler
-from official.vision.beta.ops import anchor
 from official.vision.beta.projects.deepmac_maskrcnn.modeling import maskrcnn_model
 from official.vision.beta.projects.deepmac_maskrcnn.modeling.heads import instance_heads as deep_instance_heads
+from official.vision.modeling.backbones import resnet
+from official.vision.modeling.decoders import fpn
+from official.vision.modeling.heads import dense_prediction_heads
+from official.vision.modeling.heads import instance_heads
+from official.vision.modeling.layers import detection_generator
+from official.vision.modeling.layers import mask_sampler
+from official.vision.modeling.layers import roi_aligner
+from official.vision.modeling.layers import roi_generator
+from official.vision.modeling.layers import roi_sampler
+from official.vision.ops import anchor
 
 
 def construct_model_and_anchors(image_size, use_gt_boxes_for_masks):

official/vision/beta/projects/deepmac_maskrcnn/serving/detection.py

@@ -16,13 +16,14 @@
 """Detection input and model functions for serving/inference."""
 
 from typing import Dict, Mapping, Text
+
 import tensorflow as tf
 
-from official.vision.beta.ops import box_ops
 from official.vision.beta.projects.deepmac_maskrcnn.configs import deep_mask_head_rcnn as cfg
 from official.vision.beta.projects.deepmac_maskrcnn.modeling import maskrcnn_model
 from official.vision.beta.projects.deepmac_maskrcnn.tasks import deep_mask_head_rcnn
-from official.vision.beta.serving import detection
+from official.vision.ops import box_ops
+from official.vision.serving import detection
 
 
 def reverse_input_box_transformation(boxes, image_info):

official/vision/beta/projects/deepmac_maskrcnn/serving/export_saved_model.py

@@ -40,7 +40,7 @@ from official.core import exp_factory
 from official.modeling import hyperparams
 from official.vision.beta.projects.deepmac_maskrcnn.serving import detection
 from official.vision.beta.projects.deepmac_maskrcnn.tasks import deep_mask_head_rcnn  # pylint: disable=unused-import
-from official.vision.beta.serving import export_saved_model_lib
+from official.vision.serving import export_saved_model_lib
 
 FLAGS = flags.FLAGS
 

official/vision/beta/projects/deepmac_maskrcnn/tasks/deep_mask_head_rcnn.py

@@ -17,19 +17,19 @@
 import tensorflow as tf
 
 from official.core import task_factory
-from official.vision.beta.modeling import backbones
-from official.vision.beta.modeling.decoders import factory as decoder_factory
-from official.vision.beta.modeling.heads import dense_prediction_heads
-from official.vision.beta.modeling.heads import instance_heads
-from official.vision.beta.modeling.layers import detection_generator
-from official.vision.beta.modeling.layers import mask_sampler
-from official.vision.beta.modeling.layers import roi_aligner
-from official.vision.beta.modeling.layers import roi_generator
-from official.vision.beta.modeling.layers import roi_sampler
 from official.vision.beta.projects.deepmac_maskrcnn.configs import deep_mask_head_rcnn as deep_mask_head_rcnn_config
 from official.vision.beta.projects.deepmac_maskrcnn.modeling import maskrcnn_model as deep_maskrcnn_model
 from official.vision.beta.projects.deepmac_maskrcnn.modeling.heads import instance_heads as deep_instance_heads
-from official.vision.beta.tasks import maskrcnn
+from official.vision.modeling import backbones
+from official.vision.modeling.decoders import factory as decoder_factory
+from official.vision.modeling.heads import dense_prediction_heads
+from official.vision.modeling.heads import instance_heads
+from official.vision.modeling.layers import detection_generator
+from official.vision.modeling.layers import mask_sampler
+from official.vision.modeling.layers import roi_aligner
+from official.vision.modeling.layers import roi_generator
+from official.vision.modeling.layers import roi_sampler
+from official.vision.tasks import maskrcnn
 
 
 # Taken from modeling/factory.py

official/vision/beta/projects/panoptic_maskrcnn/configs/panoptic_maskrcnn.py

@@ -22,10 +22,10 @@ from official.core import config_definitions as cfg
 from official.core import exp_factory
 from official.modeling import hyperparams
 from official.modeling import optimization
-from official.vision.beta.configs import common
-from official.vision.beta.configs import maskrcnn
-from official.vision.beta.configs import semantic_segmentation
 from official.vision.beta.projects.deepmac_maskrcnn.configs import deep_mask_head_rcnn as deepmac_maskrcnn
+from official.vision.configs import common
+from official.vision.configs import maskrcnn
+from official.vision.configs import semantic_segmentation
 
 
 SEGMENTATION_MODEL = semantic_segmentation.SemanticSegmentationModel

official/vision/beta/projects/panoptic_maskrcnn/dataloaders/panoptic_maskrcnn_input.py

@@ -16,9 +16,9 @@
 
 import tensorflow as tf
 
-from official.vision.beta.dataloaders import maskrcnn_input
-from official.vision.beta.dataloaders import tf_example_decoder
-from official.vision.beta.ops import preprocess_ops
+from official.vision.dataloaders import maskrcnn_input
+from official.vision.dataloaders import tf_example_decoder
+from official.vision.ops import preprocess_ops
 
 
 class TfExampleDecoder(tf_example_decoder.TfExampleDecoder):

official/vision/beta/projects/panoptic_maskrcnn/modeling/factory.py

@@ -16,9 +16,7 @@
 
 import tensorflow as tf
 
-from official.vision.beta.modeling import backbones
-from official.vision.beta.modeling.decoders import factory as decoder_factory
-from official.vision.beta.modeling.heads import segmentation_heads
+
 from official.vision.beta.projects.panoptic_maskrcnn.configs import panoptic_deeplab as panoptic_deeplab_cfg
 from official.vision.beta.projects.deepmac_maskrcnn.tasks import deep_mask_head_rcnn
 from official.vision.beta.projects.panoptic_maskrcnn.configs import panoptic_maskrcnn as panoptic_maskrcnn_cfg
@@ -27,6 +25,9 @@ from official.vision.beta.projects.panoptic_maskrcnn.modeling.heads import panop
 from official.vision.beta.projects.panoptic_maskrcnn.modeling import panoptic_maskrcnn_model
 from official.vision.beta.projects.panoptic_maskrcnn.modeling.layers import panoptic_segmentation_generator
 from official.vision.beta.projects.panoptic_maskrcnn.modeling.layers import panoptic_deeplab_merge
+from official.vision.modeling import backbones
+from official.vision.modeling.decoders import factory as decoder_factory
+from official.vision.modeling.heads import segmentation_heads
 
 
 def build_panoptic_maskrcnn(

official/vision/beta/projects/panoptic_maskrcnn/modeling/factory_test.py

@@ -19,30 +19,29 @@ import numpy as np
 import tensorflow as tf
 from tensorflow.python.distribute import combinations
 
-from official.vision.beta.configs import backbones
-from official.vision.beta.configs import decoders
-from official.vision.beta.configs import semantic_segmentation
 from official.vision.beta.projects.panoptic_maskrcnn.configs import panoptic_maskrcnn as panoptic_maskrcnn_cfg
 from official.vision.beta.projects.panoptic_maskrcnn.configs import panoptic_deeplab as panoptic_deeplab_cfg
-
 from official.vision.beta.projects.panoptic_maskrcnn.modeling import factory
+from official.vision.configs import backbones
+from official.vision.configs import decoders
+from official.vision.configs import semantic_segmentation
 
 
 class PanopticMaskRCNNBuilderTest(parameterized.TestCase, tf.test.TestCase):
 
   @parameterized.parameters(
-      ('resnet', (640, 640), 'dilated_resnet', 'fpn', 'panoptic_fpn_fusion'),
-      ('resnet', (640, 640), 'dilated_resnet', 'aspp', 'deeplabv3plus'),
-      ('resnet', (640, 640), None, 'fpn', 'panoptic_fpn_fusion'),
-      ('resnet', (640, 640), None, 'aspp', 'deeplabv3plus'),
-      ('resnet', (640, 640), None, None, 'panoptic_fpn_fusion'),
-      ('resnet', (None, None), 'dilated_resnet', 'fpn', 'panoptic_fpn_fusion'),
-      ('resnet', (None, None), 'dilated_resnet', 'aspp', 'deeplabv3plus'),
-      ('resnet', (None, None), None, 'fpn', 'panoptic_fpn_fusion'),
-      ('resnet', (None, None), None, 'aspp', 'deeplabv3plus'),
-      ('resnet', (None, None), None, None, 'deeplabv3plus'))
+      ('resnet', (640, 640), 'dilated_resnet', 'fpn'),
+      ('resnet', (640, 640), 'dilated_resnet', 'aspp'),
+      ('resnet', (640, 640), None, 'fpn'),
+      ('resnet', (640, 640), None, 'aspp'),
+      ('resnet', (640, 640), None, None),
+      ('resnet', (None, None), 'dilated_resnet', 'fpn'),
+      ('resnet', (None, None), 'dilated_resnet', 'aspp'),
+      ('resnet', (None, None), None, 'fpn'),
+      ('resnet', (None, None), None, 'aspp'),
+      ('resnet', (None, None), None, None))
   def test_builder(self, backbone_type, input_size, segmentation_backbone_type,
-                   segmentation_decoder_type, fusion_type):
+                   segmentation_decoder_type):
     num_classes = 2
     input_specs = tf.keras.layers.InputSpec(
         shape=[None, input_size[0], input_size[1], 3])

official/vision/beta/projects/panoptic_maskrcnn/modeling/panoptic_maskrcnn_model_test.py

@@ -15,25 +15,26 @@
 """Tests for panoptic_maskrcnn_model.py."""
 
 import os
+
 from absl.testing import parameterized
 import tensorflow as tf
 
 from tensorflow.python.distribute import combinations
 from tensorflow.python.distribute import strategy_combinations
-from official.vision.beta.modeling.backbones import resnet
-from official.vision.beta.modeling.decoders import aspp
-from official.vision.beta.modeling.decoders import fpn
-from official.vision.beta.modeling.heads import dense_prediction_heads
-from official.vision.beta.modeling.heads import instance_heads
-from official.vision.beta.modeling.heads import segmentation_heads
-from official.vision.beta.modeling.layers import detection_generator
-from official.vision.beta.modeling.layers import mask_sampler
-from official.vision.beta.modeling.layers import roi_aligner
-from official.vision.beta.modeling.layers import roi_generator
-from official.vision.beta.modeling.layers import roi_sampler
-from official.vision.beta.ops import anchor
 from official.vision.beta.projects.panoptic_maskrcnn.modeling import panoptic_maskrcnn_model
 from official.vision.beta.projects.panoptic_maskrcnn.modeling.layers import panoptic_segmentation_generator
+from official.vision.modeling.backbones import resnet
+from official.vision.modeling.decoders import aspp
+from official.vision.modeling.decoders import fpn
+from official.vision.modeling.heads import dense_prediction_heads
+from official.vision.modeling.heads import instance_heads
+from official.vision.modeling.heads import segmentation_heads
+from official.vision.modeling.layers import detection_generator
+from official.vision.modeling.layers import mask_sampler
+from official.vision.modeling.layers import roi_aligner
+from official.vision.modeling.layers import roi_generator
+from official.vision.modeling.layers import roi_sampler
+from official.vision.ops import anchor
 
 
 class PanopticMaskRCNNModelTest(parameterized.TestCase, tf.test.TestCase):

official/vision/beta/projects/panoptic_maskrcnn/serving/export_saved_model.py

@@ -43,7 +43,7 @@ from official.vision.beta.projects.panoptic_maskrcnn.configs import panoptic_mas
 from official.vision.beta.projects.panoptic_maskrcnn.modeling import factory
 from official.vision.beta.projects.panoptic_maskrcnn.serving import panoptic_segmentation
 from official.vision.beta.projects.panoptic_maskrcnn.tasks import panoptic_maskrcnn as task  # pylint: disable=unused-import
-from official.vision.beta.serving import export_saved_model_lib
+from official.vision.serving import export_saved_model_lib
 
 FLAGS = flags.FLAGS
 

official/vision/beta/projects/panoptic_maskrcnn/serving/panoptic_segmentation.py

@@ -20,7 +20,7 @@ import tensorflow as tf
 
 from official.core import config_definitions as cfg
 from official.vision.beta.projects.panoptic_maskrcnn.modeling import panoptic_maskrcnn_model
-from official.vision.beta.serving import detection
+from official.vision.serving import detection
 
 
 class PanopticSegmentationModule(detection.DetectionModule):