tf-models-nightly 2.13.1.dev20230811__py2.py3-none-any.whl → 2.13.1.dev20230813__py2.py3-none-any.whl

official/core/config_definitions.py

@@ -214,6 +214,7 @@ class TrainerConfig(base_config.Config):
     train_tf_while_loop: whether or not to use tf while loop.
     train_tf_function: whether or not to use tf_function for training loop.
     eval_tf_function: whether or not to use tf_function for eval.
+    eval_tf_while_loop: whether or not to use tf while loop for eval.
     allow_tpu_summary: Whether to allow summary happen inside the XLA program
       runs on TPU through automatic outside compilation.
     steps_per_loop: number of steps per loop to report training metrics. This

official/nlp/modeling/networks/funnel_transformer.py

@@ -528,9 +528,15 @@ class FunnelTransformerEncoder(tf.keras.layers.Layer):
           axes=[1])
 
       for i, layer in enumerate(self._transformer_layers):
+        transformer_output_range = None
+        if i == self._num_layers - 1:
+          transformer_output_range = output_range
+
         # Bypass no pooling cases.
         if self._pool_strides[i] == 1:
-          x = layer([x, x, attention_mask])
+          x = layer(
+              [x, x, attention_mask], output_range=transformer_output_range
+          )
         else:
           # Pools layer for compressing the query length.
           pooled_inputs = self._att_input_pool_layers[i](
@@ -541,8 +547,7 @@ class FunnelTransformerEncoder(tf.keras.layers.Layer):
                   dtype=pooled_inputs.dtype), pooled_inputs),
               axis=1)
           x = layer([query_inputs, x, attention_mask],
-                    output_range=output_range if i == self._num_layers -
-                    1 else None)
+                    output_range=transformer_output_range)
         # Pools the corresponding attention_mask.
         if i < len(self._transformer_layers) - 1:
           attention_mask = _pool_and_concat(

official/nlp/modeling/networks/funnel_transformer_test.py

@@ -245,24 +245,32 @@ class FunnelTransformerEncoderTest(parameterized.TestCase, tf.test.TestCase):
     self.assertAllEqual(tf.float32, pooled.dtype)
 
   @parameterized.named_parameters(
-      ("all_sequence", None, 3, 0),
-      ("output_range", 1, 1, 0),
-      ("all_sequence_with_unpool", None, 4, 1),
-      ("output_range_with_unpool", 1, 1, 1),
-      ("output_range_with_large_unpool", 1, 1, 2),
+      ("all_sequence", None, 3, 0, 2),
+      ("output_range", 1, 1, 0, 2),
+      ("all_sequence_with_unpool", None, 4, 1, 2),
+      ("output_range_with_unpool", 1, 1, 1, 2),
+      ("output_range_with_large_unpool", 1, 1, 2, 2),
+      ("output_range_with_no_pooling", 1, 1, 0, 1),
+      ("output_range_with_unpool_and_no_pooling", 1, 1, 1, 1),
   )
-  def test_network_invocation(self, output_range, out_seq_len, unpool_length):
+  def test_network_invocation(
+      self,
+      output_range,
+      out_seq_len,
+      unpool_length,
+      pool_stride,
+  ):
     hidden_size = 32
     sequence_length = 21
     vocab_size = 57
     num_types = 7
-    pool_stride = 2
+    num_layers = 3
     # Create a small FunnelTransformerEncoder for testing.
     test_network = funnel_transformer.FunnelTransformerEncoder(
         vocab_size=vocab_size,
         hidden_size=hidden_size,
         num_attention_heads=2,
-        num_layers=3,
+        num_layers=num_layers,
         type_vocab_size=num_types,
         pool_stride=pool_stride,
         unpool_length=unpool_length)
@@ -297,7 +305,7 @@ class FunnelTransformerEncoderTest(parameterized.TestCase, tf.test.TestCase):
         hidden_size=hidden_size,
         max_sequence_length=max_sequence_length,
         num_attention_heads=2,
-        num_layers=3,
+        num_layers=num_layers,
         type_vocab_size=num_types,
         pool_stride=pool_stride)
     dict_outputs = test_network([word_ids, mask, type_ids])
@@ -305,7 +313,10 @@ class FunnelTransformerEncoderTest(parameterized.TestCase, tf.test.TestCase):
     pooled = dict_outputs["pooled_output"]
     model = tf.keras.Model([word_ids, mask, type_ids], [data, pooled])
     outputs = model.predict([word_id_data, mask_data, type_id_data])
