keras-hub-nightly 0.16.0.dev202409201942__tar.gz → 0.16.1.dev202409210335__tar.gz

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: keras-hub-nightly
-Version: 0.16.0.dev202409201942
+Version: 0.16.1.dev202409210335
 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.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/api_export.py

@@ -52,8 +52,8 @@ else:
 
     class keras_hub_export:
         def __init__(self, path):
-            pass
+            self.path = path
 
         def __call__(self, symbol):
-            maybe_register_serializable(symbol)
+            maybe_register_serializable(self.path, symbol)
             return symbol

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/layers/preprocessing/resizing_image_converter.py

@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import keras
+from keras import ops
 
 from keras_hub.src.api_export import keras_hub_export
 from keras_hub.src.layers.preprocessing.image_converter import ImageConverter
+from keras_hub.src.utils.keras_utils import standardize_data_format
 from keras_hub.src.utils.tensor_utils import preprocessing_function
 
 
@@ -23,13 +25,23 @@ class ResizingImageConverter(ImageConverter):
     """An `ImageConverter` that simply resizes the input image.
 
     The `ResizingImageConverter` is a subclass of `ImageConverter` for models
-    that simply need to resize image tensors before using them for modeling.
-    The layer will take as input a raw image tensor (batched or unbatched) in the
-    channels last or channels first format, and output a resize tensor.
+    that need to resize (and optionally rescale) image tensors before using them
+    for modeling. The layer will take as input a raw image tensor (batched or
+    unbatched) in the channels last or channels first format, and output a
+    resize tensor.
 
     Args:
-        height: Integer, the height of the output shape.
-        width: Integer, the width of the output shape.
+        height: int, the height of the output shape.
+        width: int, the width of the output shape.
+        scale: float or `None`. If set, the image we be rescaled with a
+            `keras.layers.Rescaling` layer, multiplying the image by this
+            scale.
+        mean: tuples of floats per channel or `None`. If set, the image will be
+            normalized per channel by subtracting mean.
+            If set, also set `variance`.
+        variance: tuples of floats per channel or `None`. If set, the image will
+            be normalized per channel by dividing by `sqrt(variance)`.
+            If set, also set `mean`.
         crop_to_aspect_ratio: If `True`, resize the images without aspect
             ratio distortion. When the original aspect ratio differs
             from the target aspect ratio, the output image will be
@@ -64,6 +76,9 @@ class ResizingImageConverter(ImageConverter):
         self,
         height,
         width,
+        scale=None,
+        mean=None,
+        variance=None,
         crop_to_aspect_ratio=True,
         interpolation="bilinear",
         data_format=None,
@@ -78,7 +93,26 @@ class ResizingImageConverter(ImageConverter):
             crop_to_aspect_ratio=crop_to_aspect_ratio,
             interpolation=interpolation,
             data_format=data_format,
+            dtype=self.dtype_policy,
+            name="resizing",
         )
+        if scale is not None:
+            self.rescaling = keras.layers.Rescaling(
+                scale=scale,
+                dtype=self.dtype_policy,
+                name="rescaling",
+            )
+        else:
+            self.rescaling = None
+        if (mean is not None) != (variance is not None):
+            raise ValueError(
+                "Both `mean` and `variance` should be set or `None`. Received "
+                f"`mean={mean}`, `variance={variance}`."
+            )
+        self.scale = scale
+        self.mean = mean
+        self.variance = variance
+        self.data_format = standardize_data_format(data_format)
 
     def image_size(self):
         """Returns the preprocessed size of a single image."""
@@ -86,7 +120,20 @@ class ResizingImageConverter(ImageConverter):
 
     @preprocessing_function
     def call(self, inputs):
-        return self.resizing(inputs)
+        x = self.resizing(inputs)
+        if self.rescaling:
+            x = self.rescaling(x)
+        if self.mean is not None:
+            # Avoid `layers.Normalization` so this works batched and unbatched.
+            channels_first = self.data_format == "channels_first"
+            if len(ops.shape(inputs)) == 3:
+                broadcast_dims = (1, 2) if channels_first else (0, 1)
+            else:
+                broadcast_dims = (0, 2, 3) if channels_first else (0, 1, 2)
+            mean = ops.expand_dims(ops.array(self.mean), broadcast_dims)
+            std = ops.expand_dims(ops.sqrt(self.variance), broadcast_dims)
+            x = (x - mean) / std
+        return x
 
     def get_config(self):
         config = super().get_config()
@@ -96,6 +143,9 @@ class ResizingImageConverter(ImageConverter):
                 "width": self.resizing.width,
                 "interpolation": self.resizing.interpolation,
                 "crop_to_aspect_ratio": self.resizing.crop_to_aspect_ratio,
+                "scale": self.scale,
+                "mean": self.mean,
+                "variance": self.variance,
             }
         )
         return config

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/csp_darknet/csp_darknet_backbone.py

@@ -31,9 +31,6 @@ class CSPDarkNetBackbone(FeaturePyramidBackbone):
             level in the model.
         stackwise_depth: A list of ints, the depth for each dark level in the
             model.
-        include_rescaling: boolean. If `True`, rescale the input using
-            `Rescaling(1 / 255.0)` layer. If `False`, do nothing. Defaults to
-            `True`.
         block_type: str. One of `"basic_block"` or `"depthwise_block"`.
             Use `"depthwise_block"` for depthwise conv block
             `"basic_block"` for basic conv block.
@@ -55,7 +52,6 @@ class CSPDarkNetBackbone(FeaturePyramidBackbone):
     model = keras_hub.models.CSPDarkNetBackbone(
         stackwise_num_filters=[128, 256, 512, 1024],
         stackwise_depth=[3, 9, 9, 3],
-        include_rescaling=False,
     )
     model(input_data)
     ```
@@ -65,7 +61,6 @@ class CSPDarkNetBackbone(FeaturePyramidBackbone):
         self,
         stackwise_num_filters,
         stackwise_depth,
-        include_rescaling=True,
         block_type="basic_block",
         image_shape=(None, None, 3),
         **kwargs,
@@ -82,10 +77,7 @@ class CSPDarkNetBackbone(FeaturePyramidBackbone):
         base_channels = stackwise_num_filters[0] // 2
 
         image_input = layers.Input(shape=image_shape)
-        x = image_input
-        if include_rescaling:
-            x = layers.Rescaling(scale=1 / 255.0)(x)
-
+        x = image_input  # Intermediate result.
         x = apply_focus(channel_axis, name="stem_focus")(x)
         x = apply_darknet_conv_block(
             base_channels,
@@ -130,7 +122,6 @@ class CSPDarkNetBackbone(FeaturePyramidBackbone):
         # === Config ===
         self.stackwise_num_filters = stackwise_num_filters
         self.stackwise_depth = stackwise_depth
-        self.include_rescaling = include_rescaling
         self.block_type = block_type
         self.image_shape = image_shape
         self.pyramid_outputs = pyramid_outputs
@@ -141,7 +132,6 @@ class CSPDarkNetBackbone(FeaturePyramidBackbone):
             {
                 "stackwise_num_filters": self.stackwise_num_filters,
                 "stackwise_depth": self.stackwise_depth,
-                "include_rescaling": self.include_rescaling,
                 "block_type": self.block_type,
                 "image_shape": self.image_shape,
             }

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/csp_darknet/csp_darknet_image_classifier.py

@@ -76,7 +76,6 @@ class CSPDarkNetImageClassifier(ImageClassifier):
     backbone = keras_hub.models.CSPDarkNetBackbone(
         stackwise_num_filters=[128, 256, 512, 1024],
         stackwise_depth=[3, 9, 9, 3],
-        include_rescaling=False,
         block_type="basic_block",
         image_shape = (224, 224, 3),
     )

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/densenet/densenet_backbone.py

@@ -31,9 +31,6 @@ class DenseNetBackbone(FeaturePyramidBackbone):
     Args:
         stackwise_num_repeats: list of ints, number of repeated convolutional
             blocks per dense block.
-        include_rescaling: bool, whether to rescale the inputs. If set
-            to `True`, inputs will be passed through a `Rescaling(1/255.0)`
-            layer. Defaults to `True`.
         image_shape: optional shape tuple, defaults to (None, None, 3).
         compression_ratio: float, compression rate at transition layers,
             defaults to 0.5.
@@ -51,7 +48,6 @@ class DenseNetBackbone(FeaturePyramidBackbone):
     # Randomly initialized backbone with a custom config
     model = keras_hub.models.DenseNetBackbone(
         stackwise_num_repeats=[6, 12, 24, 16],
-        include_rescaling=False,
     )
     model(input_data)
     ```
@@ -60,7 +56,6 @@ class DenseNetBackbone(FeaturePyramidBackbone):
     def __init__(
         self,
         stackwise_num_repeats,
-        include_rescaling=True,
         image_shape=(None, None, 3),
         compression_ratio=0.5,
         growth_rate=32,
@@ -71,10 +66,7 @@ class DenseNetBackbone(FeaturePyramidBackbone):
         channel_axis = -1 if data_format == "channels_last" else 1
         image_input = keras.layers.Input(shape=image_shape)
 
-        x = image_input
-        if include_rescaling:
-            x = keras.layers.Rescaling(1 / 255.0)(x)
-
+        x = image_input  # Intermediate result.
         x = keras.layers.Conv2D(
             64,
             7,
@@ -124,7 +116,6 @@ class DenseNetBackbone(FeaturePyramidBackbone):
 
         # === Config ===
         self.stackwise_num_repeats = stackwise_num_repeats
-        self.include_rescaling = include_rescaling
         self.compression_ratio = compression_ratio
         self.growth_rate = growth_rate
         self.image_shape = image_shape
@@ -135,7 +126,6 @@ class DenseNetBackbone(FeaturePyramidBackbone):
         config.update(
             {
                 "stackwise_num_repeats": self.stackwise_num_repeats,
-                "include_rescaling": self.include_rescaling,
                 "compression_ratio": self.compression_ratio,
                 "growth_rate": self.growth_rate,
                 "image_shape": self.image_shape,

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/densenet/densenet_image_classifier.py

@@ -74,7 +74,6 @@ class DenseNetImageClassifier(ImageClassifier):
     backbone = keras_hub.models.DenseNetBackbone(
         stackwise_num_filters=[128, 256, 512, 1024],
         stackwise_depth=[3, 9, 9, 3],
-        include_rescaling=False,
         block_type="basic_block",
         image_shape = (224, 224, 3),
     )

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/efficientnet/efficientnet_backbone.py

@@ -67,8 +67,6 @@ class EfficientNetBackbone(FeaturePyramidBackbone):
             MBConvBlock, but instead of using a depthwise convolution and a 1x1
             output convolution blocks fused blocks use a single 3x3 convolution
             block.
-        include_rescaling: bool, whether to rescale the inputs. If set to
-            True, inputs will be passed through a `Rescaling(1/255.0)` layer.
         min_depth: integer, minimum number of filters. Can be None and ignored
             if use_depth_divisor_as_min_depth is set to True.
         include_initial_padding: bool, whether to include initial zero padding
@@ -96,7 +94,6 @@ class EfficientNetBackbone(FeaturePyramidBackbone):
         stackwise_block_types=[["fused"] * 3 + ["unfused"] * 3],
         width_coefficient=1.0,
         depth_coefficient=1.0,
-        include_rescaling=False,
     )
     images = np.ones((1, 256, 256, 3))
     outputs = efficientnet.predict(images)
@@ -116,7 +113,6 @@ class EfficientNetBackbone(FeaturePyramidBackbone):
         stackwise_squeeze_and_excite_ratios,
         stackwise_strides,
         stackwise_block_types,
-        include_rescaling=True,
         dropout=0.2,
         depth_divisor=8,
         min_depth=8,
@@ -129,14 +125,9 @@ class EfficientNetBackbone(FeaturePyramidBackbone):
         batch_norm_momentum=0.9,
         **kwargs,
     ):
-        img_input = keras.layers.Input(shape=input_shape)
-
-        x = img_input
-
-        if include_rescaling:
-            # Use common rescaling strategy across keras
-            x = keras.layers.Rescaling(scale=1.0 / 255.0)(x)
+        image_input = keras.layers.Input(shape=input_shape)
 
+        x = image_input  # Intermediate result.
         if include_initial_padding:
             x = keras.layers.ZeroPadding2D(
                 padding=self._correct_pad_downsample(x, 3),
@@ -282,10 +273,9 @@ class EfficientNetBackbone(FeaturePyramidBackbone):
         curr_pyramid_level += 1
 
         # Create model.
-        super().__init__(inputs=img_input, outputs=x, **kwargs)
+        super().__init__(inputs=image_input, outputs=x, **kwargs)
 
         # === Config ===
-        self.include_rescaling = include_rescaling
         self.width_coefficient = width_coefficient
         self.depth_coefficient = depth_coefficient
         self.dropout = dropout
@@ -313,7 +303,6 @@ class EfficientNetBackbone(FeaturePyramidBackbone):
         config = super().get_config()
         config.update(
             {
-                "include_rescaling": self.include_rescaling,
                 "width_coefficient": self.width_coefficient,
                 "depth_coefficient": self.depth_coefficient,
                 "dropout": self.dropout,

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/mix_transformer/mix_transformer_backbone.py

@@ -36,7 +36,6 @@ class MiTBackbone(FeaturePyramidBackbone):
         end_value,
         patch_sizes,
         strides,
-        include_rescaling=True,
         image_shape=(None, None, 3),
         hidden_dims=None,
         **kwargs,
@@ -60,9 +59,6 @@ class MiTBackbone(FeaturePyramidBackbone):
                 value projections. If set to > 1, a `Conv2D` layer is used to
                 reduce the length of the sequence.
             end_value: The end value of the sequence.
-            include_rescaling: bool, whether to rescale the inputs. If set
-                to `True`, inputs will be passed through a `Rescaling(1/255.0)`
-                layer. Defaults to `True`.
             image_shape: optional shape tuple, defaults to (None, None, 3).
             hidden_dims: the embedding dims per hierarchical layer, used as
                 the levels of the feature pyramid.
@@ -123,11 +119,7 @@ class MiTBackbone(FeaturePyramidBackbone):
 
         # === Functional Model ===
         image_input = keras.layers.Input(shape=image_shape)
-        x = image_input
-
-        if include_rescaling:
-            x = keras.layers.Rescaling(scale=1 / 255)(x)
-
+        x = image_input  # Intermediate result.
         pyramid_outputs = {}
         for i in range(num_layers):
             # Compute new height/width after the `proj`
@@ -151,7 +143,6 @@ class MiTBackbone(FeaturePyramidBackbone):
 
         # === Config ===
         self.depths = depths
-        self.include_rescaling = include_rescaling
         self.image_shape = image_shape
         self.hidden_dims = hidden_dims
         self.pyramid_outputs = pyramid_outputs
@@ -167,7 +158,6 @@ class MiTBackbone(FeaturePyramidBackbone):
         config.update(
             {
                 "depths": self.depths,
-                "include_rescaling": self.include_rescaling,
                 "hidden_dims": self.hidden_dims,
                 "image_shape": self.image_shape,
                 "num_layers": self.num_layers,

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/mix_transformer/mix_transformer_classifier.py

@@ -76,7 +76,6 @@ class MiTImageClassifier(ImageClassifier):
     backbone = keras_hub.models.MiTBackbone(
         stackwise_num_filters=[128, 256, 512, 1024],
         stackwise_depth=[3, 9, 9, 3],
-        include_rescaling=False,
         block_type="basic_block",
         image_shape = (224, 224, 3),
     )

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/mobilenet/mobilenet_backbone.py

@@ -54,9 +54,6 @@ class MobileNetBackbone(Backbone):
             model. 0 if dont want to add Squeeze and Excite layer.
         stackwise_activation: list of activation functions, for each inverted
              residual block in the model.
-        include_rescaling: bool, whether to rescale the inputs. If set to True,
-            inputs will be passed through a `Rescaling(scale=1 / 255)`
-            layer.
         image_shape: optional shape tuple, defaults to (224, 224, 3).
         depth_multiplier: float, controls the width of the network.
             - If `depth_multiplier` < 1.0, proportionally decreases the number
@@ -92,7 +89,6 @@ class MobileNetBackbone(Backbone):
         stackwise_num_strides=[2, 2, 1],
         stackwise_se_ratio=[0.25, None, 0.25],
         stackwise_activation=["relu", "relu6", "hard_swish"],
-        include_rescaling=False,
         output_num_filters=1280,
         input_activation='hard_swish',
         output_activation='hard_swish',
@@ -111,7 +107,6 @@ class MobileNetBackbone(Backbone):
         stackwise_num_strides,
         stackwise_se_ratio,
         stackwise_activation,
-        include_rescaling,
         output_num_filters,
         inverted_res_block,
         image_shape=(224, 224, 3),
@@ -126,12 +121,8 @@ class MobileNetBackbone(Backbone):
             -1 if keras.config.image_data_format() == "channels_last" else 1
         )
 
-        inputs = keras.layers.Input(shape=image_shape)
-        x = inputs
-
-        if include_rescaling:
-            x = keras.layers.Rescaling(scale=1 / 255)(x)
-
+        image_input = keras.layers.Input(shape=image_shape)
+        x = image_input  # Intermediate result.
         input_num_filters = adjust_channels(input_num_filters)
         x = keras.layers.Conv2D(
             input_num_filters,
@@ -195,7 +186,7 @@ class MobileNetBackbone(Backbone):
             )(x)
             x = keras.layers.Activation(output_activation)(x)
 
-        super().__init__(inputs=inputs, outputs=x, **kwargs)
+        super().__init__(inputs=image_input, outputs=x, **kwargs)
 
         # === Config ===
         self.stackwise_expansion = stackwise_expansion
@@ -204,7 +195,6 @@ class MobileNetBackbone(Backbone):
         self.stackwise_num_strides = stackwise_num_strides
         self.stackwise_se_ratio = stackwise_se_ratio
         self.stackwise_activation = stackwise_activation
-        self.include_rescaling = include_rescaling
         self.depth_multiplier = depth_multiplier
         self.input_num_filters = input_num_filters
         self.output_num_filters = output_num_filters
@@ -223,7 +213,6 @@ class MobileNetBackbone(Backbone):
                 "stackwise_num_strides": self.stackwise_num_strides,
                 "stackwise_se_ratio": self.stackwise_se_ratio,
                 "stackwise_activation": self.stackwise_activation,
-                "include_rescaling": self.include_rescaling,
                 "image_shape": self.image_shape,
                 "depth_multiplier": self.depth_multiplier,
                 "input_num_filters": self.input_num_filters,

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/mobilenet/mobilenet_image_classifier.py

@@ -56,7 +56,6 @@ class MobileNetImageClassifier(ImageClassifier):
         stackwise_stride = [2, 2, 1],
         stackwise_se_ratio = [ 0.25, None, 0.25],
         stackwise_activation = ["relu", "relu", "hard_swish"],
-        include_rescaling = False,
         output_filter=1280,
         activation="hard_swish",
         inverted_res_block=True,

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/pali_gemma/pali_gemma_vit.py

@@ -476,6 +476,9 @@ 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"

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/resnet/resnet_backbone.py

@@ -44,9 +44,6 @@ class ResNetBackbone(FeaturePyramidBackbone):
     additional pooling operation rather than performing downsampling within
     the convolutional layers themselves.
 
-    Note that `ResNetBackbone` expects the inputs to be images with a value
-    range of `[0, 255]` when `include_rescaling=True`.
-
     Args:
         input_conv_filters: list of ints. The number of filters of the initial
             convolution(s).
@@ -65,9 +62,6 @@ class ResNetBackbone(FeaturePyramidBackbone):
             variants.
         use_pre_activation: boolean. Whether to use pre-activation or not.
             `True` for ResNetV2, `False` for ResNet.
-        include_rescaling: boolean. If `True`, rescale the input using
-            `Rescaling` and `Normalization` layers. If `False`, do nothing.
-            Defaults to `True`.
         image_shape: tuple. The input shape without the batch size.
             Defaults to `(None, None, 3)`.
         pooling: `None` or str. Pooling mode for feature extraction. Defaults
@@ -124,7 +118,6 @@ class ResNetBackbone(FeaturePyramidBackbone):
         stackwise_num_strides,
         block_type,
         use_pre_activation=False,
-        include_rescaling=True,
         image_shape=(None, None, 3),
         data_format=None,
         dtype=None,
@@ -170,18 +163,7 @@ class ResNetBackbone(FeaturePyramidBackbone):
 
         # === Functional Model ===
         image_input = layers.Input(shape=image_shape)
-        if include_rescaling:
-            x = layers.Rescaling(scale=1 / 255.0, dtype=dtype)(image_input)
-            x = layers.Normalization(
-                axis=bn_axis,
-                mean=(0.485, 0.456, 0.406),
-                variance=(0.229**2, 0.224**2, 0.225**2),
-                dtype=dtype,
-                name="normalization",
-            )(x)
-        else:
-            x = image_input
-
+        x = image_input  # Intermediate result.
         # The padding between torch and tensorflow/jax differs when `strides>1`.
         # Therefore, we need to manually pad the tensor.
         x = layers.ZeroPadding2D(
@@ -299,7 +281,6 @@ class ResNetBackbone(FeaturePyramidBackbone):
         self.stackwise_num_strides = stackwise_num_strides
         self.block_type = block_type
         self.use_pre_activation = use_pre_activation
-        self.include_rescaling = include_rescaling
         self.image_shape = image_shape
         self.pyramid_outputs = pyramid_outputs
         self.data_format = data_format
@@ -315,7 +296,6 @@ class ResNetBackbone(FeaturePyramidBackbone):
                 "stackwise_num_strides": self.stackwise_num_strides,
                 "block_type": self.block_type,
                 "use_pre_activation": self.use_pre_activation,
-                "include_rescaling": self.include_rescaling,
                 "image_shape": self.image_shape,
             }
         )

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/resnet/resnet_image_classifier.py

@@ -85,7 +85,6 @@ class ResNetImageClassifier(ImageClassifier):
         stackwise_num_strides=[1, 2, 2],
         block_type="basic_block",
         use_pre_activation=True,
-        include_rescaling=False,
         pooling="avg",
     )
     classifier = keras_hub.models.ResNetImageClassifier(

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/resnet/resnet_presets.py

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

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/vgg/vgg_backbone.py

@@ -33,8 +33,6 @@ class VGGBackbone(Backbone):
       stackwise_num_filters: list of ints, filter size for convolutional
             blocks per VGG block. For both VGG16 and VGG19 this is [
             64, 128, 256, 512, 512].
-      include_rescaling: bool, whether to rescale the inputs. If set to
-        True, inputs will be passed through a `Rescaling(1/255.0)` layer.
       image_shape: tuple, optional shape tuple, defaults to (224, 224, 3).
       pooling: bool, Optional pooling mode for feature extraction
         when `include_top` is `False`.
@@ -61,7 +59,6 @@ class VGGBackbone(Backbone):
         stackwise_num_repeats = [2, 2, 3, 3, 3],
         stackwise_num_filters = [64, 128, 256, 512, 512],
         image_shape = (224, 224, 3),
-        include_rescaling = False,
         pooling = "avg",
     )
     model(input_data)
@@ -72,7 +69,6 @@ class VGGBackbone(Backbone):
         self,
         stackwise_num_repeats,
         stackwise_num_filters,
-        include_rescaling,
         image_shape=(224, 224, 3),
         pooling="avg",
         **kwargs,
@@ -82,8 +78,6 @@ class VGGBackbone(Backbone):
         img_input = keras.layers.Input(shape=image_shape)
         x = img_input
 
-        if include_rescaling:
-            x = layers.Rescaling(scale=1 / 255.0)(x)
         for stack_index in range(len(stackwise_num_repeats) - 1):
             x = apply_vgg_block(
                 x=x,
@@ -105,7 +99,6 @@ class VGGBackbone(Backbone):
         # === Config ===
         self.stackwise_num_repeats = stackwise_num_repeats
         self.stackwise_num_filters = stackwise_num_filters
-        self.include_rescaling = include_rescaling
         self.image_shape = image_shape
         self.pooling = pooling
 
@@ -113,7 +106,6 @@ class VGGBackbone(Backbone):
         return {
             "stackwise_num_repeats": self.stackwise_num_repeats,
             "stackwise_num_filters": self.stackwise_num_filters,
-            "include_rescaling": self.include_rescaling,
             "image_shape": self.image_shape,
             "pooling": self.pooling,
         }

{keras_hub_nightly-0.16.0.dev202409201942 → keras_hub_nightly-0.16.1.dev202409210335}/keras_hub/src/models/vgg/vgg_image_classifier.py

@@ -66,7 +66,6 @@ class VGGImageClassifier(ImageClassifier):
         stackwise_num_repeats = [2, 2, 3, 3, 3],
         stackwise_num_filters = [64, 128, 256, 512, 512],
         image_shape = (224, 224, 3),
-        include_rescaling = False,
         pooling = "avg",
     )
     classifier = keras_hub.models.VGGImageClassifier(