[Refactor] TF models: move all contents of transformer to nlp/transformer

PiperOrigin-RevId: 294997928

official/transformer/utils/metrics.py → official/nlp/transformer/utils/metrics.py

@@ -33,7 +33,7 @@ import math
 import numpy as np
 import six
 from six.moves import xrange  # pylint: disable=redefined-builtin
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 
 def _pad_tensors_to_same_length(x, y):

official/transformer/utils/tokenizer_test.py → official/nlp/transformer/utils/tokenizer_test.py

@@ -19,7 +19,7 @@ import tempfile
 
 import tensorflow as tf  # pylint: disable=g-bad-import-order
 
-from official.transformer.utils import tokenizer
+from official.nlp.transformer.utils import tokenizer
 
 
 class SubtokenizerTest(tf.test.TestCase):

official/r1/transformer/transformer.py

@@ -22,14 +22,14 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf  # pylint: disable=g-bad-import-order
+import tensorflow as tf
 
 from official.nlp.transformer import beam_search_v1 as beam_search
 from official.nlp.transformer import model_utils
+from official.nlp.transformer.utils.tokenizer import EOS_ID
 from official.r1.transformer import attention_layer
 from official.r1.transformer import embedding_layer
 from official.r1.transformer import ffn_layer
-from official.transformer.utils.tokenizer import EOS_ID
 
 _NEG_INF = -1e9
 

official/r1/transformer/transformer_main.py

@@ -39,9 +39,9 @@ from official.r1.transformer import translate
 from official.r1.transformer import transformer
 from official.r1.transformer import dataset
 from official.r1.transformer import schedule
-from official.transformer import compute_bleu
-from official.transformer.utils import metrics
-from official.transformer.utils import tokenizer
+from official.nlp.transformer import compute_bleu
+from official.nlp.transformer.utils import metrics
+from official.nlp.transformer.utils import tokenizer
 from official.utils.flags import core as flags_core
 from official.utils.logs import hooks_helper
 from official.utils.logs import logger

official/r1/transformer/translate.py

@@ -26,7 +26,7 @@ from absl import flags
 import tensorflow as tf
 # pylint: enable=g-bad-import-order
 
-from official.transformer.utils import tokenizer
+from official.nlp.transformer.utils import tokenizer
 from official.utils.flags import core as flags_core
 
 _DECODE_BATCH_SIZE = 32

official/utils/misc/distribution_utils.py

@@ -22,7 +22,7 @@ import json
 import os
 import random
 import string
-import tensorflow as tf
+import tensorflow.compat.v2 as tf
 
 from official.utils.misc import tpu_lib
 

official/utils/misc/distribution_utils_test.py

@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf  # pylint: disable=g-bad-import-order
+import tensorflow.compat.v2 as tf
 
 from official.utils.misc import distribution_utils