tf-models-nightly 2.14.0.dev20230930__py2.py3-none-any.whl → 2.14.0.dev20231001__py2.py3-none-any.whl

official/projects/centernet/modeling/layers/detection_generator.py

@@ -34,7 +34,7 @@ class CenterNetDetectionGenerator(tf.keras.layers.Layer):
   """CenterNet Detection Generator."""
 
   def __init__(self,
-               input_image_dims: int = 512,
+               input_image_dims: tuple[int, int] | int = 512,
                net_down_scale: int = 4,
                max_detections: int = 100,
                peak_error: float = 1e-6,
@@ -47,7 +47,10 @@ class CenterNetDetectionGenerator(tf.keras.layers.Layer):
     """Initialize CenterNet Detection Generator.
 
     Args:
-      input_image_dims: An `int` that specifies the input image size.
+      input_image_dims: The input image size. If it is a tuple of two `int`s, it
+        is the size (height, width) of the input images. If it is an `int`, the
+        input images are supposed to be squared images whose height and width
+        are equal.
       net_down_scale: An `int` that specifies stride of the output.
       max_detections: An `int` specifying the maximum number of bounding
         boxes generated. This is an upper bound, so the number of generated
@@ -67,6 +70,9 @@ class CenterNetDetectionGenerator(tf.keras.layers.Layer):
     """
     super(CenterNetDetectionGenerator, self).__init__(**kwargs)
 
+    if isinstance(input_image_dims, int):
+      input_image_dims = (input_image_dims, input_image_dims)
+
     # Object center selection parameters
     self._max_detections = max_detections
     self._peak_error = peak_error
@@ -246,10 +252,28 @@ class CenterNetDetectionGenerator(tf.keras.layers.Layer):
     return boxes, detection_classes
 
   def convert_strided_predictions_to_normalized_boxes(self, boxes: tf.Tensor):
+    """Converts strided predictions to normalized boxes.
+
+    Args:
+      boxes: A tf.Tensor of shape [batch_size, num_predictions, 4], representing
+        the strided predictions of the detected objects.
+
+    Returns:
+      A tf.Tensor of shape [batch_size, num_predictions, 4], representing
+        the normalized boxes of the detected objects.
+    """
     boxes = boxes * tf.cast(self._net_down_scale, boxes.dtype)
-    boxes = boxes / tf.cast(self._input_image_dims, boxes.dtype)
-    boxes = tf.clip_by_value(boxes, 0.0, 1.0)
-    return boxes
+
+    height = tf.cast(self._input_image_dims[0], boxes.dtype)
+    width = tf.cast(self._input_image_dims[1], boxes.dtype)
+    ymin = boxes[..., 0:1] / height
+    xmin = boxes[..., 1:2] / width
+    ymax = boxes[..., 2:3] / height
+    xmax = boxes[..., 3:4] / width
+
+    normalized_boxes = tf.concat([ymin, xmin, ymax, xmax], axis=-1)
+    normalized_boxes = tf.clip_by_value(normalized_boxes, 0.0, 1.0)
+    return normalized_boxes
 
   def __call__(self, inputs):
     # Get heatmaps from decoded outputs via final hourglass stack output
@@ -308,8 +332,7 @@ class CenterNetDetectionGenerator(tf.keras.layers.Layer):
           nms_thresh=0.4)
 
     num_det = tf.reduce_sum(tf.cast(scores > 0, dtype=tf.int32), axis=1)
