keras-nightly 3.12.0.dev2025082103__py3-none-any.whl → 3.12.0.dev2025082203__py3-none-any.whl

keras/src/layers/preprocessing/image_preprocessing/random_saturation.py

@@ -13,6 +13,9 @@ class RandomSaturation(BaseImagePreprocessingLayer):
     This layer will randomly increase/reduce the saturation for the input RGB
     images.
 
+    **Note:** This layer is safe to use inside a `tf.data` or `grain` pipeline
+    (independently of which backend you're using).
+
     Args:
         factor: A tuple of two floats or a single float.
             `factor` controls the extent to which the image saturation

keras/src/layers/preprocessing/image_preprocessing/random_sharpness.py

@@ -13,6 +13,9 @@ class RandomSharpness(BaseImagePreprocessingLayer):
     original image and the processed image. This operation adjusts the clarity
     of the edges in an image, ranging from blurred to enhanced sharpness.
 
+    **Note:** This layer is safe to use inside a `tf.data` or `grain` pipeline
+    (independently of which backend you're using).
+
     Args:
         factor: A tuple of two floats or a single float.
             `factor` controls the extent to which the image sharpness

keras/src/layers/preprocessing/image_preprocessing/random_shear.py

@@ -23,6 +23,9 @@ class RandomShear(BaseImagePreprocessingLayer):
     regions created during the transformation are filled according to the
     `fill_mode` and `fill_value` parameters.
 
+    **Note:** This layer is safe to use inside a `tf.data` or `grain` pipeline
+    (independently of which backend you're using).
+
     Args:
         x_factor: A tuple of two floats. For each augmented image, a value
             is sampled from the provided range. If a float is passed, the

keras/src/layers/preprocessing/image_preprocessing/random_translation.py

@@ -23,6 +23,9 @@ class RandomTranslation(BaseImagePreprocessingLayer):
     of integer or floating point dtype. By default, the layer will output
     floats.
 
+    **Note:** This layer is safe to use inside a `tf.data` or `grain` pipeline
+    (independently of which backend you're using).
+
     Input shape:
         3D (unbatched) or 4D (batched) tensor with shape:
         `(..., height, width, channels)`, in `"channels_last"` format,
@@ -34,9 +37,6 @@ class RandomTranslation(BaseImagePreprocessingLayer):
         or `(..., channels, target_height, target_width)`,
         in `"channels_first"` format.
 
-    **Note:** This layer is safe to use inside a `tf.data` pipeline
-    (independently of which backend you're using).
-
     Args:
         height_factor: a float represented as fraction of value, or a tuple of
             size 2 representing lower and upper bound for shifting vertically. A

keras/src/layers/preprocessing/image_preprocessing/random_zoom.py

@@ -24,6 +24,9 @@ class RandomZoom(BaseImagePreprocessingLayer):
     of integer or floating point dtype.
     By default, the layer will output floats.
 
+    **Note:** This layer is safe to use inside a `tf.data` or `grain` pipeline
+    (independently of which backend you're using).
+
     Input shape:
         3D (unbatched) or 4D (batched) tensor with shape:
         `(..., height, width, channels)`, in `"channels_last"` format,
@@ -35,9 +38,6 @@ class RandomZoom(BaseImagePreprocessingLayer):
         or `(..., channels, target_height, target_width)`,
         in `"channels_first"` format.
 
-    **Note:** This layer is safe to use inside a `tf.data` pipeline
-    (independently of which backend you're using).
-
     Args:
         height_factor: a float represented as fraction of value, or a tuple of
             size 2 representing lower and upper bound for zooming vertically.

keras/src/layers/preprocessing/image_preprocessing/resizing.py

@@ -21,6 +21,9 @@ class Resizing(BaseImagePreprocessingLayer):
     format. Input pixel values can be of any range
     (e.g. `[0., 1.)` or `[0, 255]`).
 
+    **Note:** This layer is safe to use inside a `tf.data` or `grain` pipeline
+    (independently of which backend you're using).
+
     Input shape:
         3D (unbatched) or 4D (batched) tensor with shape:
         `(..., height, width, channels)`, in `"channels_last"` format,
@@ -32,9 +35,6 @@ class Resizing(BaseImagePreprocessingLayer):
         or `(..., channels, target_height, target_width)`,
         in `"channels_first"` format.
 
-    **Note:** This layer is safe to use inside a `tf.data` pipeline
-    (independently of which backend you're using).
-
     Args:
         height: Integer, the height of the output shape.
         width: Integer, the width of the output shape.

keras/src/layers/preprocessing/image_preprocessing/solarization.py

@@ -15,6 +15,9 @@ class Solarization(BaseImagePreprocessingLayer):
     to all values. When created with specified `threshold` the layer only
     augments pixels that are above the `threshold` value.
 
+    **Note:** This layer is safe to use inside a `tf.data` or `grain` pipeline
+    (independently of which backend you're using).
+
     Args:
         addition_factor: (Optional)  A tuple of two floats or a single float,
             between 0 and 1.

keras/src/layers/preprocessing/mel_spectrogram.py

@@ -1,5 +1,5 @@
 from keras.src.api_export import keras_export
-from keras.src.layers.preprocessing.tf_data_layer import TFDataLayer
+from keras.src.layers.preprocessing.data_layer import DataLayer
 
 # mel spectrum constants.
 _MEL_BREAK_FREQUENCY_HERTZ = 700.0
@@ -7,7 +7,7 @@ _MEL_HIGH_FREQUENCY_Q = 1127.0
 
 
 @keras_export("keras.layers.MelSpectrogram")
-class MelSpectrogram(TFDataLayer):
+class MelSpectrogram(DataLayer):
     """A preprocessing layer to convert raw audio signals to Mel spectrograms.
 
     This layer takes `float32`/`float64` single or batched audio signal as
@@ -24,10 +24,37 @@ class MelSpectrogram(TFDataLayer):
     speech and music processing tasks like speech recognition, speaker
     identification, and music genre classification.
 
+    **Note:** This layer is safe to use inside a `tf.data` or `grain` pipeline
+    (independently of which backend you're using).
+
     References:
     - [Spectrogram](https://en.wikipedia.org/wiki/Spectrogram),
     - [Mel scale](https://en.wikipedia.org/wiki/Mel_scale).
 
+    Args:
+        fft_length: Integer, size of the FFT window.
+        sequence_stride: Integer, number of samples between successive STFT
+            columns.
+        sequence_length: Integer, size of the window used for applying
+            `window` to each audio frame. If `None`, defaults to `fft_length`.
+        window: String, name of the window function to use. Available values
+            are `"hann"` and `"hamming"`. If `window` is a tensor, it will be
+            used directly as the window and its length must be
+            `sequence_length`. If `window` is `None`, no windowing is
+            used. Defaults to `"hann"`.
+        sampling_rate: Integer, sample rate of the input signal.
+        num_mel_bins: Integer, number of mel bins to generate.
+        min_freq: Float, minimum frequency of the mel bins.
+        max_freq: Float, maximum frequency of the mel bins.
+            If `None`, defaults to `sampling_rate / 2`.
+        power_to_db: If True, convert the power spectrogram to decibels.
+        top_db: Float, minimum negative cut-off `max(10 * log10(S)) - top_db`.
+        mag_exp: Float, exponent for the magnitude spectrogram.
+            1 for magnitude, 2 for power, etc. Default is 2.
+        ref_power: Float, the power is scaled relative to it
+            `10 * log10(S / ref_power)`.
+        min_power: Float, minimum value for power and `ref_power`.
+
     Examples:
 
     **Unbatched audio signal**
@@ -55,29 +82,6 @@ class MelSpectrogram(TFDataLayer):
         2D (unbatched) or 3D (batched) tensor with
         shape:`(..., num_mel_bins, time)`.
 
-    Args:
-        fft_length: Integer, size of the FFT window.
-        sequence_stride: Integer, number of samples between successive STFT
-            columns.
-        sequence_length: Integer, size of the window used for applying
-            `window` to each audio frame. If `None`, defaults to `fft_length`.
-        window: String, name of the window function to use. Available values
-            are `"hann"` and `"hamming"`. If `window` is a tensor, it will be
-            used directly as the window and its length must be
-            `sequence_length`. If `window` is `None`, no windowing is
-            used. Defaults to `"hann"`.
-        sampling_rate: Integer, sample rate of the input signal.
-        num_mel_bins: Integer, number of mel bins to generate.
-        min_freq: Float, minimum frequency of the mel bins.
-        max_freq: Float, maximum frequency of the mel bins.
-            If `None`, defaults to `sampling_rate / 2`.
-        power_to_db: If True, convert the power spectrogram to decibels.
-        top_db: Float, minimum negative cut-off `max(10 * log10(S)) - top_db`.
-        mag_exp: Float, exponent for the magnitude spectrogram.
-            1 for magnitude, 2 for power, etc. Default is 2.
-        ref_power: Float, the power is scaled relative to it
-            `10 * log10(S / ref_power)`.
-        min_power: Float, minimum value for power and `ref_power`.
     """
 
     def __init__(

keras/src/layers/preprocessing/normalization.py

@@ -5,12 +5,12 @@ import numpy as np
 from keras.src import backend
 from keras.src import ops
 from keras.src.api_export import keras_export
-from keras.src.layers.preprocessing.tf_data_layer import TFDataLayer
+from keras.src.layers.preprocessing.data_layer import DataLayer
 from keras.src.utils.module_utils import tensorflow as tf
 
 
 @keras_export("keras.layers.Normalization")
-class Normalization(TFDataLayer):
+class Normalization(DataLayer):
     """A preprocessing layer that normalizes continuous features.
 
     This layer will shift and scale inputs into a distribution centered around
@@ -23,6 +23,9 @@ class Normalization(TFDataLayer):
     variance of the data and store them as the layer's weights. `adapt()` should
     be called before `fit()`, `evaluate()`, or `predict()`.
 
+    **Note:** This layer is safe to use inside a `tf.data` or `grain` pipeline
+    (independently of which backend you're using).
+
     Args:
         axis: Integer, tuple of integers, or None. The axis or axes that should
             have a separate mean and variance for each index in the shape.

keras/src/layers/preprocessing/rescaling.py

@@ -1,11 +1,11 @@
 from keras.src import backend
 from keras.src.api_export import keras_export
-from keras.src.layers.preprocessing.tf_data_layer import TFDataLayer
+from keras.src.layers.preprocessing.data_layer import DataLayer
 from keras.src.saving import serialization_lib
 
 
 @keras_export("keras.layers.Rescaling")
-class Rescaling(TFDataLayer):
+class Rescaling(DataLayer):
     """A preprocessing layer which rescales input values to a new range.
 
     This layer rescales every value of an input (often an image) by multiplying
@@ -23,7 +23,7 @@ class Rescaling(TFDataLayer):
     of integer or floating point dtype, and by default the layer will output
     floats.
 
-    **Note:** This layer is safe to use inside a `tf.data` pipeline
+    **Note:** This layer is safe to use inside a `tf.data` or `grain` pipeline
     (independently of which backend you're using).
 
     Args:

keras/src/layers/rnn/bidirectional.py

@@ -109,16 +109,16 @@ class Bidirectional(Layer):
         # Recreate the forward layer from the original layer config, so that it
         # will not carry over any state from the layer.
         config = serialization_lib.serialize_keras_object(layer)
-        config["config"]["name"] = "forward_" + utils.removeprefix(
-            layer.name, "forward_"
+        config["config"]["name"] = (
+            f"forward_{utils.removeprefix(layer.name, 'forward_')}"
         )
         self.forward_layer = serialization_lib.deserialize_keras_object(config)
 
         if backward_layer is None:
             config = serialization_lib.serialize_keras_object(layer)
             config["config"]["go_backwards"] = True
-            config["config"]["name"] = "backward_" + utils.removeprefix(
-                layer.name, "backward_"
+            config["config"]["name"] = (
+                f"backward_{utils.removeprefix(layer.name, 'backward_')}"
             )
             self.backward_layer = serialization_lib.deserialize_keras_object(
                 config

keras/src/legacy/backend.py

@@ -68,11 +68,7 @@ def batch_dot(x, y, axes=None):
         raise ValueError(
             "Cannot do batch_dot on inputs "
             "with rank < 2. "
-            "Received inputs with tf.shapes "
-            + str(x_shape)
-            + " and "
-            + str(y_shape)
-            + "."
+            f"Received inputs with tf.shapes {x_shape} and {y_shape}."
         )
 
     x_batch_size = x_shape[0]
@@ -84,10 +80,7 @@ def batch_dot(x, y, axes=None):
                 "Cannot do batch_dot on inputs "
                 "with different batch sizes. "
                 "Received inputs with tf.shapes "
-                + str(x_shape)
-                + " and "
-                + str(y_shape)
-                + "."
+                f"{x_shape} and {y_shape}."
             )
     if isinstance(axes, int):
         axes = [axes, axes]
@@ -101,9 +94,8 @@ def batch_dot(x, y, axes=None):
     if py_any(isinstance(a, (list, tuple)) for a in axes):
         raise ValueError(
             "Multiple target dimensions are not supported. "
-            + "Expected: None, int, (int, int), "
-            + "Provided: "
-            + str(axes)
+            "Expected: None, int, (int, int), "
+            f"Provided: {axes}"
         )
 
     # if tuple, convert to list.
@@ -130,12 +122,8 @@ def batch_dot(x, y, axes=None):
     if d1 is not None and d2 is not None and d1 != d2:
         raise ValueError(
             "Cannot do batch_dot on inputs with tf.shapes "
-            + str(x_shape)
-            + " and "
-            + str(y_shape)
-            + " with axes="
-            + str(axes)
-            + ". x.shape[%d] != y.shape[%d] (%d != %d)."
+            f"{x_shape} and {y_shape} with axes={axes}. "
+            "x.shape[%d] != y.shape[%d] (%d != %d)."
             % (axes[0], axes[1], d1, d2)
         )
 
@@ -1129,7 +1117,7 @@ def pool2d(
             x, pool_size, strides, padding=padding, data_format=tf_data_format
         )
     else:
-        raise ValueError("Invalid pooling mode: " + str(pool_mode))
+        raise ValueError(f"Invalid pooling mode: {str(pool_mode)}")
 
     if data_format == "channels_first" and tf_data_format == "NHWC":
         x = tf.transpose(x, (0, 3, 1, 2))  # NHWC -> NCHW
@@ -1169,7 +1157,7 @@ def pool3d(
             x, pool_size, strides, padding=padding, data_format=tf_data_format
         )
     else:
-        raise ValueError("Invalid pooling mode: " + str(pool_mode))
+        raise ValueError(f"Invalid pooling mode: {str(pool_mode)}")
 
     if data_format == "channels_first" and tf_data_format == "NDHWC":
         x = tf.transpose(x, (0, 4, 1, 2, 3))
@@ -2150,9 +2138,7 @@ def switch(condition, then_expression, else_expression):
                 "Rank of `condition` should be less than or"
                 " equal to rank of `then_expression` and "
                 "`else_expression`. ndim(condition)="
-                + str(cond_ndim)
-                + ", ndim(then_expression)="
-                + str(expr_ndim)
+                f"{cond_ndim}, ndim(then_expression)={expr_ndim}"
             )
         if cond_ndim > 1:
             ndim_diff = expr_ndim - cond_ndim

keras/src/legacy/preprocessing/image.py

@@ -617,17 +617,12 @@ class NumpyArrayIterator(Iterator):
         channels_axis = 3 if data_format == "channels_last" else 1
         if self.x.shape[channels_axis] not in {1, 3, 4}:
             warnings.warn(
-                'NumpyArrayIterator is set to use the data format convention "'
-                + data_format
-                + '" (channels on axis '
-                + str(channels_axis)
-                + "), i.e. expected either 1, 3, or 4 channels on axis "
-                + str(channels_axis)
-                + ". However, it was passed an array with shape "
-                + str(self.x.shape)
-                + " ("
-                + str(self.x.shape[channels_axis])
-                + " channels)."
+                f"NumpyArrayIterator is set to use the data format convention"
+                f' "{data_format}" (channels on axis {channels_axis})'
+                ", i.e. expected either 1, 3, or 4 channels "
+                f"on axis {channels_axis}. "
+                f"However, it was passed an array with shape {self.x.shape}"
+                f" ({self.x.shape[channels_axis]} channels)."
             )
         if y is not None:
             self.y = np.asarray(y)
@@ -1494,17 +1489,11 @@ class ImageDataGenerator:
         if x.shape[self.channel_axis] not in {1, 3, 4}:
             warnings.warn(
                 "Expected input to be images (as Numpy array) "
-                'following the data format convention "'
-                + self.data_format
-                + '" (channels on axis '
-                + str(self.channel_axis)
-                + "), i.e. expected either 1, 3 or 4 channels on axis "
-                + str(self.channel_axis)
-                + ". However, it was passed an array with shape "
-                + str(x.shape)
-                + " ("
-                + str(x.shape[self.channel_axis])
-                + " channels)."
+                f'following the data format convention "{self.data_format}'
+                f'" (channels on axis {self.channel_axis})'
+                ", i.e. expected either 1, 3 or 4 channels on axis "
+                f"{self.channel_axis}. However, it was passed an array with"
+                f" shape {x.shape} ({x.shape[self.channel_axis]} channels)."
             )
 
         if seed is not None:

keras/src/legacy/preprocessing/text.py

@@ -102,7 +102,7 @@ class Tokenizer:
             num_words = kwargs.pop("nb_words")
         document_count = kwargs.pop("document_count", 0)
         if kwargs:
-            raise TypeError("Unrecognized keyword arguments: " + str(kwargs))
+            raise TypeError(f"Unrecognized keyword arguments: {str(kwargs)}")
 
         self.word_counts = collections.OrderedDict()
         self.word_docs = collections.defaultdict(int)

keras/src/models/functional.py

@@ -773,7 +773,7 @@ def is_input_keras_tensor(x):
 
 def clone_single_keras_tensor(x):
     return backend.KerasTensor(
-        shape=x.shape, dtype=x.dtype, sparse=x.sparse, name=x.name + "_clone"
+        shape=x.shape, dtype=x.dtype, sparse=x.sparse, name=f"{x.name}_clone"
     )
 
 
@@ -836,7 +836,7 @@ def clone_graph_nodes(inputs, outputs):
                 batch_shape=kt_input.shape,
                 dtype=kt_input.dtype,
                 sparse=kt_input.sparse,
-                name=kt_input.name + "CLONE",
+                name=f"{kt_input.name}CLONE",
             )
             cloned_inputs.append(cloned_input)
             kt_id_mapping[id(kt_input)] = cloned_input

keras/src/models/model.py

@@ -8,6 +8,7 @@ from keras.src import utils
 from keras.src.api_export import keras_export
 from keras.src.layers.layer import Layer
 from keras.src.models.variable_mapping import map_saveable_variables
+from keras.src.quantizers.gptq_config import GPTQConfig
 from keras.src.saving import saving_api
 from keras.src.trainers import trainer as base_trainer
 from keras.src.utils import summary_utils
@@ -420,7 +421,7 @@ class Model(Trainer, base_trainer.Trainer, Layer):
             **kwargs,
         )
 
-    def quantize(self, mode, **kwargs):
+    def quantize(self, mode, config=None, **kwargs):
         """Quantize the weights of the model.
 
         Note that the model must be built first before calling this method.
@@ -433,6 +434,23 @@ class Model(Trainer, base_trainer.Trainer, Layer):
         """
         from keras.src.dtype_policies import QUANTIZATION_MODES
 
+        if mode == "gptq":
+            if not isinstance(config, GPTQConfig):
+                raise ValueError(
+                    "The `config` argument must be of type "
+                    "`keras.quantizers.GPTQConfig`."
+                )
+            # The config object's own quantize method drives the process
+            config.quantize(self)
+            return
+
+        # For all other modes, verify that a config object was not passed.
+        if config is not None:
+            raise ValueError(
+                f"The `config` argument is only supported for 'gptq' mode, "
+                f"but received mode='{mode}'."
+            )
+
         type_check = kwargs.pop("type_check", True)
         if kwargs:
             raise ValueError(
@@ -854,9 +872,9 @@ class Model(Trainer, base_trainer.Trainer, Layer):
         def _flatten(current_dict, prefix=""):
             for key, value in current_dict.items():
                 if isinstance(value, dict):
-                    _flatten(value, prefix + key + "/")
+                    _flatten(value, f"{prefix}{key}/")
                 else:
-                    flat_dict[prefix + key] = value
+                    flat_dict[f"{prefix}{key}"] = value
 
         _flatten(nested_dict)
         return flat_dict

keras/src/ops/function.py

@@ -244,7 +244,7 @@ class Function(Operation):
 
 
 def make_node_key(op, node_index):
-    return str(id(op)) + "_ib-" + str(node_index)
+    return f"{id(op)}_ib-{node_index}"
 
 
 def map_graph(inputs, outputs):

keras/src/ops/numpy.py

@@ -2872,7 +2872,7 @@ class Einsum(Operation):
         kept_dims = sorted(kept_dims)
 
         if output_spec is None:
-            target_broadcast_spec = "..." + "".join(kept_dims)
+            target_broadcast_spec = f"...{''.join(kept_dims)}"
         else:
             target_broadcast_spec = output_spec
 
@@ -2894,18 +2894,18 @@ class Einsum(Operation):
                     )
                 for size, s in zip(x_shape, split_spec[0]):
                     # Replace the letter with the right shape.
-                    expanded_shape = expanded_shape.replace(s, str(size) + " ")
+                    expanded_shape = expanded_shape.replace(s, f"{str(size)} ")
                 expanded_shape = expanded_shape.replace("...", "")
             else:
                 # In this case, the input spec has "...", e.g., "i...j", "i...",
                 # or "...j".
                 for i in range(len(split_spec[0])):
                     expanded_shape = expanded_shape.replace(
-                        split_spec[0][i], str(x_shape[i]) + " "
+                        split_spec[0][i], f"{x_shape[i]} "
                     )
                 for i in range(len(split_spec[1])):
                     expanded_shape = expanded_shape.replace(
-                        split_spec[1][-i - 1], str(x_shape[-i - 1]) + " "
+                        split_spec[1][-i - 1], f"{x_shape[-i - 1]} "
                     )
                 # Shape matched by "..." will be inserted to the position of
                 # "...".
@@ -2919,7 +2919,7 @@ class Einsum(Operation):
                     wildcard_shape_start_index:wildcard_shape_end_index
                 ]
                 wildcard_shape_str = (
-                    " ".join([str(size) for size in wildcard_shape]) + " "
+                    f"{' '.join([str(size) for size in wildcard_shape])} "
                 )
                 expanded_shape = expanded_shape.replace(
                     "...", wildcard_shape_str

keras/src/ops/operation.py

@@ -1,4 +1,5 @@
 import inspect
+import os.path
 import textwrap
 
 from keras.src import backend
@@ -19,10 +20,10 @@ class Operation(KerasSaveable):
     def __init__(self, name=None):
         if name is None:
             name = auto_name(self.__class__.__name__)
-        if not isinstance(name, str) or "/" in name:
+        if not isinstance(name, str) or os.path.sep in name:
             raise ValueError(
                 "Argument `name` must be a string and "
-                "cannot contain character `/`. "
+                f"cannot contain character `{os.path.sep}`. "
                 f"Received: name={name} (of type {type(name)})"
             )
         self.name = name

keras/src/optimizers/base_optimizer.py

@@ -310,13 +310,12 @@ class BaseOptimizer(KerasSaveable):
         """
         name = name or "var"
         if hasattr(reference_variable, "path"):
-            name = reference_variable.path.replace("/", "_") + "_" + name
+            name = f"{reference_variable.path.replace('/', '_')}_{name}"
         else:
-            name = (
+            sanitised_ref_name = (
                 str(reference_variable.name).replace("/", "_").replace(":", "_")
-                + "_"
-                + name
             )
+            name = f"{sanitised_ref_name}_{name}"
         return self.add_variable(
             shape=reference_variable.shape,
             initializer=initializer,