PyPI - keras-nightly - Versions diffs - 3.14.0.dev2026020104__tar.gz → 3.14.0.dev2026020304__tar.gz - Mend

Files changed (629) hide show

{keras_nightly-3.14.0.dev2026020104 → keras_nightly-3.14.0.dev2026020304}/keras/src/export/onnx.py RENAMED Viewed

@@ -76,13 +76,19 @@ def export_onnx(
     if input_signature is None:
         input_signature = get_input_signature(model)
         if not input_signature or not model._called:
-            raise ValueError(
-                "The model provided has never called. "
-                "It must be called at least once before export."
-            )
+            raise ValueError("The model provided has never called. ")
+    # Extract specs for proper input name generation
+    if len(input_signature) == 1 and isinstance(input_signature[0], list):
+        # Multi-input case: input_signature = [[spec1, spec2, ...]]
+        specs_for_names = input_signature[0]
+    else:
+        # Single input case: input_signature = [spec]
+        specs_for_names = input_signature
     input_names = [
         getattr(spec, "name", None) or f"input_{i}"
-        for i, spec in enumerate(input_signature)
+        for i, spec in enumerate(specs_for_names)
     ]
     if backend.backend() in ("tensorflow", "jax"):
@@ -105,10 +111,37 @@ def export_onnx(
     elif backend.backend() == "torch":
         import torch
+        """Generate dynamic_axes format for ONNX export."""
+        dynamic_axes = {}
+        for input_idx, spec in enumerate(specs_for_names):
+            if not hasattr(spec, "shape"):
+                continue
+            shape = spec.shape
+            dynamic_dims = {}
+            for dim_idx, dim_size in enumerate(shape):
+                if dim_size is None:
+                    if dim_idx == 0:
+                        dim_name = "batch"
+                    else:
+                        dim_name = f"dim_{input_idx}_{dim_idx}"
+                    dynamic_dims[dim_idx] = dim_name
+            if dynamic_dims:
+                input_name = (
+                    input_names[input_idx]
+                    if input_idx < len(input_names)
+                    else f"input_{input_idx}"
+                )
+                dynamic_axes[input_name] = dynamic_dims
         sample_inputs = tree.map_structure(
             lambda x: convert_spec_to_tensor(x, replace_none_number=1),
             input_signature,
         )
         sample_inputs = tuple(sample_inputs)
         # TODO: Make dict model exportable.
         if any(isinstance(x, dict) for x in sample_inputs):
@@ -140,34 +173,80 @@ def export_onnx(
             warnings.filterwarnings(
                 "ignore", message=r".*suppressed about get_attr references.*"
             )
+            # Suppress TorchScript tracing warnings
+            warnings.filterwarnings(
+                "ignore",
+                message=r".*Converting a tensor to a Python boolean.*",
+                category=torch.jit.TracerWarning,
+            )
+            warnings.filterwarnings(
+                "ignore",
+                message=r".*Converting a tensor to a Python integer.*",
+                category=torch.jit.TracerWarning,
+            )
+            warnings.filterwarnings(
+                "ignore",
+                message=r".*Iterating over a tensor.*",
+                category=torch.jit.TracerWarning,
+            )
+            warnings.filterwarnings(
+                "ignore",
+                message=r".*Using len to get tensor shape.*",
+                category=torch.jit.TracerWarning,
+            )
+            warnings.filterwarnings(
+                "ignore",
+                message=r".*torch.tensor results are registered as constants.*",
+                category=torch.jit.TracerWarning,
+            )
+        # When dynamic shapes are present, prefer TorchScript over
+        # TorchDynamo because TorchDynamo has constraint inference issues
+        # with dynamic dimensions
+        if not dynamic_axes:
             try:
-                # Try the TorchDynamo-based ONNX exporter first.
+                # Try the TorchDynamo-based ONNX exporter first for static
+                # shapes
+                export_kwargs = {
+                    "verbose": actual_verbose,
+                    "opset_version": opset_version,
+                    "input_names": input_names,
+                    "dynamo": True,
+                }
                 onnx_program = torch.onnx.export(
-                    model,
-                    sample_inputs,
-                    verbose=actual_verbose,
-                    opset_version=opset_version,
-                    input_names=input_names,
-                    dynamo=True,
+                    model, sample_inputs, **export_kwargs
                 )
                 if hasattr(onnx_program, "optimize"):
                     onnx_program.optimize()  # Only supported by torch>=2.6.0.
                 onnx_program.save(filepath)
-            except:
-                if verbose is None:
-                    # Set to `False` due to file system leakage issue:
-                    # https://github.com/keras-team/keras/issues/20826
-                    actual_verbose = False
-                # Fall back to the TorchScript-based ONNX exporter.
-                torch.onnx.export(
-                    model,
-                    sample_inputs,
-                    filepath,
-                    verbose=actual_verbose,
-                    opset_version=opset_version,
-                    input_names=input_names,
-                )
+                return
+            except Exception:
+                pass
+        """Export using TorchScript-based ONNX exporter."""
+        # Set verbose to False for TorchScript due to file system leakage
+        torchscript_verbose = verbose
+        if verbose is None:
+            # Set to `False` due to file system leakage issue:
+            # https://github.com/keras-team/keras/issues/20826
+            torchscript_verbose = False
+        export_kwargs = {
+            "verbose": torchscript_verbose,
+            "opset_version": opset_version,
+            "input_names": input_names,
+            "export_params": True,
+            "do_constant_folding": True,
+            "dynamo": False,
+        }
+        # For TorchScript (dynamo=False), use dynamic_axes parameter
+        if dynamic_axes:
+            export_kwargs["dynamic_axes"] = dynamic_axes
+        torch.onnx.export(model, sample_inputs, filepath, **export_kwargs)
     else:
         raise NotImplementedError(
             "`export_onnx` is only compatible with TensorFlow, JAX and "

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: keras-nightly
-Version: 3.14.0.dev2026020104
+Version: 3.14.0.dev2026020304
 Summary: Multi-backend Keras
 Author-email: Keras team <keras-users@googlegroups.com>
 License: Apache License 2.0

@@ -248,6 +248,7 @@ from keras.src.ops.numpy import nan_to_num as nan_to_num
 from keras.src.ops.numpy import nanmax as nanmax
 from keras.src.ops.numpy import nanmean as nanmean
 from keras.src.ops.numpy import nanmin as nanmin
+from keras.src.ops.numpy import nanprod as nanprod
 from keras.src.ops.numpy import nansum as nansum
 from keras.src.ops.numpy import ndim as ndim
 from keras.src.ops.numpy import negative as negative

@@ -132,6 +132,7 @@ from keras.src.ops.numpy import nan_to_num as nan_to_num
 from keras.src.ops.numpy import nanmax as nanmax
 from keras.src.ops.numpy import nanmean as nanmean
 from keras.src.ops.numpy import nanmin as nanmin
+from keras.src.ops.numpy import nanprod as nanprod
 from keras.src.ops.numpy import nansum as nansum
 from keras.src.ops.numpy import ndim as ndim
 from keras.src.ops.numpy import negative as negative

@@ -248,6 +248,7 @@ from keras.src.ops.numpy import nan_to_num as nan_to_num
 from keras.src.ops.numpy import nanmax as nanmax
 from keras.src.ops.numpy import nanmean as nanmean
 from keras.src.ops.numpy import nanmin as nanmin
+from keras.src.ops.numpy import nanprod as nanprod
 from keras.src.ops.numpy import nansum as nansum
 from keras.src.ops.numpy import ndim as ndim
 from keras.src.ops.numpy import negative as negative

@@ -132,6 +132,7 @@ from keras.src.ops.numpy import nan_to_num as nan_to_num
 from keras.src.ops.numpy import nanmax as nanmax
 from keras.src.ops.numpy import nanmean as nanmean
 from keras.src.ops.numpy import nanmin as nanmin
+from keras.src.ops.numpy import nanprod as nanprod
 from keras.src.ops.numpy import nansum as nansum
 from keras.src.ops.numpy import ndim as ndim
 from keras.src.ops.numpy import negative as negative

@@ -1037,6 +1037,11 @@ def nanmin(x, axis=None, keepdims=False):
     return jnp.nanmin(x, axis=axis, keepdims=keepdims)
+def nanprod(x, axis=None, keepdims=False):
+    x = convert_to_tensor(x)
+    return jnp.nanprod(x, axis=axis, keepdims=keepdims)
 def nansum(x, axis=None, keepdims=False):
     x = convert_to_tensor(x)
     return jnp.nansum(x, axis=axis, keepdims=keepdims)

@@ -973,6 +973,19 @@ def nanmin(x, axis=None, keepdims=False):
     return np.nanmin(x, axis=axis, keepdims=keepdims)
+def nanprod(x, axis=None, keepdims=False):
+    axis = standardize_axis_for_numpy(axis)
+    x = convert_to_tensor(x)
+    dtype = dtypes.result_type(x.dtype)
+    if dtype in ("bool", "int8", "int16"):
+        dtype = "int32"
+    elif dtype in ("uint8", "uint16"):
+        dtype = "uint32"
+    return np.nanprod(x, axis=axis, keepdims=keepdims, dtype=dtype)
 def nansum(x, axis=None, keepdims=False):
     axis = standardize_axis_for_numpy(axis)
     dtype = standardize_dtype(x.dtype)

@@ -2129,6 +2129,12 @@ def nanmin(x, axis=None, keepdims=False):
     raise NotImplementedError("`nanmin` is not supported with openvino backend")
+def nanprod(x, axis=None, keepdims=False):
+    raise NotImplementedError(
+        "`nanprod` is not supported with openvino backend"
+    )
 def nansum(x, axis=None, keepdims=False):
     x = get_ov_output(x)
     x_type = x.get_element_type()

@@ -1318,6 +1318,25 @@ def nanmin(x, axis=None, keepdims=False):
     )
+def nanprod(x, axis=None, keepdims=False):
+    x = convert_to_tensor(x)
+    if axis == () or axis == []:
+        return torch.nan_to_num(x, nan=1)
+    if isinstance(axis, (list, tuple)):
+        axis = sorted(axis, reverse=True)
+    if not torch.is_floating_point(x):
+        return prod(x, axis=axis, keepdims=keepdims)
+    return prod(
+        torch.where(torch.isnan(x), torch.ones((), dtype=x.dtype), x),
+        axis=axis,
+        keepdims=keepdims,
+    )
 def nansum(x, axis=None, keepdims=False):
     if isinstance(x, (list, tuple)):
         x = stack(x)

@@ -5231,6 +5231,72 @@ def nanmin(x, axis=None, keepdims=False):
     return backend.numpy.nanmin(x, axis=axis, keepdims=keepdims)
+class Nanprod(Operation):
+    def __init__(self, axis=None, keepdims=False, *, name=None):
+        super().__init__(name=name)
+        self.axis = axis
+        self.keepdims = keepdims
+    def call(self, x):
+        return backend.numpy.nanprod(
+            x,
+            axis=self.axis,
+            keepdims=self.keepdims,
+        )
+    def compute_output_spec(self, x):
+        dtype = backend.standardize_dtype(x.dtype)
+        if dtype == "bool":
+            dtype = "int32"
+        elif dtype in ("int8", "int16"):
+            dtype = "int32"
+        elif dtype in ("uint8", "uint16"):
+            dtype = "uint32"
+        if backend.backend() == "torch" and dtype == "uint32":
+            dtype = "int32"
+        return KerasTensor(
+            reduce_shape(x.shape, axis=self.axis, keepdims=self.keepdims),
+            dtype=dtype,
+        )
+@keras_export(["keras.ops.nanprod", "keras.ops.numpy.nanprod"])
+def nanprod(x, axis=None, keepdims=False):
+    """Product of a tensor over the given axes, ignoring NaNs.
+    Args:
+        x: Input tensor.
+        axis: Axis or axes along which the product is computed. The default is
+            to compute the product of the flattened tensor.
+        keepdims: If this is set to `True`, the axes which are reduced are left
+            in the result as dimensions with size one.
+    Returns:
+        Output tensor containing the product, with NaN values ignored.
+    Examples:
+    >>> import numpy as np
+    >>> from keras import ops
+    >>> x = np.array([[1.0, np.nan, 3.0],
+    ...               [np.nan, 2.0, 1.0]])
+    >>> ops.nanprod(x)
+    6.0
+    >>> ops.nanprod(x, axis=1)
+    array([3., 2.])
+    >>> ops.nanprod(x, axis=1, keepdims=True)
+    array([[3.],
+           [2.]])
+    """
+    if any_symbolic_tensors((x,)):
+        return Nanprod(axis=axis, keepdims=keepdims).symbolic_call(x)
+    return backend.numpy.nanprod(x, axis=axis, keepdims=keepdims)
 class Nansum(Operation):
     def __init__(self, axis=None, keepdims=False, *, name=None):
         super().__init__(name=name)

@@ -1,7 +1,7 @@
 from keras.src.api_export import keras_export
 # Unique source of truth for the version number.
-__version__ = "3.14.0.dev2026020104"
+__version__ = "3.14.0.dev2026020304"
 @keras_export("keras.version")

keras-nightly 3.14.0.dev2026020104__tar.gz → 3.14.0.dev2026020304__tar.gz

keras-nightly 3.14.0.dev2026020104tar.gz → 3.14.0.dev2026020304tar.gz