Merge branch 'tensorflow:master' into panoptic-deeplab-modeling

official/projects/triviaqa/prediction.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/projects/triviaqa/preprocess.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/projects/triviaqa/sentencepiece_pb2.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/projects/triviaqa/train.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/vision/beta/projects/vit/configs/__init__.py → official/projects/vit/configs/__init__.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.
@@ -15,4 +15,4 @@
 # Lint as: python3
 """Configs package definition."""
 
-from official.vision.beta.projects.vit.configs import image_classification
+from official.projects.vit.configs import image_classification

official/vision/beta/projects/vit/configs/backbones.py → official/projects/vit/configs/backbones.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/vision/beta/projects/vit/configs/image_classification.py → official/projects/vit/configs/image_classification.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.
@@ -26,7 +26,7 @@ from official.modeling import hyperparams
 from official.modeling import optimization
 from official.vision.beta.configs import common
 from official.vision.beta.configs import image_classification as img_cls_cfg
-from official.vision.beta.projects.vit.configs import backbones
+from official.projects.vit.configs import backbones
 from official.vision.beta.tasks import image_classification
 
 DataConfig = img_cls_cfg.DataConfig

official/vision/beta/projects/vit/modeling/nn_blocks.py → official/projects/vit/modeling/nn_blocks.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/vision/beta/projects/vit/modeling/vit.py → official/projects/vit/modeling/vit.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.
@@ -17,9 +17,9 @@
 import tensorflow as tf
 
 from official.modeling import activations
+from official.projects.vit.modeling import nn_blocks
 from official.vision.beta.modeling.backbones import factory
 from official.vision.beta.modeling.layers import nn_layers
-from official.vision.beta.projects.vit.modeling import nn_blocks
 
 
 layers = tf.keras.layers

official/vision/beta/projects/vit/modeling/vit_test.py → official/projects/vit/modeling/vit_test.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.
@@ -18,7 +18,7 @@
 from absl.testing import parameterized
 import tensorflow as tf
 
-from official.vision.beta.projects.vit.modeling import vit
+from official.projects.vit.modeling import vit
 
 
 class VisionTransformerTest(parameterized.TestCase, tf.test.TestCase):

official/vision/beta/projects/vit/train.py → official/projects/vit/train.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.
@@ -18,9 +18,9 @@
 from absl import app
 
 from official.common import flags as tfm_flags
+from official.projects.vit import configs  # pylint: disable=unused-import
+from official.projects.vit.modeling import vit  # pylint: disable=unused-import
 from official.vision.beta import train
-from official.vision.beta.projects.vit import configs  # pylint: disable=unused-import
-from official.vision.beta.projects.vit.modeling import vit  # pylint: disable=unused-import
 
 
 if __name__ == '__main__':

official/projects/volumetric_models/configs/backbones.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/projects/volumetric_models/configs/decoders.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/projects/volumetric_models/configs/semantic_segmentation_3d.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/projects/volumetric_models/configs/semantic_segmentation_3d_test.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/projects/volumetric_models/dataloaders/segmentation_input_3d.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/projects/volumetric_models/dataloaders/segmentation_input_3d_test.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/projects/volumetric_models/evaluation/segmentation_metrics.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.

official/projects/volumetric_models/evaluation/segmentation_metrics_test.py

-# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+# Copyright 2022 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.