tf-models-nightly 2.14.0.dev20231112__py2.py3-none-any.whl → 2.14.0.dev20231114__py2.py3-none-any.whl

official/projects/yolo/dataloaders/classification_input.py

@@ -13,6 +13,8 @@
 # limitations under the License.
 
 """Classification decoder and parser."""
+from typing import List
+
 import tensorflow as tf, tf_keras
 from official.vision.dataloaders import classification_input
 from official.vision.ops import preprocess_ops
@@ -90,3 +92,19 @@ class Parser(classification_input.Parser):
     image = tf.image.convert_image_dtype(image, self._dtype)
     image = image / 255.0
     return image
+
+  @classmethod
+  def inference_fn(
+      cls, image: tf.Tensor, input_image_size: List[int], num_channels: int = 3
+  ) -> tf.Tensor:
+    """Builds image model inputs for serving."""
+
+    image = tf.cast(image, dtype=tf.float32)
+    image = preprocess_ops.center_crop_image(image)
+    image = tf.image.resize(
+        image, input_image_size, method=tf.image.ResizeMethod.BILINEAR
+    )
+
+    image.set_shape(input_image_size + [num_channels])
+    image = image / 255.0
+    return image

official/projects/yolo/serving/export_module_factory.py

@@ -23,11 +23,11 @@ from official.core import export_base
 from official.projects.yolo.configs import darknet_classification
 from official.projects.yolo.configs import yolo
 from official.projects.yolo.configs import yolov7
+from official.projects.yolo.dataloaders import classification_input
 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
 from official.projects.yolo.serving import model_fn as yolo_model_fn
-from official.vision.dataloaders import classification_input
 from official.vision.modeling import factory
 from official.vision.serving import export_utils
 

orbit/actions/export_saved_model.py

@@ -22,6 +22,16 @@ from typing import Callable, Optional
 import tensorflow as tf, tf_keras
 
 
+_GS_PREFIX = r'gs://'  # Google Cloud Storage Prefix
+
+
+def safe_normpath(path: str) -> str:
+  """Normalize path safely to get around gfile.glob limitations."""
+  if path.startswith(_GS_PREFIX):
+    return _GS_PREFIX + os.path.normpath(path[len(_GS_PREFIX):])
+  return os.path.normpath(path)
+
+
 def _id_key(filename):
   _, id_num = filename.rsplit('-', maxsplit=1)
   return int(id_num)
@@ -84,7 +94,7 @@ class ExportFileManager:
         {base_name}-{id}. Then the file manager will manage
         {base_name}-{id}/{subdirectory} files.
     """
-    self._base_name = os.path.normpath(base_name)
+    self._base_name = safe_normpath(base_name)
     self._max_to_keep = max_to_keep
     self._next_id_fn = next_id_fn or _CounterIdFn(self._base_name)
     self._subdirectory = subdirectory or ''
@@ -100,7 +110,7 @@ class ExportFileManager:
     """
     files = _find_managed_files(self._base_name)
     return [
-        os.path.normpath(os.path.join(f, self._subdirectory)) for f in files
+        safe_normpath(os.path.join(f, self._subdirectory)) for f in files
     ]
 
   def clean_up(self):
@@ -119,7 +129,7 @@ class ExportFileManager:
   def next_name(self) -> str:
     """Returns a new file name based on `base_name` and `next_id_fn()`."""
     base_path = f'{self._base_name}-{self._next_id_fn()}'
-    return os.path.normpath(os.path.join(base_path, self._subdirectory))
+    return safe_normpath(os.path.join(base_path, self._subdirectory))
 
 
 class ExportSavedModel:

orbit/actions/export_saved_model_test.py

@@ -17,6 +17,7 @@
 import os
 
 from orbit import actions
+from orbit.actions import export_saved_model
 
 import tensorflow as tf, tf_keras
 
@@ -220,6 +221,10 @@ class ExportSavedModelTest(tf.test.TestCase):
     reloaded_model = tf.saved_model.load(file_manager.managed_files[-1])
     self.assertEqual(reloaded_model(), 7)
 
+  def test_safe_normpath_gs(self):
+    path = export_saved_model.safe_normpath('gs://foo//bar')
+    self.assertEqual(path, 'gs://foo/bar')
+
 
 if __name__ == '__main__':
   tf.test.main()

{tf_models_nightly-2.14.0.dev20231112.dist-info → tf_models_nightly-2.14.0.dev20231114.dist-info}/METADATA

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

{tf_models_nightly-2.14.0.dev20231112.dist-info → tf_models_nightly-2.14.0.dev20231114.dist-info}/RECORD

@@ -775,7 +775,7 @@ official/projects/yolo/configs/decoders.py,sha256=NRtd96kfDWgyxzZtd_zvbJ-UZWC_ra
 official/projects/yolo/configs/yolo.py,sha256=S3Ct_MQOeMvs5PqE6_RSizk6BRSVuQbMq4rwdOqX1CY,18648
 official/projects/yolo/configs/yolov7.py,sha256=ZjoMQSeBdESO8QirKSW9n4q0Is3toah0jTxlTwVAprY,12932
 official/projects/yolo/dataloaders/__init__.py,sha256=wrNoNRP6wGQBFDLVCYB01k1HgwOGlQ8iZnfqimxlDyk,610
-official/projects/yolo/dataloaders/classification_input.py,sha256=SJdhTMawIQX1MiJwYC6ZyiiAZjaU1lKcsw3YL093b88,3289
+official/projects/yolo/dataloaders/classification_input.py,sha256=LrSjUFywNn4r2q9BDg3-mg5QQ2uU0Tud7bDBsPTxw08,3800
 official/projects/yolo/dataloaders/tf_example_decoder.py,sha256=NFmXcEJEHB9y_pr6VHNupwzXkhZnaWBqaf7Raypt-9E,4820
 official/projects/yolo/dataloaders/yolo_input.py,sha256=1Jhw5pOOdonZyMlEA2JzCoWJ2g6MhZ4vEN3NG4_uaig,14616
 official/projects/yolo/losses/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
