ezmsg-sigproc 2.13.1__tar.gz → 2.14.0__tar.gz

{ezmsg_sigproc-2.13.1 → ezmsg_sigproc-2.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ezmsg-sigproc
-Version: 2.13.1
+Version: 2.14.0
 Summary: Timeseries signal processing implementations in ezmsg
 Author-email: Griffin Milsap <griffin.milsap@gmail.com>, Preston Peranich <pperanich@gmail.com>, Chadwick Boulay <chadwick.boulay@gmail.com>, Kyle McGraw <kmcgraw@blackrockneuro.com>
 License-Expression: MIT

{ezmsg_sigproc-2.13.1 → ezmsg_sigproc-2.14.0}/src/ezmsg/sigproc/__version__.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.13.1'
-__version_tuple__ = version_tuple = (2, 13, 1)
+__version__ = version = '2.14.0'
+__version_tuple__ = version_tuple = (2, 14, 0)
 
 __commit_id__ = commit_id = None

{ezmsg_sigproc-2.13.1 → ezmsg_sigproc-2.14.0}/src/ezmsg/sigproc/affinetransform.py

@@ -23,6 +23,8 @@ from ezmsg.baseproc import (
 from ezmsg.util.messages.axisarray import AxisArray, AxisBase
 from ezmsg.util.messages.util import replace
 
+from ezmsg.sigproc.util.array import array_device, is_float_dtype, xp_asarray, xp_create
+
 
 def _find_block_diagonal_clusters(weights: np.ndarray) -> list[tuple[np.ndarray, np.ndarray]] | None:
     """Detect block-diagonal structure in a weight matrix.
@@ -245,13 +247,25 @@ class AffineTransformTransformer(
 
             self._state.new_axis = replace(message.axes[axis], data=np.array(new_labels))
 
-        # Convert to match message.data namespace for efficient operations in _process
+        # Convert to match message.data namespace and device for _process.
+        # Weights are stored as numpy float64 after cluster detection; some
+        # devices (e.g. MPS) don't support float64, so we downcast weight
+        # arrays to the message's dtype when the message is floating-point.
         xp = get_namespace(message.data)
+        dev = array_device(message.data)
+        msg_dt = message.data.dtype
+        # Downcast weights dtype only for float message data (avoids casting
+        # float weights to integer when message data happens to be int).
+        w_dt = msg_dt if is_float_dtype(xp, msg_dt) else None
         if self._state.weights is not None:
-            self._state.weights = xp.asarray(self._state.weights)
+            self._state.weights = xp_asarray(xp, self._state.weights, dtype=w_dt, device=dev)
         if self._state.clusters is not None:
             self._state.clusters = [
-                (xp.asarray(in_idx), xp.asarray(out_idx), xp.asarray(sub_w))
+                (
+                    xp_asarray(xp, in_idx, device=dev),
+                    xp_asarray(xp, out_idx, device=dev),
+                    xp_asarray(xp, sub_w, dtype=w_dt, device=dev),
+                )
                 for in_idx, out_idx, sub_w in self._state.clusters
             ]
 
@@ -345,7 +359,7 @@ class AffineTransformTransformer(
 
         # Pre-allocate output (omitted channels stay zero)
         out_shape = data.shape[:-1] + (self._state.n_out,)
-        result = xp.zeros(out_shape, dtype=data.dtype)
+        result = xp_create(xp.zeros, out_shape, dtype=data.dtype, device=array_device(data))
 
         for in_idx, out_idx, sub_weights in self._state.clusters:
             chunk = xp.take(data, in_idx, axis=data.ndim - 1)
@@ -371,7 +385,10 @@ class AffineTransformTransformer(
                 # The weights are stacked A|B where A is the transform and B is a single row
                 #  in the equation y = Ax + B. This supports NeuroKey's weights matrices.
                 sample_shape = data.shape[:axis_idx] + (1,) + data.shape[axis_idx + 1 :]
-                data = xp.concat((data, xp.ones(sample_shape, dtype=data.dtype)), axis=axis_idx)
+                data = xp.concat(
+                    (data, xp_create(xp.ones, sample_shape, dtype=data.dtype, device=array_device(data))),
+                    axis=axis_idx,
+                )
 
             if axis_idx in [-1, len(message.dims) - 1]:
                 data = xp.matmul(data, self._state.weights)

ezmsg_sigproc-2.14.0/src/ezmsg/sigproc/util/array.py

@@ -0,0 +1,59 @@
+"""Portable helpers for Array API interoperability.
+
+These utilities smooth over differences between Array API libraries
+(NumPy, PyTorch, MLX, CuPy, etc.) — in particular around ``device``
+placement and ``dtype`` introspection, which are not uniformly supported.
+"""
+
+import numpy as np
+
+
+def array_device(x):
+    """Return the device of an array, or ``None`` for device-less libraries."""
+    try:
+        from array_api_compat import device
+
+        return device(x)
+    except (AttributeError, TypeError):
+        return None
+
+
+def xp_asarray(xp, obj, *, dtype=None, device=None):
+    """Portable ``xp.asarray`` that omits unsupported kwargs.
+
+    Some Array API libraries (e.g. MLX) don't accept a ``device`` keyword.
+    This helper builds the kwargs dict dynamically so that only supported
+    arguments are forwarded.
+    """
+    kwargs = {}
+    if dtype is not None:
+        kwargs["dtype"] = dtype
+    if device is not None:
+        kwargs["device"] = device
+    return xp.asarray(obj, **kwargs)
+
+
+def xp_create(fn, *args, dtype=None, device=None, **extra):
+    """Call a creation function (``zeros``, ``ones``, ``eye``) portably.
+
+    Omits ``device`` if it is ``None`` (for libraries that don't support it).
+    """
+    kwargs = dict(extra)
+    if dtype is not None:
+        kwargs["dtype"] = dtype
+    if device is not None:
+        kwargs["device"] = device
+    return fn(*args, **kwargs)
+
+
+def is_float_dtype(xp, dtype) -> bool:
+    """Check whether *dtype* is a real floating-point type, portably."""
+    try:
+        return xp.isdtype(dtype, "real floating")
+    except AttributeError:
+        pass
+    # Fallback for libraries without isdtype (e.g. MLX).
+    try:
+        return xp.issubdtype(dtype, xp.floating)
+    except (AttributeError, TypeError):
+        return np.issubdtype(np.dtype(dtype), np.floating)