Internal change

PiperOrigin-RevId: 473775964

official/vision/beta/projects/panoptic_maskrcnn/README.md → official/projects/panoptic/README.md

@@ -73,7 +73,7 @@ $ python3 train.py \
   --model_dir $MODEL_DIR \
   --params_override=$OVERRIDES
 ```
-**Note**: The [PanopticSegmentationGenerator](https://github.com/tensorflow/models/blob/ac7f9e7f2d0508913947242bad3e23ef7cae5a43/official/vision/beta/projects/panoptic_maskrcnn/modeling/layers/panoptic_segmentation_generator.py#L22) layer uses dynamic shapes and hence generating panoptic masks is not supported on Cloud TPUs. Running evaluation on Cloud TPUs is not supported for the same reason. However, training is supported on both Cloud TPUs and GPUs.
+**Note**: The [PanopticSegmentationGenerator](https://github.com/tensorflow/models/blob/ac7f9e7f2d0508913947242bad3e23ef7cae5a43/official/projects/panoptic/modeling/layers/panoptic_segmentation_generator.py#L22) layer uses dynamic shapes and hence generating panoptic masks is not supported on Cloud TPUs. Running evaluation on Cloud TPUs is not supported for the same reason. However, training is supported on both Cloud TPUs and GPUs.
 ## Pretrained Models
 ### Panoptic FPN
 Backbone     | Schedule     | Experiment name             | Box mAP |  Mask mAP  | Overall PQ | Things PQ | Stuff PQ | Checkpoints

official/vision/beta/projects/panoptic_maskrcnn/losses/panoptic_deeplab_losses.py → official/projects/panoptic/losses/panoptic_deeplab_losses.py

@@ -17,7 +17,7 @@
 import tensorflow as tf
 
 from official.modeling import tf_utils
-from official.vision.beta.projects.panoptic_maskrcnn.ops import mask_ops
+from official.projects.panoptic.ops import mask_ops
 
 EPSILON = 1e-5
 

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

@@ -18,13 +18,13 @@ from typing import Optional
 import tensorflow as tf
 
 from official.projects.deepmac_maskrcnn.tasks import deep_mask_head_rcnn
-from official.vision.beta.projects.panoptic_maskrcnn.configs import panoptic_deeplab as panoptic_deeplab_cfg
-from official.vision.beta.projects.panoptic_maskrcnn.configs import panoptic_maskrcnn as panoptic_maskrcnn_cfg
-from official.vision.beta.projects.panoptic_maskrcnn.modeling import panoptic_deeplab_model
-from official.vision.beta.projects.panoptic_maskrcnn.modeling import panoptic_maskrcnn_model
-from official.vision.beta.projects.panoptic_maskrcnn.modeling.heads import panoptic_deeplab_heads
-from official.vision.beta.projects.panoptic_maskrcnn.modeling.layers import panoptic_deeplab_merge
-from official.vision.beta.projects.panoptic_maskrcnn.modeling.layers import panoptic_segmentation_generator
+from official.projects.panoptic.configs import panoptic_deeplab as panoptic_deeplab_cfg
+from official.projects.panoptic.configs import panoptic_maskrcnn as panoptic_maskrcnn_cfg
+from official.projects.panoptic.modeling import panoptic_deeplab_model
+from official.projects.panoptic.modeling import panoptic_maskrcnn_model
+from official.projects.panoptic.modeling.heads import panoptic_deeplab_heads
+from official.projects.panoptic.modeling.layers import panoptic_deeplab_merge
+from official.projects.panoptic.modeling.layers import panoptic_segmentation_generator
 from official.vision.modeling import backbones
 from official.vision.modeling.decoders import factory as decoder_factory
 from official.vision.modeling.heads import segmentation_heads

official/vision/beta/projects/panoptic_maskrcnn/modeling/heads/panoptic_deeplab_heads.py → official/projects/panoptic/modeling/heads/panoptic_deeplab_heads.py

@@ -14,11 +14,11 @@
 
 """Contains definitions for Panoptic Deeplab heads."""
 
-from typing import List, Union, Optional, Mapping, Tuple
+from typing import List, Mapping, Optional, Tuple, Union
 import tensorflow as tf
 
 from official.modeling import tf_utils
-from official.vision.beta.projects.panoptic_maskrcnn.modeling.layers import fusion_layers
+from official.projects.panoptic.modeling.layers import fusion_layers
 from official.vision.ops import spatial_transform_ops
 
 

official/vision/beta/projects/panoptic_maskrcnn/modeling/layers/panoptic_deeplab_merge.py → official/projects/panoptic/modeling/layers/panoptic_deeplab_merge.py

@@ -21,11 +21,11 @@ with minor changes.
 """
 
 import functools
-from typing import List, Tuple, Dict, Text
+from typing import Dict, List, Text, Tuple
 
 import tensorflow as tf
 
-from official.vision.beta.projects.panoptic_maskrcnn.ops import mask_ops
+from official.projects.panoptic.ops import mask_ops
 
 
 def _add_zero_padding(input_tensor: tf.Tensor, kernel_size: int,

official/vision/beta/projects/panoptic_maskrcnn/modeling/layers/panoptic_segmentation_generator.py → official/projects/panoptic/modeling/layers/panoptic_segmentation_generator.py

@@ -18,7 +18,7 @@ from typing import List, Optional
 
 import tensorflow as tf
 
-from official.vision.beta.projects.panoptic_maskrcnn.modeling.layers import paste_masks
+from official.projects.panoptic.modeling.layers import paste_masks
 
 
 class PanopticSegmentationGenerator(tf.keras.layers.Layer):

official/vision/beta/projects/panoptic_maskrcnn/modeling/panoptic_deeplab_model.py → official/projects/panoptic/modeling/panoptic_deeplab_model.py

@@ -16,7 +16,7 @@
 from typing import Any, Mapping, Optional, Union
 
 import tensorflow as tf
-from official.vision.beta.projects.panoptic_maskrcnn.modeling.layers import panoptic_deeplab_merge
+from official.projects.panoptic.modeling.layers import panoptic_deeplab_merge
 
 
 @tf.keras.utils.register_keras_serializable(package='Vision')

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

@@ -40,15 +40,15 @@ import tensorflow as tf
 from official.core import exp_factory
 from official.modeling import hyperparams
 # pylint: disable=unused-import
-from official.vision.beta.projects.panoptic_maskrcnn.configs import panoptic_deeplab as panoptic_deeplab_cfg
-from official.vision.beta.projects.panoptic_maskrcnn.configs import panoptic_maskrcnn as panoptic_maskrcnn_cfg
+from official.projects.panoptic.configs import panoptic_deeplab as panoptic_deeplab_cfg
+from official.projects.panoptic.configs import panoptic_maskrcnn as panoptic_maskrcnn_cfg
 # pylint: enable=unused-import
-from official.vision.beta.projects.panoptic_maskrcnn.modeling import factory
-from official.vision.beta.projects.panoptic_maskrcnn.serving import panoptic_deeplab
-from official.vision.beta.projects.panoptic_maskrcnn.serving import panoptic_maskrcnn
+from official.projects.panoptic.modeling import factory
+from official.projects.panoptic.serving import panoptic_deeplab
+from official.projects.panoptic.serving import panoptic_maskrcnn
 # pylint: disable=unused-import
-from official.vision.beta.projects.panoptic_maskrcnn.tasks import panoptic_deeplab as panoptic_deeplab_task
-from official.vision.beta.projects.panoptic_maskrcnn.tasks import panoptic_maskrcnn as panoptic_maskrcnn_task
+from official.projects.panoptic.tasks import panoptic_deeplab as panoptic_deeplab_task
+from official.projects.panoptic.tasks import panoptic_maskrcnn as panoptic_maskrcnn_task
 # pylint: enable=unused-import
 from official.vision.serving import export_saved_model_lib