tf-models-nightly 2.12.0.dev20230501__py2.py3-none-any.whl → 2.12.0.dev20230502__py2.py3-none-any.whl

official/nlp/modeling/layers/tn_expand_condense_test.py

@@ -27,7 +27,7 @@ class TNLayerTest(tf.test.TestCase, parameterized.TestCase):
   """
 
   def setUp(self):
-    super(TNLayerTest, self).setUp()
+    super().setUp()
     self.labels = np.concatenate((np.ones((50, 1)), np.zeros((50, 1))), axis=0)
 
   def _build_model(self, data, proj_multiple=2):
@@ -41,21 +41,6 @@ class TNLayerTest(tf.test.TestCase, parameterized.TestCase):
     model.add(tf.keras.layers.Dense(1, activation='sigmoid'))
     return model
 
-  @parameterized.parameters((768, 6), (1024, 2))
-  def test_keras_layer(self, input_dim, proj_multiple):
-    data = np.random.normal(size=(100, input_dim))
-    data = data.astype(np.float32)
-    tf.keras.__internal__.utils.layer_test(
-        TNExpandCondense,
-        kwargs={
-            'proj_multiplier': proj_multiple,
-            'input_shape': data.shape
-        },
-        input_shape=data.shape,
-        input_data=data,
-        expected_output_shape=(None, data.shape[-1]),
-        expected_output_dtype=data.dtype)
-
   @parameterized.parameters((768, 6), (1024, 2))
   def test_train(self, input_dim, proj_multiple):
     tf.keras.utils.set_random_seed(0)

official/projects/yolo/serving/export_module_factory.py

@@ -21,6 +21,7 @@ import tensorflow as tf
 from official.core import config_definitions as cfg
 from official.core import export_base
 from official.projects.yolo.configs.yolo import YoloTask
+from official.projects.yolo.configs.yolov7 import YoloV7Task
 from official.projects.yolo.modeling import factory as yolo_factory
 from official.projects.yolo.modeling.backbones import darknet  # pylint: disable=unused-import
 from official.projects.yolo.modeling.decoders import yolo_decoder  # pylint: disable=unused-import
@@ -163,10 +164,16 @@ def create_yolo_export_module(
       input_type, batch_size, input_image_size, num_channels, input_name)
   input_specs = tf.keras.layers.InputSpec(shape=[batch_size] +
                                           input_image_size + [num_channels])
-  model, _ = yolo_factory.build_yolo(
-      input_specs=input_specs,
-      model_config=params.task.model,
-      l2_regularization=None)
+  if isinstance(params.task, YoloTask):
+    model, _ = yolo_factory.build_yolo(
+        input_specs=input_specs,
+        model_config=params.task.model,
+        l2_regularization=None)
+  elif isinstance(params.task, YoloV7Task):
+    model = yolo_factory.build_yolov7(
+        input_specs=input_specs,
+        model_config=params.task.model,
+        l2_regularization=None)
 
   def preprocess_fn(inputs):
     image_tensor = export_utils.parse_image(inputs, input_type,
@@ -247,7 +254,7 @@ def get_export_module(params: cfg.ExperimentConfig,
                                                         input_image_size,
                                                         num_channels,
                                                         input_name)
-  elif isinstance(params.task, YoloTask):
+  elif isinstance(params.task, (YoloTask, YoloV7Task)):
     export_module = create_yolo_export_module(params, input_type, batch_size,
                                               input_image_size, num_channels,
                                               input_name)

official/projects/yolo/serving/export_saved_model.py

@@ -38,9 +38,8 @@ from absl import flags
 
 from official.core import exp_factory
 from official.modeling import hyperparams
-from official.projects.yolo.configs import yolo as cfg  # pylint: disable=unused-import
+from official.projects.yolo.common import registry_imports  # pylint: disable=unused-import
 from official.projects.yolo.serving import export_module_factory
-from official.projects.yolo.tasks import yolo as task  # pylint: disable=unused-import
 from official.vision.serving import export_saved_model_lib
 
 FLAGS = flags.FLAGS

official/vision/utils/object_detection/visualization_utils.py

@@ -878,7 +878,7 @@ def update_detection_state(step_outputs=None) -> Dict[str, Any]:
     else:
       detection_keypoints = None
 
-    if detection_keypoints:
+    if detection_keypoints is not None:
       state['detection_keypoints'] = tf.concat(detection_keypoints, axis=0)
 
     detection_masks = step_outputs['visualization'][1].get(

{tf_models_nightly-2.12.0.dev20230501.dist-info → tf_models_nightly-2.12.0.dev20230502.dist-info}/METADATA

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

{tf_models_nightly-2.12.0.dev20230501.dist-info → tf_models_nightly-2.12.0.dev20230502.dist-info}/RECORD

@@ -355,7 +355,7 @@ official/nlp/modeling/layers/talking_heads_attention_test.py,sha256=oqgiQPsNLpck
 official/nlp/modeling/layers/text_layers.py,sha256=soVaf1cqb7s25Fk0i01wCJE97sscY-PFfVNjpcuJjhs,32516
 official/nlp/modeling/layers/text_layers_test.py,sha256=0aP-lzjnuWrn26HuWncnj7ASIEMFRVrR6W_Mwob3WdE,24245
 official/nlp/modeling/layers/tn_expand_condense.py,sha256=yzCgGwXfTC0Mumn8HmbczZ1pG9JYkpIE2LLb702ADUU,6703
-official/nlp/modeling/layers/tn_expand_condense_test.py,sha256=5yyhG_K_S7J4frq5sq7NmEfjwwiHvVocK-GZB0vqfeA,6434
+official/nlp/modeling/layers/tn_expand_condense_test.py,sha256=LXu-Of1ck-SeTCfUo9gGfL_CFTxPLVpJTQw8NtCX0TU,5890
 official/nlp/modeling/layers/tn_transformer_expand_condense.py,sha256=RK5vryB7W8cU58_BWzfee2id1RB6BT2NVhP9FlYkXYI,11022
 official/nlp/modeling/layers/tn_transformer_test.py,sha256=frCu6LKapVWXw0YLs8_7KMp5qxEOHNBy7yJIZiE17qc,8883
 official/nlp/modeling/layers/transformer.py,sha256=1URI5Z3ZV6DQ2oTgdJIc6EXbgutSlDZ7l-gYoV1HCcE,19414
@@ -761,8 +761,8 @@ official/projects/yolo/optimization/configs/__init__.py,sha256=1ToRMjre4mErL4Ek4
 official/projects/yolo/optimization/configs/optimization_config.py,sha256=NmxuFW64_MYFcBF_SxN-34rkQ7PxAswpxpufBL2GIPA,1998
 official/projects/yolo/optimization/configs/optimizer_config.py,sha256=0YZgwyEQKfEwP44x9wzZ7N01I0bdawqEOgWmezora0Y,2283
 official/projects/yolo/serving/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
-official/projects/yolo/serving/export_module_factory.py,sha256=O_xdB7h7ra_mpKXGEaXW09iiqhh2LiR2B25Wj1j-wTk,9599
-official/projects/yolo/serving/export_saved_model.py,sha256=3NZbcxfkWzwpAEkLs5vOven2cxy3nnYix2mPnIp-05o,4368
+official/projects/yolo/serving/export_module_factory.py,sha256=tRtJbbaLxV1BLm3OTTkyzkkyRrGxOTJdcg4gCuInW6k,9910
+official/projects/yolo/serving/export_saved_model.py,sha256=gOxopjUl4Axp_Z1ArE_QeUW2qM0JiX71I040lQOKDrY,4285
 official/projects/yolo/serving/export_tflite.py,sha256=Pt1rkKu9TxVYB8HtLadJQ_buWzNXqWL8Zp0TFDPUXzw,902
 official/projects/yolo/serving/model_fn.py,sha256=J1i-UPX1TuPqPaBWu2HyhtVHthq6VRbsnR98Sjrs0iY,3008
 official/projects/yolo/tasks/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
@@ -1049,7 +1049,7 @@ official/vision/utils/object_detection/preprocessor.py,sha256=Fklxck111TQEKsrWSM
 official/vision/utils/object_detection/region_similarity_calculator.py,sha256=yqQLLRT80IdAu3K_fILli_u1aL37lv0FpDtFcyRrPzs,4544
 official/vision/utils/object_detection/shape_utils.py,sha256=p3Q7e9gTTQNv1gnMAkuTkfXc6DYVB8mjk_Vjlq7bRlg,3608
 official/vision/utils/object_detection/target_assigner.py,sha256=fTkjedzhp_-RTUGR27tWbmnnLpW7F3lVCkZlr7Nv_9o,24198
-official/vision/utils/object_detection/visualization_utils.py,sha256=sZre2InIcPNO4jbtPjXw_ACwbT-wy84Ql57MmqMFX-k,34515
+official/vision/utils/object_detection/visualization_utils.py,sha256=ldXEkcW0O9Tdm-0HrRhtCi-gm7bho--2ky96DqfVH_o,34527
 orbit/__init__.py,sha256=aQRo8zqIQ0Dw4JQReZeiB6MmuJLvvw4DbYHYti5AGys,1117
 orbit/controller.py,sha256=RFcHfK4ZfgnscJC1uAlHav5SkehM2sFOeatyIpNnfTo,23667
 orbit/controller_test.py,sha256=sx1ok0Epn9gKMtN2bWCavAtIe5Q4WD_hLN2HqD-lsxo,29924
@@ -1083,9 +1083,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.12.0.dev20230501.dist-info/AUTHORS,sha256=1dG3fXVu9jlo7bul8xuix5F5vOnczMk7_yWn4y70uw0,337
-tf_models_nightly-2.12.0.dev20230501.dist-info/LICENSE,sha256=WxeBS_DejPZQabxtfMOM_xn8qoZNJDQjrT7z2wG1I4U,11512
-tf_models_nightly-2.12.0.dev20230501.dist-info/METADATA,sha256=RngQsLLXQRNghqFmRtBPUdSsXzWsnGQdOWQPdT6q2vg,1393
-tf_models_nightly-2.12.0.dev20230501.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
-tf_models_nightly-2.12.0.dev20230501.dist-info/top_level.txt,sha256=gum2FfO5R4cvjl2-QtP-S1aNmsvIZaFFT6VFzU0f4-g,33
-tf_models_nightly-2.12.0.dev20230501.dist-info/RECORD,,
+tf_models_nightly-2.12.0.dev20230502.dist-info/AUTHORS,sha256=1dG3fXVu9jlo7bul8xuix5F5vOnczMk7_yWn4y70uw0,337
+tf_models_nightly-2.12.0.dev20230502.dist-info/LICENSE,sha256=WxeBS_DejPZQabxtfMOM_xn8qoZNJDQjrT7z2wG1I4U,11512
+tf_models_nightly-2.12.0.dev20230502.dist-info/METADATA,sha256=XiV5z3VirmxIf1tN16rxMxsHSF5dNi941h2yEcWKaYo,1393
+tf_models_nightly-2.12.0.dev20230502.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
+tf_models_nightly-2.12.0.dev20230502.dist-info/top_level.txt,sha256=gum2FfO5R4cvjl2-QtP-S1aNmsvIZaFFT6VFzU0f4-g,33
+tf_models_nightly-2.12.0.dev20230502.dist-info/RECORD,,