@@ -827,7 +827,7 @@ official/projects/yolo/optimization/configs/__init__.py,sha256=1ToRMjre4mErL4Ek4
 official/projects/yolo/optimization/configs/optimization_config.py,sha256=kl0F8qjqtgNbeuDH4mFxwna0Unm6bl49a6dfE4Z_s8A,2084
 official/projects/yolo/optimization/configs/optimizer_config.py,sha256=F5qE0kaUxGk9dW5R_I3Ofp-Myd_T3i1-p1eJ58-O6KM,2283
 official/projects/yolo/serving/__init__.py,sha256=1ToRMjre4mErL4Ek4_dMVxMjXNPossNXggV8fqbISao,609
-official/projects/yolo/serving/export_module_factory.py,sha256=fGoMMnJvBT8h4XpI2uaoArk0BhoD6ecdW5fTHlggVNw,9948
+official/projects/yolo/serving/export_module_factory.py,sha256=jx0LyHEaUNDv9IkjUN_uY1XTwhc5UlImWLuk5V0YkLw,9955
 official/projects/yolo/serving/export_saved_model.py,sha256=wFjN6wAJ-ckNEtSTwMY6Kj4jDz7CSAytOqFy1AVCt7w,4584
 official/projects/yolo/serving/export_tflite.py,sha256=Pt1rkKu9TxVYB8HtLadJQ_buWzNXqWL8Zp0TFDPUXzw,902
 official/projects/yolo/serving/model_fn.py,sha256=_T28osfXUtnBU9GqULbJ6HMd44pJMRWYZfitjrhWnlo,3018
@@ -1134,8 +1134,8 @@ orbit/standard_runner_test.py,sha256=iNd9TJiZu0r74ukZhqBHrgfiXMhSbk2nTqT-369Vugg
 orbit/actions/__init__.py,sha256=F3js6WTEprpgwo0mqJlGiaXJok85A1bZgRr0HZSGP0E,3327
 orbit/actions/conditional_action.py,sha256=cEDxd3d61kmCjhOKxlPO7XE41W6chidW7VP0VvS0-aU,1988
 orbit/actions/conditional_action_test.py,sha256=vjLolfB6qEHfu1JnC3LCqpZjRgdJG4XLsTVwbtsy6eA,1335
-orbit/actions/export_saved_model.py,sha256=c80Rtra2YOJTU3NnPY-IgwWvit20xh6ewreCwVjI--s,5550
-orbit/actions/export_saved_model_test.py,sha256=FrvTAhPjucZXuft4GTDVhxibcGQNFaHzyM7VxyvmYA4,8531
+orbit/actions/export_saved_model.py,sha256=fyGHRyD_b8vsj5qE5vclFNyEU9rbEsdGhBVI7OF4ITM,5834
+orbit/actions/export_saved_model_test.py,sha256=Xee3ZnaK3cFEwAFgu6JyPh9nL6I2JHnfgVwBD9BYvUY,8716
 orbit/actions/new_best_metric.py,sha256=JgExcdxrUuFyoCYwZIkERfbYwbYrmDskfUNNnIpy1mA,8489
 orbit/actions/new_best_metric_test.py,sha256=_FBHlxLHXNRMCpDbzJSorZUC4Jt93VeYjSMsh_Hz9lg,4024
 orbit/actions/save_checkpoint_if_preempted.py,sha256=VdbCldR8qW7jvJndgebSBAw_Ss4DRqzo8JmmjGxklYw,2329
@@ -1158,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.dev20231112.dist-info/AUTHORS,sha256=1dG3fXVu9jlo7bul8xuix5F5vOnczMk7_yWn4y70uw0,337
-tf_models_nightly-2.14.0.dev20231112.dist-info/LICENSE,sha256=WxeBS_DejPZQabxtfMOM_xn8qoZNJDQjrT7z2wG1I4U,11512
-tf_models_nightly-2.14.0.dev20231112.dist-info/METADATA,sha256=FGW5RfNpmU8VZnQMEfBMph5ZdSbT3a72OF-8YjIaCPM,1414
-tf_models_nightly-2.14.0.dev20231112.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
-tf_models_nightly-2.14.0.dev20231112.dist-info/top_level.txt,sha256=gum2FfO5R4cvjl2-QtP-S1aNmsvIZaFFT6VFzU0f4-g,33
-tf_models_nightly-2.14.0.dev20231112.dist-info/RECORD,,
+tf_models_nightly-2.14.0.dev20231114.dist-info/AUTHORS,sha256=1dG3fXVu9jlo7bul8xuix5F5vOnczMk7_yWn4y70uw0,337
+tf_models_nightly-2.14.0.dev20231114.dist-info/LICENSE,sha256=WxeBS_DejPZQabxtfMOM_xn8qoZNJDQjrT7z2wG1I4U,11512
+tf_models_nightly-2.14.0.dev20231114.dist-info/METADATA,sha256=iapp0upkgITxQsnBFx0Rfb0AYSu-OVgytPfKrv6Etdw,1414
+tf_models_nightly-2.14.0.dev20231114.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
+tf_models_nightly-2.14.0.dev20231114.dist-info/top_level.txt,sha256=gum2FfO5R4cvjl2-QtP-S1aNmsvIZaFFT6VFzU0f4-g,33
+tf_models_nightly-2.14.0.dev20231114.dist-info/RECORD,,