-    boxes = box_ops.denormalize_boxes(
-        boxes, [self._input_image_dims, self._input_image_dims])
+    boxes = box_ops.denormalize_boxes(boxes, self._input_image_dims)
 
     return {
         'boxes': boxes,

official/projects/centernet/modeling/layers/detection_generator_test.py

@@ -0,0 +1,152 @@
+# Copyright 2023 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.
+
+"""Tests for Centernet detection_generator."""
+
+from collections.abc import Mapping, Sequence
+
+from absl.testing import parameterized
+import tensorflow as tf
+
+from official.projects.centernet.modeling.layers import detection_generator
+
+
+def _build_input_example(
+    batch_size: int, height: int, width: int, num_classes: int, num_outputs: int
+) -> Mapping[str, Sequence[tf.Tensor]]:
+  """Builds a random input example for CenterNetDetectionGenerator.
+
+  Args:
+    batch_size: The batch size.
+    height: The height of the feature_map.
+    width: The width of the feature_map.
+    num_classes: The number of classes to detect.
+    num_outputs: The number of output heatmaps, which corresponds to the length
+      of CenterNetHead's input_levels.
+
+  Returns:
+    A dictionary, mapping from feature names to sequences of tensors.
+  """
+  return {
+      'ct_heatmaps': [
+          tf.random.normal([batch_size, height, width, num_classes])
+          for _ in range(num_outputs)
+      ],
+      'ct_size': [
+          tf.random.normal([batch_size, height, width, 2])
+          for _ in range(num_outputs)
+      ],
+      'ct_offset': [
+          tf.random.normal([batch_size, height, width, 2])
+          for _ in range(num_outputs)
+      ],
+  }
+
+
+class CenterNetDetectionGeneratorTest(parameterized.TestCase, tf.test.TestCase):
+
+  @parameterized.parameters(
+      (1, 256),
+      (1, 512),
+      (2, 256),
+      (2, 512),
+  )
+  def test_squered_image_forward(self, batch_size, input_image_dims):
+    max_detections = 128
+    num_classes = 80
+    generator = detection_generator.CenterNetDetectionGenerator(
+        input_image_dims=input_image_dims, max_detections=max_detections
+    )
+    test_input = _build_input_example(
+        batch_size=batch_size,
+        height=input_image_dims,
+        width=input_image_dims,
+        num_classes=num_classes,
+        num_outputs=2,
+    )
+
+    output = generator(test_input)
+
+    self.assert_detection_generator_output_shapes(
+        output, batch_size, max_detections
+    )
+
+  @parameterized.parameters(
+      (1, (256, 512)),
+      (1, (512, 256)),
+      (2, (256, 512)),
+      (2, (512, 256)),
+  )
+  def test_rectangular_image_forward(self, batch_size, input_image_dims):
+    max_detections = 128
+    num_classes = 80
+    generator = detection_generator.CenterNetDetectionGenerator(
+        input_image_dims=input_image_dims, max_detections=max_detections
+    )
+    test_input = _build_input_example(
+        batch_size=batch_size,
+        height=input_image_dims[0],
+        width=input_image_dims[1],
+        num_classes=num_classes,
+        num_outputs=2,
+    )
+
+    output = generator(test_input)
+
+    self.assert_detection_generator_output_shapes(
+        output, batch_size, max_detections
+    )
+
+  def assert_detection_generator_output_shapes(
+      self,
+      output: Mapping[str, tf.Tensor],
+      batch_size: int,
+      max_detections: int,
+  ):
+    self.assertAllEqual(output['boxes'].shape, (batch_size, max_detections, 4))
+    self.assertAllEqual(output['classes'].shape, (batch_size, max_detections))
+    self.assertAllEqual(
+        output['confidence'].shape, (batch_size, max_detections)
+    )
+    self.assertAllEqual(output['num_detections'].shape, (batch_size,))
+
+  @parameterized.parameters(
+      (256,),
+      (512,),
+      ((256, 512),),
+      ((512, 256),),
+  )
+  def test_serialize_deserialize(self, input_image_dims):
+    kwargs = {
+        'input_image_dims': input_image_dims,
+        'net_down_scale': 4,
+        'max_detections': 128,
+        'peak_error': 1e-6,
+        'peak_extract_kernel_size': 3,
+        'class_offset': 1,
+        'use_nms': False,
+        'nms_pre_thresh': 0.1,
+        'nms_thresh': 0.5,
+    }
+
+    generator = detection_generator.CenterNetDetectionGenerator(**kwargs)
+    new_generator = detection_generator.CenterNetDetectionGenerator.from_config(
+        generator.get_config()
+    )
+
+    self.assertAllEqual(generator.get_config(), new_generator.get_config())
+
+
+if __name__ == '__main__':
+  tf.test.main()

official/projects/centernet/tasks/centernet.py

@@ -130,7 +130,10 @@ class CenterNetTask(base_task.Task):
         peak_extract_kernel_size=dg_config.peak_extract_kernel_size,
         class_offset=dg_config.class_offset,
         net_down_scale=self._net_down_scale,
-        input_image_dims=model_config.input_size[0],
+        input_image_dims=(
+            model_config.input_size[0],
+            model_config.input_size[1],
+        ),
         use_nms=dg_config.use_nms,
         nms_pre_thresh=dg_config.nms_pre_thresh,
         nms_thresh=dg_config.nms_thresh)

{tf_models_nightly-2.14.0.dev20230930.dist-info → tf_models_nightly-2.14.0.dev20231001.dist-info}/METADATA

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

{tf_models_nightly-2.14.0.dev20230930.dist-info → tf_models_nightly-2.14.0.dev20231001.dist-info}/RECORD