-    self.assertEqual(outputs[0].shape[1], 3)
+    expected_sequence_length = float(sequence_length)
+    for _ in range(num_layers):
+      expected_sequence_length = np.ceil(expected_sequence_length / pool_stride)
+    self.assertEqual(outputs[0].shape[1], expected_sequence_length)
 
     # Creates a FunnelTransformerEncoder with embedding_width != hidden_size
     test_network = funnel_transformer.FunnelTransformerEncoder(

{tf_models_nightly-2.13.1.dev20230811.dist-info → tf_models_nightly-2.13.1.dev20230813.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tf-models-nightly
-Version: 2.13.1.dev20230811
+Version: 2.13.1.dev20230813
 Summary: TensorFlow Official Models
 Home-page: https://github.com/tensorflow/models
 Author: Google Inc.

{tf_models_nightly-2.13.1.dev20230811.dist-info → tf_models_nightly-2.13.1.dev20230813.dist-info}/RECORD

@@ -12,7 +12,7 @@ official/core/actions_test.py,sha256=NfT4ywnRcQNFY7i4xm_uE9qPinON-20lidBkkRYVEuo
 official/core/base_task.py,sha256=6zy7OldZtiYvH2o4TPwzkxqZd763u5P2tXN8H9aeC30,12958
 official/core/base_trainer.py,sha256=n_dxBOifRBD7G24W_8N2_Jj9kHUVSadvRaB9eEGA0pk,18115
 official/core/base_trainer_test.py,sha256=jijBCetnQgVl0yDSUq8NbtW8eOn2PfStkapW5Z1AZSs,13011
-official/core/config_definitions.py,sha256=cGUHTe0NaFnxKpZAUBWpEvraJyJdkKlWa-3-hKySG3w,15333
+official/core/config_definitions.py,sha256=yYwFEQJgu_zCx6DJZSywi0IBrs1WbPpWazU2sn2G-6s,15403
 official/core/exp_factory.py,sha256=PzCIJEDseAhPUGwEOq6ca3CvNyJSWGDIb53YgI_Jw6s,1115
 official/core/export_base.py,sha256=V4BKNiBzzMcHTgjYTUXQgQwoZNZbCJbXWf53-_C_2ws,7025
 official/core/export_base_test.py,sha256=npqecqCdi2ovmuCWa3fBHCeST-oAvY4zgKg7BCEzWo8,4426
@@ -401,8 +401,8 @@ official/nlp/modeling/networks/encoder_scaffold.py,sha256=lHVTrsiXtS6KpodRinQ9MO
 official/nlp/modeling/networks/encoder_scaffold_test.py,sha256=ENzW6quIUE5Py-x6PtCbk0H4CaUZBwNb9HINTizV6tM,29056
 official/nlp/modeling/networks/fnet.py,sha256=fZ2xTvUilybR7BfiSBxj_5BRXe9qQwLo-BqWfyjRDxQ,14576
 official/nlp/modeling/networks/fnet_test.py,sha256=QuwBd5QsiCzTbqMkPsLSJ9g8QRWIGHQSpmAFCzTRc8Y,4543
-official/nlp/modeling/networks/funnel_transformer.py,sha256=1V7hkknqyJfHVItXRcnSXgxQyRcnHFTDrlNAeSsZnCo,23970
-official/nlp/modeling/networks/funnel_transformer_test.py,sha256=xa5gX6cfTwx0zTvJeA8i5jurCYEKv1Wpz2iEH84vIgE,17167
+official/nlp/modeling/networks/funnel_transformer.py,sha256=uC0oqJxeqAyRWkX4h9nXIyyBYOXYzLloxIUDnkIdhr8,24117
+official/nlp/modeling/networks/funnel_transformer_test.py,sha256=EchGCgslROR3qbpWGYmaATf4s9dQQ5lOWi5wz5TU1qI,17552
 official/nlp/modeling/networks/mobile_bert_encoder.py,sha256=swq2x5cpQUrh7yk77c7kGIzTX_xgG2ebGFQaqTU1vAM,7533
 official/nlp/modeling/networks/mobile_bert_encoder_test.py,sha256=Da8r3YPzs0G-YJF3ooQkhO7NFudL6hkAgl9cebpqHUs,7105
 official/nlp/modeling/networks/packed_sequence_embedding.py,sha256=4CGzp27Bw9Ia2cTCfjjK1Wqa_cLfmWFSiZfj4uGQJZ8,12800
@@ -1110,9 +1110,9 @@ tensorflow_models/__init__.py,sha256=Ciz_YBke6teb6y42QyQTUBDdXJAiV7Qdu1zOoZvYiKw
 tensorflow_models/tensorflow_models_test.py,sha256=Kz2y4V-rtBhZFFfKD2soCq52hviSfJVV1L2ztqS-9oM,1385
 tensorflow_models/nlp/__init__.py,sha256=3dULDpUBpDi9vljpXadq6oJrWH4y6z42Bz2d3hopYZw,807
 tensorflow_models/vision/__init__.py,sha256=4y77XkHaH8qLls3-6ta4tMp3Xj8CLbB0ihH91HsQ9z4,833
-tf_models_nightly-2.13.1.dev20230811.dist-info/AUTHORS,sha256=1dG3fXVu9jlo7bul8xuix5F5vOnczMk7_yWn4y70uw0,337
-tf_models_nightly-2.13.1.dev20230811.dist-info/LICENSE,sha256=WxeBS_DejPZQabxtfMOM_xn8qoZNJDQjrT7z2wG1I4U,11512
-tf_models_nightly-2.13.1.dev20230811.dist-info/METADATA,sha256=-4PzH_YIWJQ7bNpCt3ehGSyCHkHPD37-D6GwGHkuz_s,1395
-tf_models_nightly-2.13.1.dev20230811.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
-tf_models_nightly-2.13.1.dev20230811.dist-info/top_level.txt,sha256=gum2FfO5R4cvjl2-QtP-S1aNmsvIZaFFT6VFzU0f4-g,33
-tf_models_nightly-2.13.1.dev20230811.dist-info/RECORD,,
+tf_models_nightly-2.13.1.dev20230813.dist-info/AUTHORS,sha256=1dG3fXVu9jlo7bul8xuix5F5vOnczMk7_yWn4y70uw0,337
+tf_models_nightly-2.13.1.dev20230813.dist-info/LICENSE,sha256=WxeBS_DejPZQabxtfMOM_xn8qoZNJDQjrT7z2wG1I4U,11512
+tf_models_nightly-2.13.1.dev20230813.dist-info/METADATA,sha256=OF5TjgUSsS-GtDUKpZDZDupLyW2k2YTh4Cai9xeELLo,1395
+tf_models_nightly-2.13.1.dev20230813.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
+tf_models_nightly-2.13.1.dev20230813.dist-info/top_level.txt,sha256=gum2FfO5R4cvjl2-QtP-S1aNmsvIZaFFT6VFzU0f4-g,33
+tf_models_nightly-2.13.1.dev20230813.dist-info/RECORD,,