tf-models-nightly 2.14.0.dev20231107__py2.py3-none-any.whl → 2.14.0.dev20231109__py2.py3-none-any.whl

official/legacy/transformer/transformer_main_test.py

@@ -17,7 +17,7 @@
 import os
 import re
 import sys
-import unittest
+import googletest
 
 from absl import flags
 from absl.testing import flagsaver
@@ -100,20 +100,20 @@ class TransformerTaskTest(tf.test.TestCase):
     t = transformer_main.TransformerTask(FLAGS)
     t.train()
 
-  @unittest.skipUnless(tf.test.is_built_with_cuda(), 'requires GPU')
+  @googletest.skipUnless(tf.test.is_built_with_cuda(), 'requires GPU')
   def test_train_1_gpu_with_dist_strat(self):
     FLAGS.distribution_strategy = 'one_device'
     t = transformer_main.TransformerTask(FLAGS)
     t.train()
 
-  @unittest.skipUnless(tf.test.is_built_with_cuda(), 'requires GPU')
+  @googletest.skipUnless(tf.test.is_built_with_cuda(), 'requires GPU')
   def test_train_fp16(self):
     FLAGS.distribution_strategy = 'one_device'
     FLAGS.dtype = 'fp16'
     t = transformer_main.TransformerTask(FLAGS)
     t.train()
 
