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

official/vision/beta/projects/movinet/configs/movinet.py → official/projects/movinet/configs/movinet.py

@@ -126,7 +126,7 @@ class MovinetModel(video_classification.VideoClassificationModel):
   model_type: str = 'movinet'
   backbone: Backbone3D = Backbone3D()
   norm_activation: common.NormActivation = common.NormActivation(
-      activation='swish',
+      activation=None,  # legacy flag, not used.
       norm_momentum=0.99,
       norm_epsilon=1e-3,
       use_sync_bn=True)

official/vision/beta/projects/movinet/configs/movinet_test.py → official/projects/movinet/configs/movinet_test.py

@@ -19,8 +19,8 @@ import tensorflow as tf
 
 from official.core import config_definitions as cfg
 from official.core import exp_factory
+from official.projects.movinet.configs import movinet
 from official.vision.beta.configs import video_classification as exp_cfg
-from official.vision.beta.projects.movinet.configs import movinet
 
 
 class MovinetConfigTest(tf.test.TestCase, parameterized.TestCase):

official/vision/beta/projects/movinet/export_saved_model.py → official/projects/movinet/export_saved_model.py

@@ -55,8 +55,8 @@ from absl import app
 from absl import flags
 import tensorflow as tf
 
-from official.vision.beta.projects.movinet.modeling import movinet
-from official.vision.beta.projects.movinet.modeling import movinet_model
+from official.projects.movinet.modeling import movinet
+from official.projects.movinet.modeling import movinet_model
 
 flags.DEFINE_string(
     'export_path', '/tmp/movinet/',

official/vision/beta/projects/movinet/export_saved_model_test.py → official/projects/movinet/export_saved_model_test.py

@@ -18,7 +18,7 @@ from absl import flags
 import tensorflow as tf
 import tensorflow_hub as hub
 
-from official.vision.beta.projects.movinet import export_saved_model
+from official.projects.movinet import export_saved_model
 
 FLAGS = flags.FLAGS
 

official/projects/movinet/modeling/__init__.py

+# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+