@@ -488,7 +488,8 @@ official/projects/centernet/modeling/heads/centernet_head_test.py,sha256=01sGcBm
 official/projects/centernet/modeling/layers/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
 official/projects/centernet/modeling/layers/cn_nn_blocks.py,sha256=VJW6EZNk90wtdRshOJX13io5zvq02YI8yHw9gyHgGo0,12200
 official/projects/centernet/modeling/layers/cn_nn_blocks_test.py,sha256=UlKFV4npO_VLVyAhArb5Ece2Q7KMKU6ClnD4t4wH0K0,5148
-official/projects/centernet/modeling/layers/detection_generator.py,sha256=oOzg_K3RvHq4mWTQlNOkkdLiAE5PzTGCHV6spC4cNyk,13299
+official/projects/centernet/modeling/layers/detection_generator.py,sha256=kgwYcDIchYPPMEF9y3eYEYOgJf_23KF1Tc7Yc5teM4w,14232
+official/projects/centernet/modeling/layers/detection_generator_test.py,sha256=rvYmhe5d03fBeaaXqQ3K9-UV506oYe7VGMHY__P5Ajw,4618
 official/projects/centernet/ops/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
 official/projects/centernet/ops/box_list.py,sha256=7SbXrXlQ7eMMkL5Ig7TfBpMdGNHqhy2MyvBQOVUHNRg,6813
 official/projects/centernet/ops/box_list_ops.py,sha256=g0o8JML6Avd4tFnxQ6rd3ewx5di2OmtUnFpmYkHO6v0,12856
@@ -498,7 +499,7 @@ official/projects/centernet/ops/preprocess_ops.py,sha256=0gveVTznzP7hqFx2Dc8lifO
 official/projects/centernet/ops/target_assigner.py,sha256=MbK5lYE3x55zTfbQAam06PNopuh-TsDnH-rFjkXs0z4,16235
 official/projects/centernet/ops/target_assigner_test.py,sha256=ARCfMwJBgEcJmxGSU6KLvrb-YcGgjjKTon-vfHN54BY,6817
 official/projects/centernet/tasks/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
-official/projects/centernet/tasks/centernet.py,sha256=I56SLNBdQIP6SlQROM9NdfiStrD4BfRY3RsqK6Bt6eI,16719
+official/projects/centernet/tasks/centernet.py,sha256=7ujw_qpykYOwxkaqYNKj_qr8qC8gMr0-d-c4hG2rlPE,16784
 official/projects/centernet/utils/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
 official/projects/centernet/utils/tf2_centernet_checkpoint_converter.py,sha256=zWwtApJWaXplRbrEUFZEOg0p_VKCwT9--bwb6ImtrJM,5327
 official/projects/centernet/utils/checkpoints/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
@@ -1111,9 +1112,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.14.0.dev20230930.dist-info/AUTHORS,sha256=1dG3fXVu9jlo7bul8xuix5F5vOnczMk7_yWn4y70uw0,337
-tf_models_nightly-2.14.0.dev20230930.dist-info/LICENSE,sha256=WxeBS_DejPZQabxtfMOM_xn8qoZNJDQjrT7z2wG1I4U,11512
-tf_models_nightly-2.14.0.dev20230930.dist-info/METADATA,sha256=73Hb4egrKOM9cWc8OT6zeviHk46RTzQRHnXm0HqTTwo,1390
-tf_models_nightly-2.14.0.dev20230930.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
-tf_models_nightly-2.14.0.dev20230930.dist-info/top_level.txt,sha256=gum2FfO5R4cvjl2-QtP-S1aNmsvIZaFFT6VFzU0f4-g,33
-tf_models_nightly-2.14.0.dev20230930.dist-info/RECORD,,
+tf_models_nightly-2.14.0.dev20231001.dist-info/AUTHORS,sha256=1dG3fXVu9jlo7bul8xuix5F5vOnczMk7_yWn4y70uw0,337
+tf_models_nightly-2.14.0.dev20231001.dist-info/LICENSE,sha256=WxeBS_DejPZQabxtfMOM_xn8qoZNJDQjrT7z2wG1I4U,11512
+tf_models_nightly-2.14.0.dev20231001.dist-info/METADATA,sha256=zbnYnWYSbbEvohvshHzY_zsP-u6zrIZ039HHbd4lOz8,1390
+tf_models_nightly-2.14.0.dev20231001.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
+tf_models_nightly-2.14.0.dev20231001.dist-info/top_level.txt,sha256=gum2FfO5R4cvjl2-QtP-S1aNmsvIZaFFT6VFzU0f4-g,33
+tf_models_nightly-2.14.0.dev20231001.dist-info/RECORD,,