keras-hub-nightly 0.16.1.dev202410170342__tar.gz → 0.16.1.dev202410180341__tar.gz

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: keras-hub-nightly
-Version: 0.16.1.dev202410170342
+Version: 0.16.1.dev202410180341
 Summary: Industry-strength Natural Language Processing extensions for Keras.
 Home-page: https://github.com/keras-team/keras-hub
 Author: Keras team

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub/src/models/deeplab_v3/deeplab_v3_presets.py

@@ -1,7 +1,7 @@
 """DeepLabV3 preset configurations."""
 
 backbone_presets = {
-    "deeplabv3_plus_resnet50_pascalvoc": {
+    "deeplab_v3_plus_resnet50_pascalvoc": {
         "metadata": {
             "description": (
                 "DeepLabV3+ model with ResNet50 as image encoder and trained on "
@@ -10,9 +10,9 @@ backbone_presets = {
             ),
             "params": 39190656,
             "official_name": "DeepLabV3",
-            "path": "deeplabv3",
+            "path": "deeplab_v3",
             "model_card": "https://arxiv.org/abs/1802.02611",
         },
-        "kaggle_handle": "kaggle://keras/deeplabv3/keras/deeplab_v3_plus_resnet50_pascalvoc/3",
+        "kaggle_handle": "kaggle://keras/deeplabv3plus/keras/deeplab_v3_plus_resnet50_pascalvoc/3",
     },
 }

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub/src/models/densenet/densenet_presets.py

@@ -12,7 +12,7 @@ backbone_presets = {
             "path": "densenet",
             "model_card": "https://arxiv.org/abs/1608.06993",
         },
-        "kaggle_handle": "kaggle://keras/densenet/keras/densenet_121_imagenet/1",
+        "kaggle_handle": "kaggle://keras/densenet/keras/densenet_121_imagenet/2",
     },
     "densenet_169_imagenet": {
         "metadata": {
@@ -25,7 +25,7 @@ backbone_presets = {
             "path": "densenet",
             "model_card": "https://arxiv.org/abs/1608.06993",
         },
-        "kaggle_handle": "kaggle://keras/densenet/keras/densenet_169_imagenet/1",
+        "kaggle_handle": "kaggle://keras/densenet/keras/densenet_169_imagenet/2",
     },
     "densenet_201_imagenet": {
         "metadata": {
@@ -38,6 +38,6 @@ backbone_presets = {
             "path": "densenet",
             "model_card": "https://arxiv.org/abs/1608.06993",
         },
-        "kaggle_handle": "kaggle://keras/densenet/keras/densenet_201_imagenet/1",
+        "kaggle_handle": "kaggle://keras/densenet/keras/densenet_201_imagenet/2",
     },
 }

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub/src/models/pali_gemma/pali_gemma_backbone.py

@@ -61,8 +61,6 @@ class PaliGemmaBackbone(Backbone):
         vit_classifier_activation: activation function. The activation that
             is used for final output classification in the vision transformer.
         vit_name: string. The name used for vision transformer layers.
-        include_rescaling: bool. If true, the image input will be rescaled from
-            the range `[0, 255]`, to the range `[0, 1]`.
         layer_norm_epsilon: float. The epsilon value user for every layer norm
             in all transformer blocks.
         dropout: float. Dropout probability for the Transformer decoder blocks.
@@ -121,7 +119,6 @@ class PaliGemmaBackbone(Backbone):
         vit_pooling=None,
         vit_classifier_activation=None,
         vit_name=None,
-        include_rescaling=True,
         layer_norm_epsilon=1e-6,
         dropout=0,
         dtype=None,
@@ -145,7 +142,6 @@ class PaliGemmaBackbone(Backbone):
         vit_intermediate_dim = vit_intermediate_dim or 4304
         self.vit_encoder = PaliGemmaVit(
             image_size=image_size,
-            include_rescaling=include_rescaling,
             patch_size=vit_patch_size,
             num_heads=vit_num_heads,
             hidden_dim=vit_hidden_dim,
@@ -215,7 +211,6 @@ class PaliGemmaBackbone(Backbone):
         # === Config ===
         self.vocabulary_size = vocabulary_size
         self.image_size = image_size
-        self.include_rescaling = include_rescaling
         self.num_layers = num_layers
         self.num_query_heads = num_query_heads
         self.num_key_value_heads = num_key_value_heads
@@ -242,7 +237,6 @@ class PaliGemmaBackbone(Backbone):
             {
                 "vocabulary_size": self.vocabulary_size,
                 "image_size": self.image_size,
-                "include_rescaling": self.include_rescaling,
                 "num_layers": self.num_layers,
                 "num_query_heads": self.num_query_heads,
                 "num_key_value_heads": self.num_key_value_heads,

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub/src/models/pali_gemma/pali_gemma_presets.py

@@ -12,7 +12,7 @@ backbone_presets = {
             "path": "pali_gemma",
             "model_card": "https://www.kaggle.com/models/google/paligemma",
         },
-        "kaggle_handle": "kaggle://keras/paligemma/keras/pali_gemma_3b_mix_224/2",
+        "kaggle_handle": "kaggle://keras/paligemma/keras/pali_gemma_3b_mix_224/3",
     },
     "pali_gemma_3b_mix_448": {
         "metadata": {
@@ -24,7 +24,7 @@ backbone_presets = {
             "path": "pali_gemma",
             "model_card": "https://www.kaggle.com/models/google/paligemma",
         },
-        "kaggle_handle": "kaggle://keras/paligemma/keras/pali_gemma_3b_mix_448/2",
+        "kaggle_handle": "kaggle://keras/paligemma/keras/pali_gemma_3b_mix_448/3",
     },
     "pali_gemma_3b_224": {
         "metadata": {
@@ -36,7 +36,7 @@ backbone_presets = {
             "path": "pali_gemma",
             "model_card": "https://www.kaggle.com/models/google/paligemma",
         },
-        "kaggle_handle": "kaggle://keras/paligemma/keras/pali_gemma_3b_224/2",
+        "kaggle_handle": "kaggle://keras/paligemma/keras/pali_gemma_3b_224/3",
     },
     "pali_gemma_3b_448": {
         "metadata": {
@@ -48,7 +48,7 @@ backbone_presets = {
             "path": "pali_gemma",
             "model_card": "https://www.kaggle.com/models/google/paligemma",
         },
-        "kaggle_handle": "kaggle://keras/paligemma/keras/pali_gemma_3b_448/2",
+        "kaggle_handle": "kaggle://keras/paligemma/keras/pali_gemma_3b_448/3",
     },
     "pali_gemma_3b_896": {
         "metadata": {
@@ -60,6 +60,6 @@ backbone_presets = {
             "path": "pali_gemma",
             "model_card": "https://www.kaggle.com/models/google/paligemma",
         },
-        "kaggle_handle": "kaggle://keras/paligemma/keras/pali_gemma_3b_896/2",
+        "kaggle_handle": "kaggle://keras/paligemma/keras/pali_gemma_3b_896/3",
     },
 }

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub/src/models/pali_gemma/pali_gemma_vit.py

@@ -410,8 +410,6 @@ class PaliGemmaVit(keras.Model):
     Args:
         image_size: int. The height/width of the image. Both height and width is
             expected to be the same.
-        include_rescaling: bool. If true, the image input will be rescaled from
-            the range `[0, 255]`, to the range `[0, 1]`.
         patch_size: int. The size of each square patch in the input image.
         num_heads: int. The number of attention heads for the vision(image)
             transformer encoder.
@@ -452,7 +450,6 @@ class PaliGemmaVit(keras.Model):
         num_layers,
         intermediate_dim,
         num_classes,
-        include_rescaling=True,
         pooling=None,
         classifier_activation=None,
         dtype=None,
@@ -463,14 +460,6 @@ class PaliGemmaVit(keras.Model):
             shape=(image_size, image_size, 3), name="images"
         )
         x = image_input  # Intermediate result.
-        # TODO we have moved this rescaling to preprocessing layers for most
-        # models. We should consider removing it here, though it would break
-        # compatibility.
-        if include_rescaling:
-            rescaling = keras.layers.Rescaling(
-                scale=1.0 / 127.5, offset=-1.0, name="rescaling"
-            )
-            x = rescaling(image_input)
         x = PaliGemmaVitEncoder(
             hidden_dim=hidden_dim,
             num_layers=num_layers,
@@ -520,7 +509,6 @@ class PaliGemmaVit(keras.Model):
         self.pooling = pooling
         self.num_classes = num_classes
         self.image_size = image_size
-        self.include_rescaling = include_rescaling
         self.patch_size = patch_size
         self.classifier_activation = keras.activations.get(
             classifier_activation
@@ -549,7 +537,6 @@ class PaliGemmaVit(keras.Model):
                     self.classifier_activation
                 ),
                 "image_size": self.image_size,
-                "include_rescaling": self.include_rescaling,
                 "patch_size": self.patch_size,
             }
         )

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub/src/models/preprocessor.py

@@ -71,6 +71,22 @@ class Preprocessor(PreprocessingLayer):
     def image_converter(self, value):
         self._image_converter = value
 
+    @property
+    def image_size(self):
+        """Shortcut to get/set the image size of the image converter."""
+        if self.image_converter is None:
+            return None
+        return self.image_converter.image_size
+
+    @image_size.setter
+    def image_size(self, value):
+        if self.image_converter is None:
+            raise ValueError(
+                "Cannot set `image_size` on preprocessor if `image_converter` "
+                " is `None`."
+            )
+        self.image_converter.image_size = value
+
     def get_config(self):
         config = super().get_config()
         if self.tokenizer:

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub/src/models/resnet/resnet_presets.py

@@ -12,7 +12,7 @@ backbone_presets = {
             "path": "resnet",
             "model_card": "https://arxiv.org/abs/2110.00476",
         },
-        "kaggle_handle": "kaggle://keras/resnetv1/keras/resnet_18_imagenet/1",
+        "kaggle_handle": "kaggle://keras/resnetv1/keras/resnet_18_imagenet/2",
     },
     "resnet_50_imagenet": {
         "metadata": {
@@ -25,7 +25,7 @@ backbone_presets = {
             "path": "resnet",
             "model_card": "https://arxiv.org/abs/2110.00476",
         },
-        "kaggle_handle": "kaggle://keras/resnetv1/keras/resnet_50_imagenet/1",
+        "kaggle_handle": "kaggle://keras/resnetv1/keras/resnet_50_imagenet/2",
     },
     "resnet_101_imagenet": {
         "metadata": {
@@ -38,7 +38,7 @@ backbone_presets = {
             "path": "resnet",
             "model_card": "https://arxiv.org/abs/2110.00476",
         },
-        "kaggle_handle": "kaggle://keras/resnetv1/keras/resnet_101_imagenet/1",
+        "kaggle_handle": "kaggle://keras/resnetv1/keras/resnet_101_imagenet/2",
     },
     "resnet_152_imagenet": {
         "metadata": {
@@ -51,7 +51,7 @@ backbone_presets = {
             "path": "resnet",
             "model_card": "https://arxiv.org/abs/2110.00476",
         },
-        "kaggle_handle": "kaggle://keras/resnetv1/keras/resnet_152_imagenet/1",
+        "kaggle_handle": "kaggle://keras/resnetv1/keras/resnet_152_imagenet/2",
     },
     "resnet_v2_50_imagenet": {
         "metadata": {
@@ -64,7 +64,7 @@ backbone_presets = {
             "path": "resnet",
             "model_card": "https://arxiv.org/abs/2110.00476",
         },
-        "kaggle_handle": "kaggle://keras/resnetv2/keras/resnet_v2_50_imagenet/1",
+        "kaggle_handle": "kaggle://keras/resnetv2/keras/resnet_v2_50_imagenet/2",
     },
     "resnet_v2_101_imagenet": {
         "metadata": {
@@ -77,6 +77,6 @@ backbone_presets = {
             "path": "resnet",
             "model_card": "https://arxiv.org/abs/2110.00476",
         },
-        "kaggle_handle": "kaggle://keras/resnetv2/keras/resnet_v2_101_imagenet/1",
+        "kaggle_handle": "kaggle://keras/resnetv2/keras/resnet_v2_101_imagenet/2",
     },
 }

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub/src/models/task.py

@@ -280,7 +280,7 @@ class Task(PipelineModel):
 
         def highlight_number(x):
             if x is None:
-                f"[color(45)]{x}[/]"
+                return f"[color(45)]{x}[/]"
             return f"[color(34)]{x:,}[/]"  # Format number with commas.
 
         def highlight_symbol(x):
@@ -339,7 +339,10 @@ class Task(PipelineModel):
                         add_layer(layer, info)
                     elif isinstance(layer, ImageConverter):
                         info = "Image size: "
-                        info += highlight_shape(layer.image_size)
+                        image_size = layer.image_size
+                        if image_size is None:
+                            image_size = (None, None)
+                        info += highlight_shape(image_size)
                         add_layer(layer, info)
                     elif isinstance(layer, AudioConverter):
                         info = "Audio shape: "

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub/src/utils/timm/preset_loader.py

@@ -53,10 +53,11 @@ class TimmPresetLoader(PresetLoader):
 
     def load_image_converter(self, cls, **kwargs):
         pretrained_cfg = self.config.get("pretrained_cfg", None)
-        if not pretrained_cfg:
+        if not pretrained_cfg or "input_size" not in pretrained_cfg:
             return None
         # This assumes the same basic setup for all timm preprocessing, We may
         # need to extend this as we cover more model types.
+        input_size = pretrained_cfg["input_size"]
         mean = pretrained_cfg["mean"]
         std = pretrained_cfg["std"]
         scale = [1.0 / 255.0 / s for s in std]
@@ -65,6 +66,7 @@ class TimmPresetLoader(PresetLoader):
         if interpolation not in ("bilinear", "nearest", "bicubic"):
             interpolation = "bilinear"  # Unsupported interpolation type.
         return cls(
+            image_size=input_size[1:],
             scale=scale,
             offset=offset,
             interpolation=interpolation,

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub/src/version_utils.py

@@ -1,7 +1,7 @@
 from keras_hub.src.api_export import keras_hub_export
 
 # Unique source of truth for the version number.
-__version__ = "0.16.1.dev202410170342"
+__version__ = "0.16.1.dev202410180341"
 
 
 @keras_hub_export("keras_hub.version")

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/keras_hub_nightly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: keras-hub-nightly
-Version: 0.16.1.dev202410170342
+Version: 0.16.1.dev202410180341
 Summary: Industry-strength Natural Language Processing extensions for Keras.
 Home-page: https://github.com/keras-team/keras-hub
 Author: Keras team

{keras_hub_nightly-0.16.1.dev202410170342 → keras_hub_nightly-0.16.1.dev202410180341}/setup.py

@@ -23,7 +23,7 @@ def get_version(rel_path):
 
 HERE = pathlib.Path(__file__).parent
 README = (HERE / "README.md").read_text()
-VERSION = "0.16.1.dev202410170342"  # get_version("keras_hub/src/version_utils.py")
+VERSION = "0.16.1.dev202410180341"  # get_version("keras_hub/src/version_utils.py")
 
 setup(
     name="keras-hub-nightly",  # "keras-hub",