-  @unittest.skipUnless(tf.test.is_built_with_cuda(), 'requires GPU')
+  @googletest.skipUnless(tf.test.is_built_with_cuda(), 'requires GPU')
   def test_train_2_gpu(self):
     if context.num_gpus() < 2:
       self.skipTest(
@@ -125,7 +125,7 @@ class TransformerTaskTest(tf.test.TestCase):
     t = transformer_main.TransformerTask(FLAGS)
     t.train()
 
-  @unittest.skipUnless(tf.test.is_built_with_cuda(), 'requires GPU')
+  @googletest.skipUnless(tf.test.is_built_with_cuda(), 'requires GPU')
   def test_train_2_gpu_fp16(self):
     if context.num_gpus() < 2:
       self.skipTest(
@@ -171,7 +171,7 @@ class TransformerTaskTest(tf.test.TestCase):
     t = transformer_main.TransformerTask(FLAGS)
     t.predict()
 
-  @unittest.skipUnless(tf.test.is_built_with_cuda(), 'requires GPU')
+  @googletest.skipUnless(tf.test.is_built_with_cuda(), 'requires GPU')
   def test_predict_fp16(self):
     if context.num_gpus() >= 2:
       self.skipTest('No need to test 2+ GPUs without a distribution strategy.')

official/modeling/privacy/ops_test.py

@@ -14,7 +14,7 @@
 
 """Tests for ops."""
 
-from unittest import mock
+from googletest import mock
 
 import tensorflow as tf, tf_keras
 

official/projects/triviaqa/download_and_prepare.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 """Downloads and prepares TriviaQA dataset."""
-from unittest import mock
+from googletest import mock
 
 from absl import app
 from absl import flags

official/projects/waste_identification_ml/__init__.py

@@ -0,0 +1,14 @@
+# 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.
+

official/projects/waste_identification_ml/data_generation/__init__.py

@@ -0,0 +1,14 @@
+# 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.
+

official/projects/waste_identification_ml/data_generation/utils.py

@@ -0,0 +1,347 @@
+# 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.
+
+"""Utility functions for the automated mark generation script."""
+
+import random
+from typing import Any
+import imantics
+import matplotlib.pyplot as plt
+import numpy as np
+
+
+def plot_image(image: np.ndarray):
+  """Plots a mask image.
+
+  Args:
+    image: A numpy array of shape (height, width) representing a mask.
+  """
+  plt.figure(figsize=(24, 32))
+  plt.imshow(image, cmap='gray')
+  plt.show()
+
+
+def _show_anns(anns: list[dict[str, Any]]):
+  """Displays annotations on an image.
+
+  Args:
+    anns: A list of dictionaries representing annotations.
+
+  Returns:
+    None.
+  """
+  if not anns:
+    return
+  sorted_anns = sorted(anns, key=lambda x: x['area'], reverse=True)
+  ax = plt.gca()
+  ax.set_autoscale_on(False)
+  for ann in sorted_anns:
+    m = ann['segmentation']
+    img = np.ones((m.shape[0], m.shape[1], 3))
+    random.seed()
+    color_mask = np.random.random((1, 3)).tolist()[0]
+    for i in range(3):
+      img[:, :, i] = color_mask[i]
+    ax.imshow(np.dstack((img, m * 0.35)))
+
+
+def display_image_with_annotations(
+    image: np.ndarray, masks: list[dict[str, Any]]
+):
+  """Displays an image with annotations.
+
+  Args:
+    image: A numpy array of shape (height, width, 3) representing an image.
+    masks: A list of dictionaries representing masks.
+
+  Returns:
+    None.
+  """
+  plt.figure(figsize=(24, 32))
+  plt.imshow(image)
+  _show_anns(masks)
+  plt.axis('off')
+  plt.show()
+
+
+def plot_grid(images: list[np.ndarray], n_cols: int):
+  """Plots a list of images in a grid with a given number of images per row.
+
+  Args:
+    images: A list of numpy arrays representing images.
+    n_cols: The number of images per row.
+
+  Returns:
+    None.
+  """
+  images = [np.array(item['segmentation'], dtype=float) for item in images]
+  n_rows = int(np.ceil(len(images) / n_cols))
+  _, axes = plt.subplots(nrows=n_rows, ncols=n_cols, figsize=(10, 10))
+  axes = axes.flatten()
+
+  for i, image in enumerate(images):
+    axes[i].imshow(image, cmap='gray')
+    axes[i].set_axis_off()
+
+  plt.tight_layout()
+  plt.show()
+
+
+def convert_bbox_format(coord: list[float]) -> list[float]:
+  """Convert bounding box format.
+
+  Convert bounding box coordinates from x, y, width, height to
+  xmin, ymin, xmax, ymax format.
+
+  Args:
+    coord: A list or tuple containing the coordinates in (x, y, width, height)
+      format.
+
+  Returns:
+    A list containing the coordinates in (xmin, ymin, xmax, ymax) format.
+  """
+  xmin, ymin, width, height = coord
+  return [xmin, ymin, xmin + width, ymin + height]
+
+
+def _aspect_ratio(bbox: list[float]) -> float:
+  """Calculate the aspect ratio of a bounding box.
+
+  Args:
+    bbox: A list or tuple containing the coordinates in (xmin, ymin, xmax, ymax)
+      format.
+
+  Returns:
+    The aspect ratio, defined as the length of the longer side
+    divided by the length of the shorter side.
+  """
+  xmin, ymin, xmax, ymax = bbox
+  width, height = xmax - xmin, ymax - ymin
+  return max(width, height) / min(width, height)
+
+
+def _calculate_area_bounds(
+    elements: list[np.ndarray], upper_multiplier: int, lower_multiplier: int
+) -> tuple[float, float]:
+  """Calculate the upper and lower bounds for a specified key.
+
+  Args:
+    elements: A list of elements containing the specified key.
+    upper_multiplier: Multiplier to calculate the upper bound of IQR.
+    lower_multiplier: Mulitplier to calculate the lower bound of IQR.
+
+  Returns:
+    A tuple containing the upper and lower bounds.
+  """
+  leng = [i['area'] for i in elements]
+
+  q1, _, q3 = np.percentile(leng, [25, 50, 75])
+  iqr = q3 - q1
+  upper_bound = q3 + upper_multiplier * iqr
+  lower_bound = q1 * lower_multiplier
+  return upper_bound, lower_bound
+
+
+def filter_masks(
+    image: np.ndarray,
+    elements: list[np.ndarray],
+    upper_multiplier: int,
+    lower_multiplier: int,
+    area_ratio_threshold: float,
+) -> list[np.ndarray]:
+  """Filter masks based on area bounds and aspect ratio.
+
+  Args:
+    image: Original image
+    elements: List of elements with multiple attributes.
+    upper_multiplier: Multiplier to calculate the upper bound of IQR.
+    lower_multiplier: Mulitplier to calculate the lower bound of IQR.
+    area_ratio_threshold: Threshold for the ratio of mask area to image area.
+
+  Returns:
+      List of filtered masks.
+  """
+  area_upper_bound, area_lower_bound = _calculate_area_bounds(
+      elements, upper_multiplier, lower_multiplier
+  )
+  threshold = area_ratio_threshold * np.prod(image.shape[:-1])
+  filtered_elements = []
+  for element in elements:
+    if (
+        area_lower_bound <= element['area'] <= area_upper_bound
+        and _aspect_ratio(element['bbox']) <= 2
+        and element['area'] <= threshold
+    ):
+      filtered_elements.append(element)
+  return filtered_elements
+
+
+def _calculate_intersection_score(
+    elem1: dict[str, Any], elem2: dict[str, Any]
+) -> float:
+  """Calculates the intersection score for two masks.
+
+  Args:
+    elem1: The first element.
+    elem2: The second element.
+
+  Returns:
+    The intersection score calculated as the ratio of the intersection
+    area to the area of the smaller mask.
+  """
+
+  # Check if the masks have the same dimensions.
+  if elem1['segmentation'].shape != elem2['segmentation'].shape:
+    raise ValueError('The masks must have the same dimensions.')
+
+  min_elem = elem1 if elem1['area'] < elem2['area'] else elem2
+  intersection = np.logical_and(elem1['segmentation'], elem2['segmentation'])
+  score = np.sum(intersection) / np.sum(min_elem['segmentation'])
+  return score
+
+
+def filter_nested_similar_masks(
+    elements: list[dict[str, Any]]
+) -> list[dict[str, Any]]:
+  """Filters out nested masks from a list of elements.
+
+  Args:
+    elements: A list of dictionaries representing elements.
+
+  Returns:
+    A list of dictionaries representing elements with nested masks filtered out.
+  """
+  retained_elements = []
+  handled_indices = (
+      set()
+  )  # To keep track of indices that have already been handled
+
+  for i, elem in enumerate(elements):
+    if i in handled_indices:
+      continue  # Skip elements that have already been handled
+
+    matching_indices = [i]  # Start with the current element
+
+    # Find all elements that match with the current element
+    for j, other_elem in enumerate(elements):
+      if i != j and _calculate_intersection_score(elem, other_elem) > 0.95:
+        matching_indices.append(j)
+
+    # If more than one element matched, find the one with the highest 'area'
+    # and add it to retained_elements
+    if len(matching_indices) > 1:
+      highest_area_index = max(
+          matching_indices, key=lambda idx: elements[idx]['area']
+      )
+      retained_elements.append(elements[highest_area_index])
+      handled_indices.update(
+          matching_indices
+      )  # Mark all matching indices as handled
+    else:
+      # If no matches were found, retain the current element
+      retained_elements.append(elem)
+      handled_indices.add(i)  # Mark the current index as handled
+
+  return retained_elements
+
+
+def generate_coco_json(
+    masks: list[np.ndarray],
+    image: np.ndarray,
+    category_name: str,
+    file_name: str,
+) -> dict[str, Any]:
+  """Generates a COCO JSON annotation.
+
+  Create a COCO formatted JSON file for the given masks, image, and
+  category name.
+
+  Args:
+    masks: A list of masks.
+    image: The image to which the masks correspond.
+    category_name: The name of the category for the masks.
+    file_name: The name of the file to save the COCO JSON to.
+
+  Returns:
+    A COCO JSON dictionary.
+  """
+  height, width = image.shape[:2]
+
+  # Initialize variables
+  mask = np.zeros((height, width), dtype=np.uint8)
+  images_dict = [{}]
+  categories_dict = [{}]
+  annotations_dict = []
+  annotation_id = 1
+
+  # Process masks
+  for sub_mask in masks:
+    # Convert mask to numpy array
+    mask_array = sub_mask.reshape(height, width).astype(np.uint8)
+
+    # Create Mask object and add it to the imantics_Image
+    mask_image = imantics.Mask(mask_array)
+
+    # Create imantics_Image object
+    imantics_image = imantics.Image(image)
+    imantics_image.add(mask_image, category=imantics.Category(category_name))
+
+    try:
+      # Export imantics_Image as COCO JSON
+      coco_json = imantics_image.export(style='coco')
+    except imantics.ExportError as exc:
+      print('Error:', exc)
+      continue
+
+    # Update images_dict and categories_dict
+    images_dict[0] = coco_json['images'][0]
+    categories_dict[0] = coco_json['categories'][0]
+
+    # Retrieve annotation information and modify the segmentation field
+    annotation = coco_json['annotations'][0]
+    annotation['segmentation'] = [max(annotation['segmentation'], key=len)]
+
+    # Check for valid segmentations and create annotation dictionary
+    if len(annotation['segmentation']) >= 1:
+      for segmentation in annotation['segmentation']:
+        if len(segmentation) > 4:
+          annotation_dict = {
+              'id': annotation_id,
+              'image_id': annotation['image_id'],
+              'category_id': annotation['category_id'],
+              'iscrowd': annotation['iscrowd'],
+              'area': annotation['area'],
+              'bbox': annotation['bbox'],
+              'segmentation': [segmentation],
+          }
+          annotations_dict.append(annotation_dict)
+          annotation_id += 1
+
+    # Free up memory
+    del mask_image, coco_json, imantics_image
+
+    # Add mask_array to the overall mask
+    mask += mask_array
+
+  # assign file name
+  images_dict[0]['file_name'] = file_name
+
+  # Create final COCO dictionary
+  coco_dict_final = {
+      'images': images_dict,
+      'categories': categories_dict,
+      'annotations': annotations_dict,
+  }
+
+  return coco_dict_final

official/projects/waste_identification_ml/data_generation/utils_test.py

@@ -0,0 +1,165 @@
+# 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.
+
+import numpy as np
+import tensorflow as tf, tf_keras
+from official.projects.waste_identification_ml.data_generation import utils
+
+
+def compare_elements(elem_list1, elem_list2):
+  if len(elem_list1) != len(elem_list2):
+    return False
+
+  for elem1, elem2 in zip(elem_list1, elem_list2):
+    for key in elem1:
+      if key not in elem2:
+        return False
+      if isinstance(elem1[key], np.ndarray) or isinstance(
+          elem2[key], np.ndarray
+      ):
+        if not np.array_equal(elem1[key], elem2[key]):
+          return False
+      else:
+        if elem1[key] != elem2[key]:
+          return False
+
+  return True
+
+
+class MyTest(tf.test.TestCase):
+
+  def test_convert_coordinates(self):
+    coord = [10.0, 20.0, 30.0, 40.0]
+    expected_output = [10.0, 20.0, 40.0, 60.0]
+    actual_output = utils.convert_bbox_format(coord)
+    self.assertEqual(expected_output, actual_output)
+
+  def test_area_key(self):
+    masks = [{'area': 10.0}, {'area': 20.0}, {'area': 30.0}]
+    upper_multiplier = 1.5
+    lower_multiplier = 0.5
+    leng = [i['area'] for i in masks]
+    q1, _, q3 = np.percentile(leng, [25, 50, 75])
+    iqr = q3 - q1
+    expected_upper_bound = q3 + upper_multiplier * iqr
+    expected_lower_bound = q1 * lower_multiplier
+    actual_upper_bound, actual_lower_bound = utils._calculate_area_bounds(
+        masks, upper_multiplier, lower_multiplier
+    )
+    self.assertEqual(
+        (expected_upper_bound, expected_lower_bound),
+        (actual_upper_bound, actual_lower_bound),
+    )
+
+  def test_square_bbox(self):
+    bbox = [0.0, 0.0, 2.0, 2.0]
+    expected_ratio = 1.0
+    actual_ratio = utils._aspect_ratio(bbox)
+    self.assertEqual(expected_ratio, actual_ratio)
+
+  def test_same_size_masks(self):
+    elem1 = {
+        'segmentation': np.array([[1, 0, 0], [0, 1, 0], [0, 0, 1]]),
+        'area': 3,
+    }
+
+    elem2 = {
+        'segmentation': np.array([[1, 1, 0], [0, 0, 0], [0, 0, 1]]),
+        'area': 3,
+    }
+
+    expected_score = 2.0 / 3.0  # Intersection is 2, smaller mask area is 3
+    actual_score = utils._calculate_intersection_score(elem1, elem2)
+    self.assertAlmostEqual(expected_score, actual_score)
+
+  def test_different_size_masks_error(self):
+    elem1 = {'segmentation': np.array([[1, 0], [0, 1]]), 'area': 2}
+
+    elem2 = {
+        'segmentation': np.array([[1, 1, 0], [0, 0, 0], [0, 0, 1]]),
+        'area': 3,
+    }
+
+    with self.assertRaises(ValueError) as context:
+      utils._calculate_intersection_score(elem1, elem2)
+
+    self.assertEqual(
+        str(context.exception), 'The masks must have the same dimensions.'
+    )
+
+
+class TestFilterNestedSimilarMasks(tf.test.TestCase):
+
+  def setUp(self):
+    super().setUp()
+    # Create some mock binary mask data to use in the tests
+    self.mask1 = np.array([[0, 1], [1, 0]])
+    self.mask2 = np.array([[1, 0], [0, 1]])
+    self.larger_mask = np.array([[1, 1], [1, 1]])
+
+  def test_same_size_masks(self):
+    # Test the case where all masks are of the same size
+    elements = [
+        {'segmentation': self.mask1, 'area': 2},
+        {'segmentation': self.mask2, 'area': 2},
+    ]
+    expected_output = elements  # All masks are retained as none are nested
+    actual_output = utils.filter_nested_similar_masks(elements)
+    self.assertEqual(actual_output, expected_output)
+
+  def test_nested_masks(self):
+    # Test the case where one mask is nested within another
+    elements = [
+        {'segmentation': self.mask1, 'area': 2},
+        {'segmentation': self.larger_mask, 'area': 4},
+    ]
+    expected_output = [{
+        'segmentation': self.larger_mask,
+        'area': 4,
+    }]  # Only the larger mask is retained
+    actual_output = utils.filter_nested_similar_masks(elements)
+    self.assertEqual(actual_output, expected_output)
+
+
+class TestGenerateCocoJson(tf.test.TestCase):
+
+  def setUp(self):
+    super().setUp()
+    self.image = np.array([[0, 1], [1, 0]])
+    self.masks = [np.array([[0, 1], [1, 0]]), np.array([[1, 0], [0, 1]])]
+    self.category_name = 'example_category'
+    self.file_name = 'example_file'
+
+  def test_generate_coco_json(self):
+    coco_dict = utils.generate_coco_json(
+        masks=self.masks,
+        image=self.image,
+        category_name=self.category_name,
+        file_name=self.file_name,
+    )
+
+    # Check the keys present in the output dictionary
+    self.assertIn('images', coco_dict)
+    self.assertIn('categories', coco_dict)
+    self.assertIn('annotations', coco_dict)
+
+    # Check the file name in the images dictionary
+    self.assertEqual(coco_dict['images'][0]['file_name'], self.file_name)
+
+    # Check the category name in the categories dictionary
+    self.assertEqual(coco_dict['categories'][0]['name'], self.category_name)
+
+
+if __name__ == '__main__':
+  tf.test.main()

official/recommendation/ncf_test.py

@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import unittest
+import googletest
 
 import tensorflow as tf, tf_keras
 from tensorflow.python.eager import context  # pylint: disable=ungrouped-imports
@@ -50,7 +50,7 @@ class NcfTest(tf.test.TestCase):
 
   _BASE_END_TO_END_FLAGS = ['-batch_size', '1044', '-train_epochs', '1']
 
-  @unittest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
+  @googletest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
   def test_end_to_end_keras_no_dist_strat(self):
     integration.run_synthetic(
         ncf_keras_main.main,
@@ -58,14 +58,14 @@ class NcfTest(tf.test.TestCase):
         extra_flags=self._BASE_END_TO_END_FLAGS +
         ['-distribution_strategy', 'off'])
 
-  @unittest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
+  @googletest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
   def test_end_to_end_keras_dist_strat(self):
     integration.run_synthetic(
         ncf_keras_main.main,
         tmp_root=self.get_temp_dir(),
         extra_flags=self._BASE_END_TO_END_FLAGS + ['-num_gpus', '0'])
 
-  @unittest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
+  @googletest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
   def test_end_to_end_keras_dist_strat_ctl(self):
     flags = (
         self._BASE_END_TO_END_FLAGS + ['-num_gpus', '0'] +
@@ -73,7 +73,7 @@ class NcfTest(tf.test.TestCase):
     integration.run_synthetic(
         ncf_keras_main.main, tmp_root=self.get_temp_dir(), extra_flags=flags)
 
-  @unittest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
+  @googletest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
   def test_end_to_end_keras_1_gpu_dist_strat_fp16(self):
     if context.num_gpus() < 1:
       self.skipTest(
@@ -86,7 +86,7 @@ class NcfTest(tf.test.TestCase):
         extra_flags=self._BASE_END_TO_END_FLAGS +
         ['-num_gpus', '1', '--dtype', 'fp16'])
 
-  @unittest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
+  @googletest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
   def test_end_to_end_keras_1_gpu_dist_strat_ctl_fp16(self):
     if context.num_gpus() < 1:
       self.skipTest(
@@ -99,7 +99,7 @@ class NcfTest(tf.test.TestCase):
         extra_flags=self._BASE_END_TO_END_FLAGS +
         ['-num_gpus', '1', '--dtype', 'fp16', '--keras_use_ctl'])
 
-  @unittest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
+  @googletest.mock.patch.object(rconst, 'SYNTHETIC_BATCHES_PER_EPOCH', 100)
   def test_end_to_end_keras_2_gpu_fp16(self):
     if context.num_gpus() < 2:
       self.skipTest(

official/utils/flags/flags_test.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest
+import googletest
 
 from absl import flags
 import tensorflow as tf, tf_keras
@@ -39,7 +39,7 @@ def define_flags():
   flags_core.define_benchmark()
 
 
-class BaseTester(unittest.TestCase):
+class BaseTester(googletest.TestCase):
 
   @classmethod
   def setUpClass(cls):
@@ -159,4 +159,4 @@ class BaseTester(unittest.TestCase):
 
 
 if __name__ == "__main__":
-  unittest.main()
+  googletest.main()

official/vision/data/image_utils_test.py

@@ -14,7 +14,7 @@
 
 """Tests for image_utils."""
 import imghdr
-from unittest import mock
+from googletest import mock
 from absl.testing import parameterized
 import tensorflow as tf, tf_keras
 

official/vision/modeling/heads/dense_prediction_heads_test.py

@@ -14,7 +14,7 @@
 
 """Tests for dense_prediction_heads.py."""
 
-import unittest
+import googletest
 
 # Import libraries
 
@@ -151,7 +151,7 @@ class RetinaNetHeadTest(parameterized.TestCase, tf.test.TestCase):
       self.assertLen(retinanet_head._att_convs['depth'], 1)
       self.assertEqual(retinanet_head._att_convs['depth'][0].filters, 128)
 
-  @unittest.expectedFailure
+  @googletest.expectedFailure
   def test_forward_shared_prediction_tower_with_share_classification_heads(
       self):
     share_classification_heads = True

official/vision/serving/export_saved_model_lib_test.py

@@ -15,7 +15,7 @@
 """Tests for official.core.export_saved_model_lib."""
 
 import os
-from unittest import mock
+from googletest import mock
 
 import tensorflow as tf, tf_keras
 

orbit/controller.py

@@ -321,6 +321,7 @@ class Controller:
     _log(f" eval | step: {current_step: 6d} | {steps_msg}")
 
     start = time.time()
+    assert isinstance(self.evaluator, runner.AbstractEvaluator)
     with self.eval_summary_manager.summary_writer().as_default():
       steps_tensor = tf.convert_to_tensor(steps, dtype=tf.int32)
       eval_output = self.evaluator.evaluate(steps_tensor)
@@ -428,6 +429,7 @@ class Controller:
     self._require("checkpoint_manager", for_method="evaluate_continuously")
 
     output = None
+    assert isinstance(self.checkpoint_manager, tf.train.CheckpointManager)
     for checkpoint_path in tf.train.checkpoints_iterator(
         self.checkpoint_manager.directory,
         timeout=timeout,
@@ -451,6 +453,7 @@ class Controller:
     """
     self._require("checkpoint_manager", for_method="restore_checkpoint")
 
+    assert isinstance(self.checkpoint_manager, tf.train.CheckpointManager)
     with self.strategy.scope():
       # Checkpoint restoring should be inside scope (b/139450638).
       if checkpoint_path is not None:
@@ -508,6 +511,7 @@ class Controller:
       if self.summary_interval:
         # Create a predicate to determine when summaries should be written.
         should_record = lambda: (self.global_step % self.summary_interval == 0)
+      assert isinstance(self.trainer, runner.AbstractTrainer)
       with tf.summary.record_if(should_record):
         num_steps_tensor = tf.convert_to_tensor(num_steps, dtype=tf.int32)
         train_output = self.trainer.train(num_steps_tensor)

{tf_models_nightly-2.14.0.dev20231107.dist-info → tf_models_nightly-2.14.0.dev20231109.dist-info}/METADATA

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

{tf_models_nightly-2.14.0.dev20231107.dist-info → tf_models_nightly-2.14.0.dev20231109.dist-info}/RECORD

@@ -164,7 +164,7 @@ official/legacy/transformer/transformer.py,sha256=_tVlFGHEIl3HJIsXY6ukKxUEvLCOrN
 official/legacy/transformer/transformer_forward_test.py,sha256=9Vax1XOz6QduG974EjI_Cw6P7reL8BLWzQf9yLsuPYI,6070
 official/legacy/transformer/transformer_layers_test.py,sha256=ToNwLMbPq2Qj2jHk3CYpMeRxCD6OT_0hfzBPBZZJx0I,3576
 official/legacy/transformer/transformer_main.py,sha256=TmGn-clD8X2HxWBJhByNbY8SmR6fbNbJKEDBwb3FsvY,18193
-official/legacy/transformer/transformer_main_test.py,sha256=7FSAtNgrttQDbXw_luRTB8UOSKM-cSKijz2tP0o2nWg,6641
+official/legacy/transformer/transformer_main_test.py,sha256=fvktcJ4jynelavfNmxJDG7vnm0EoSusYvtW-mkDVBjY,6653
 official/legacy/transformer/transformer_test.py,sha256=JYfcQ7IuSUGao2cOlt2PoDX3jXsdq8Po0k-BXyFf-Nc,3638
 official/legacy/transformer/translate.py,sha256=iin47QkofS4HFyqYMDJ5flDNY-FUBrNMeTpfhtCnaz8,6961
 official/legacy/transformer/utils/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
@@ -247,7 +247,7 @@ official/modeling/privacy/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV
 official/modeling/privacy/configs.py,sha256=CTRX7ZWvUdWAg0-dO-TSxIzbODtACMRGbrzE1oeyIpk,960
 official/modeling/privacy/configs_test.py,sha256=Eps3m0ZGumD_G9hHQ7TQXO2ppEH4CbSP1e21VIJJRCQ,1369
 official/modeling/privacy/ops.py,sha256=J5innS29_WuFFujBMBuwyWvHC1GOwtQ7wLQCW-ldCvY,2054
-official/modeling/privacy/ops_test.py,sha256=JsDB6T6Ja2FHT6fVW91i_HjG20Z7Rf5Q5246wwj2bgs,1694
+official/modeling/privacy/ops_test.py,sha256=ZX-e66pezA4q7M7OHUJvyw4zvlsWoHcnxvgffH_UDLk,1696
 official/nlp/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
 official/nlp/continuous_finetune_lib.py,sha256=E9hzs58s9f9MefJ2TPJF2yQD0Dz2a__BjdJfHBhwEws,7894
 official/nlp/continuous_finetune_lib_test.py,sha256=1Tjv2zBwLhvCUjBY7L7HNSnCW2DQbHZeda3UDgf8Q0g,3192
@@ -689,7 +689,7 @@ official/projects/teams/teams_task_test.py,sha256=Ni1LXqfqATs0-I2pjCBSbviEGIGHER
 official/projects/teams/train.py,sha256=pp3KbKVddgyOiyv7G5H31WY32hzgD7Wi3yMV6355Qj8,1028
 official/projects/triviaqa/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
 official/projects/triviaqa/dataset.py,sha256=cUc7z1W_GZxDNUlqRdSPSSmJbQGYatUQ7WZ-l10B9I8,16330
-official/projects/triviaqa/download_and_prepare.py,sha256=6eFsChzJY_f-kBWWMI9QSymwwfqFALDD9OUyqNU7UBE,2497
+official/projects/triviaqa/download_and_prepare.py,sha256=s4xpkWcHdjJHSNWi9j31siHOau8fp1FKCw_7aF4AFno,2499
 official/projects/triviaqa/evaluate.py,sha256=vTaG-9COi6pJIcE2B8T8vFRhsVBWQqDDyvWuuYwgTvQ,1560
 official/projects/triviaqa/evaluation.py,sha256=PRp_zZaGKXc7v7YLhG9Jd55lV9PPzQB_I3vVvoPa9mQ,5293
 official/projects/triviaqa/inputs.py,sha256=RBZsTJO8u0pV-mbM2HQdMiPUSbcbVLTceGY-nuFbLG4,21728
@@ -760,6 +760,10 @@ official/projects/volumetric_models/serving/semantic_segmentation_3d_test.py,sha
 official/projects/volumetric_models/tasks/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
 official/projects/volumetric_models/tasks/semantic_segmentation_3d.py,sha256=tpf9C3Bok1HuEQsCkwfVdhck7d1Yz_4KEF5QX-3C5co,12907
 official/projects/volumetric_models/tasks/semantic_segmentation_3d_test.py,sha256=hEOjpOir5NcMYwAl6LeXPncEp0JinQA8yrYnvzzlzbA,4079
+official/projects/waste_identification_ml/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
+official/projects/waste_identification_ml/data_generation/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
+official/projects/waste_identification_ml/data_generation/utils.py,sha256=85rOM15OqWlby5PAmWVB76NmvvEhwb-5a1WraE9XOKY,10239
+official/projects/waste_identification_ml/data_generation/utils_test.py,sha256=l15BZ_iBnfYPZfo-ZdTu1Jz1kyt8RQhdB5UwcLjMoEo,5340
 official/projects/yolo/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
 official/projects/yolo/train.py,sha256=xd5zcPugSTUfa-g4q2xa1XWQjvqVpb0Y966V1PSHDX0,981
 official/projects/yolo/common/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
@@ -863,7 +867,7 @@ official/recommendation/movielens.py,sha256=XiHTJFUV2C1TgtoYmnOXP7QlZifokzsom6cj
 official/recommendation/ncf_common.py,sha256=ZSNfSTABB22zMR98qNiCTD0mTX3bbgB156mTjWuqliI,12288
 official/recommendation/ncf_input_pipeline.py,sha256=oq93PYokRWO8QYro3kyUiQiNtIhwOFkt6Y56hcY-9Gk,6974
 official/recommendation/ncf_keras_main.py,sha256=40Voy__CDI8hAKBgpf1t4Ox_gaXma4meSofGU1yQzeA,19850
-official/recommendation/ncf_test.py,sha256=wvdrYBl2_ttopTqDD99cfDFWjizo6-ZxIwR2z-xT9Xg,4144
+official/recommendation/ncf_test.py,sha256=EklHNCWErt-7VVrUAQwSRuc1n9Zq92A3bHHCNna2xu8,4158
 official/recommendation/neumf_model.py,sha256=ihScBcDEAALSPe8MITVxVk9Tqjcyi5U0dZlRnHTzmBM,16950
 official/recommendation/popen_helper.py,sha256=zJYedoghCk7VkEevTpqQpNXi86EVpa3I2SFq55x4tYE,1917
 official/recommendation/stat_utils.py,sha256=8cKlTjPKEm0m2as2vU7U5ZjWwr5CyRCdGxNzvJni1JE,3076
@@ -893,7 +897,7 @@ official/utils/flags/_distribution.py,sha256=oW6lYPw4y865JnEHBMPxtTjeM2lU6KZI8Kp
 official/utils/flags/_misc.py,sha256=3A1jTj2sQjGGK4hDp5kQ1vREz-OTlaYJ22mXY72aW7M,1541
 official/utils/flags/_performance.py,sha256=mIusa796tqpZiOAnU4RmvzGsh0-1f11n4foLoC9-f3w,11576
 official/utils/flags/core.py,sha256=Tjpanan5CHAY8xsvalsOOk28UXCSy1C-Gaza4DVPbmM,4427
-official/utils/flags/flags_test.py,sha256=DicN_ySMkGCIFi8S4O2hFfRbGpKMMMa7tT0bkKSRQ98,5312
+official/utils/flags/flags_test.py,sha256=eGuudhPYmRe_YVEb5gPlu4zBYgwqsje0kUcjzatwY-Q,5318
 official/utils/misc/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
 official/utils/misc/keras_utils.py,sha256=Gsp3_bWkajf-WdJ7BDaezE1MDuxAYWX_zMd7zc-Ddk4,7793
 official/utils/misc/model_helpers.py,sha256=ADK6ar8m68S-9Rez95KbG2V7rfOY94j1iMR8vKJ45zc,3370
@@ -924,7 +928,7 @@ official/vision/data/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbI
 official/vision/data/create_coco_tf_record.py,sha256=5QGsS9TBbxaPrTWAfV2NujiNzF29CCwXb_g0wNhEavY,22742
 official/vision/data/fake_feature_generator.py,sha256=vyIp45OMZuXAtaJ33wFtSSUUs2dbo6RANlWUaq9Jtio,5039
 official/vision/data/image_utils.py,sha256=nB6_kZaH4uLKsKI-RSUMu9uHaEUZzEIO1dC4rCXiU_c,3503
-official/vision/data/image_utils_test.py,sha256=GojaoHszDlqBB6sZWL2JvjXFAaVmF8hCSrIVpnd0ZeU,4071
+official/vision/data/image_utils_test.py,sha256=7CI0fbiS5UuwfJ4eUeYJMA73W_qgEXNIT3EqrSLYa0Q,4073
 official/vision/data/process_coco_few_shot_json_files.py,sha256=Xw0uak8H_-h7qoJh67uISmwLtpbGz3GBIhmJkeVRUbw,6061
 official/vision/data/tf_example_builder.py,sha256=oGpo-dGBOZ78_c13LMJ_AAlA_5EDSPMkCjmumewLZTU,20494
 official/vision/data/tf_example_builder_test.py,sha256=Iv3mZijkn6ue8I0y09c6TXUkOpdcFq99bO2wY5MtW24,27986
@@ -1026,7 +1030,7 @@ official/vision/modeling/decoders/nasfpn.py,sha256=rpfi14Y2wIeVjGkDTLnNGbdPLH27C
 official/vision/modeling/decoders/nasfpn_test.py,sha256=7X9m41vtK6hdwh9vbjgbjM-YtxRP7j_7s1yjNRN3IVc,1897
 official/vision/modeling/heads/__init__.py,sha256=R9kh3QZDCs2LFbJSMYf5C8_o8vlsIMyypik3lC8lUHQ,1088
 official/vision/modeling/heads/dense_prediction_heads.py,sha256=ToFb7UOo-bGMyft5NzmQ0NxaKeN0KTqR4fTFV-tda4M,25991
-official/vision/modeling/heads/dense_prediction_heads_test.py,sha256=GYuXzdQksuUgXVnt7itapy4ZpZEquscUorgMaqDEaM4,8266
+official/vision/modeling/heads/dense_prediction_heads_test.py,sha256=WNmneB9TVKbNPhNeVTQWGRPY7pYLgcsejpjZAb_Stp0,8270
 official/vision/modeling/heads/instance_heads.py,sha256=JNP8gJWH2ND_d4IcBOZQ4eA8kBea0epWnp31hJnoj9Y,17829
 official/vision/modeling/heads/instance_heads_test.py,sha256=S4crAnUSmm0xTqoz1uew9oMYCPM1g4vE-Sq9x-chY3U,4207
 official/vision/modeling/heads/segmentation_heads.py,sha256=kkeZwx0hRMDofHwEZDw4W-DAbbaqr-cRK_CXucr5kTc,20184
@@ -1084,7 +1088,7 @@ official/vision/serving/export_module_factory.py,sha256=L7unMBF_axsRhvUEizQxGKE4
 official/vision/serving/export_module_factory_test.py,sha256=Y2jI3BbbQZNLspaAgb3HovGZBj8oY9gjXt5EQCgKS3s,4605
 official/vision/serving/export_saved_model.py,sha256=fB_NNZEs2uExhZKKgvX0WLeDqvbl20-vy15dFZCyQ4Y,5758
 official/vision/serving/export_saved_model_lib.py,sha256=Fm6FAq6U-ODdVc2VZu-MoYulkW2TNnUF767zlBrFBv0,7675
-official/vision/serving/export_saved_model_lib_test.py,sha256=kuQPLh5s--JeNq0-oTuZXIK5BZcwaMXdR1v12NNwvu8,2409
+official/vision/serving/export_saved_model_lib_test.py,sha256=lz6EeHcTk59nuAVQ6YNHhSrqjPpw_ZMdLyKhEf8zi1c,2411
 official/vision/serving/export_saved_model_lib_v2.py,sha256=9hGuKwhTdMOX9Rq42TVdb4zuYMPsuurTDmsesEzNEyA,3710
 official/vision/serving/export_tfhub.py,sha256=ES-BDGUjhfv8u93S1RKnY-ZJw-g25NAxKAygNHpLvfI,3500
 official/vision/serving/export_tfhub_lib.py,sha256=BV3GEYaX3CJD2TWWBAaQ5jstMnhsfCDecXad-XrVji0,2880
@@ -1122,7 +1126,7 @@ official/vision/utils/object_detection/shape_utils.py,sha256=2rghJjGoDghjqtf2qcJ
 official/vision/utils/object_detection/target_assigner.py,sha256=7lg2C4rH8qZua5mPv02F-GX0V59Ub-nH7UsKQ4_vLb8,24208
 official/vision/utils/object_detection/visualization_utils.py,sha256=9NSBmQS-LS3VSnfWBIYOGGgfOINAndz3-Fo1It_8zqs,40266
 orbit/__init__.py,sha256=aQRo8zqIQ0Dw4JQReZeiB6MmuJLvvw4DbYHYti5AGys,1117
-orbit/controller.py,sha256=kcyDUegeh-gA4uAfDPbNaNgDjamfujdaKRD2NeJhupI,25092
+orbit/controller.py,sha256=iOpz5DP-pSisTjUxCsMvYP_Q2YsKwfsSvdqmLnOrJfw,25368
 orbit/controller_test.py,sha256=FABwjwpeCKbW-FhmqztfWv8NuBUjr5uG7mrmqEjf6DY,31802
 orbit/runner.py,sha256=ZKRa513ydT05Dpr6s0xfO0SuASziRoN652_iIPIVl_E,3519
 orbit/standard_runner.py,sha256=ixT1wSC8XX_w2cvhmYnd16Q4s9k5-A4gp8ZjxxZtVH4,17412
@@ -1154,9 +1158,9 @@ tensorflow_models/__init__.py,sha256=Ciz_YBke6teb6y42QyQTUBDdXJAiV7Qdu1zOoZvYiKw
 tensorflow_models/tensorflow_models_test.py,sha256=qUBLFZg7rmKkVQ3cHJVlkoid8cPqjjyc2ZiWtjQO5_o,1395
 tensorflow_models/nlp/__init__.py,sha256=3dULDpUBpDi9vljpXadq6oJrWH4y6z42Bz2d3hopYZw,807
 tensorflow_models/vision/__init__.py,sha256=4y77XkHaH8qLls3-6ta4tMp3Xj8CLbB0ihH91HsQ9z4,833
-tf_models_nightly-2.14.0.dev20231107.dist-info/AUTHORS,sha256=1dG3fXVu9jlo7bul8xuix5F5vOnczMk7_yWn4y70uw0,337
-tf_models_nightly-2.14.0.dev20231107.dist-info/LICENSE,sha256=WxeBS_DejPZQabxtfMOM_xn8qoZNJDQjrT7z2wG1I4U,11512
-tf_models_nightly-2.14.0.dev20231107.dist-info/METADATA,sha256=nO4XglbAIIbgIzvA7CNg5SeToC58F4tfGA1b4VN3dN8,1414
-tf_models_nightly-2.14.0.dev20231107.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
-tf_models_nightly-2.14.0.dev20231107.dist-info/top_level.txt,sha256=gum2FfO5R4cvjl2-QtP-S1aNmsvIZaFFT6VFzU0f4-g,33
-tf_models_nightly-2.14.0.dev20231107.dist-info/RECORD,,
+tf_models_nightly-2.14.0.dev20231109.dist-info/AUTHORS,sha256=1dG3fXVu9jlo7bul8xuix5F5vOnczMk7_yWn4y70uw0,337
+tf_models_nightly-2.14.0.dev20231109.dist-info/LICENSE,sha256=WxeBS_DejPZQabxtfMOM_xn8qoZNJDQjrT7z2wG1I4U,11512
+tf_models_nightly-2.14.0.dev20231109.dist-info/METADATA,sha256=BWk_f3H8oifIkJqTybyk43OXHtT_uxPfyQ0_OJT5E9g,1414
+tf_models_nightly-2.14.0.dev20231109.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
+tf_models_nightly-2.14.0.dev20231109.dist-info/top_level.txt,sha256=gum2FfO5R4cvjl2-QtP-S1aNmsvIZaFFT6VFzU0f4-g,33
+tf_models_nightly-2.14.0.dev20231109.dist-info/RECORD,,