arraybridge 0.3.7__tar.gz → 0.3.8__tar.gz

{arraybridge-0.3.7 → arraybridge-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arraybridge
-Version: 0.3.7
+Version: 0.3.8
 Summary: Unified API for NumPy, CuPy, PyTorch, TensorFlow, JAX, and pyclesperanto with automatic memory type conversion
 Project-URL: Homepage, https://github.com/OpenHCSDev/arraybridge
 Project-URL: Documentation, https://arraybridge.readthedocs.io

{arraybridge-0.3.7 → arraybridge-0.3.8}/src/arraybridge/__init__.py

@@ -10,7 +10,7 @@ attribute access instead of at import time. Declaration-only consumers
 NumPy/numcodecs import cost.
 """
 
-__version__ = "0.3.7"
+__version__ = "0.3.8"
 
 _LAZY_EXPORTS: dict[str, str] = {
     "MemoryType": ".types",

{arraybridge-0.3.7 → arraybridge-0.3.8}/src/arraybridge/array_operations.py

@@ -114,8 +114,50 @@ class ArrayOperations(ABC):
     def ones_like(reference: Any, shape: tuple[int, ...], dtype: Any, module: Any) -> Any:
         return module.ones(shape, dtype=dtype)
 
+    @classmethod
+    def normalize_planes(
+        cls,
+        data: Any,
+        dtype: Any,
+        scales: Sequence[float | None],
+        module: Any,
+    ) -> Any:
+        """Cast and scale each plane before assembling its owned output."""
+        return cls.stack(
+            tuple(
+                (
+                    cls.cast(plane, dtype, module)
+                    if scale is None
+                    else cls.cast(plane, dtype, module) / float(scale)
+                )
+                for plane, scale in zip(data, scales, strict=True)
+            ),
+            module,
+        )
+
+
+class MutableArrayOperations(ArrayOperations):
+    """Arrays whose allocated output supports native in-place arithmetic."""
+
+    @classmethod
+    def normalize_planes(
+        cls,
+        data: Any,
+        dtype: Any,
+        scales: Sequence[float | None],
+        module: Any,
+    ) -> Any:
+        # Integer division promotes the output dtype in the original recipe.
+        if not np.issubdtype(np.dtype(dtype), np.inexact) or len(data) == 0:
+            return super().normalize_planes(data, dtype, scales, module)
+        normalized = module.array(data, dtype=dtype, copy=True)
+        for index, scale in enumerate(scales):
+            if scale is not None:
+                normalized[index] /= float(scale)
+        return normalized
+
 
-class NumpyArrayOperations(ArrayOperations):
+class NumpyArrayOperations(MutableArrayOperations):
     """Numpy native operation leaves."""
 
     @staticmethod
@@ -148,7 +190,7 @@ class NumpyArrayOperations(ArrayOperations):
         return scaled.astype(target_dtype)
 
 
-class CupyArrayOperations(ArrayOperations):
+class CupyArrayOperations(MutableArrayOperations):
     """Cupy native operation leaves."""
 
     @staticmethod

{arraybridge-0.3.7 → arraybridge-0.3.8}/src/arraybridge/types.py

@@ -804,6 +804,20 @@ class MemoryType(_MemoryTypeFields, Enum):
         with self.device_scope(device_id, framework):
             return self._operations.stack(arrays, framework)
 
+    def normalize_planes(
+        self,
+        data: Any,
+        dtype: Any,
+        scales: Sequence[float | None],
+        module: Any | None = None,
+    ) -> Any:
+        """Normalize one owned plane stack through its native operation owner."""
+        if len(scales) != len(data):
+            raise ValueError("Normalization scales must match the leading plane axis.")
+        framework = module if module is not None else self.import_module()
+        with self._array_device_scope(data, framework):
+            return self._operations.normalize_planes(data, dtype, scales, framework)
+
     def scale_dtype(
         self,
         data: Any,

{arraybridge-0.3.7 → arraybridge-0.3.8}/tests/test_native_geometry.py

@@ -63,3 +63,18 @@ def test_pycles_geometry_rejects_host_fallback():
         PYCLESPERANTO_OPERATIONS.broadcast_to(source, (4, 2, 3), None)
     with pytest.raises(NotImplementedError, match="dtype"):
         PYCLESPERANTO_OPERATIONS.ones_like(source, (2, 3), bool, None)
+
+
+@pytest.mark.parametrize("dtype", (np.float32, np.complex64, np.int32))
+def test_normalize_planes_preserves_source_and_division_dtype(dtype):
+    source = np.arange(24, dtype=dtype).reshape(2, 3, 4)[:, :, ::-1]
+    original = source.copy()
+    expected = np.stack((source[0] / 3.0, source[1]))
+    actual = MemoryType.NUMPY.normalize_planes(source, dtype, (3.0, None))
+    np.testing.assert_array_equal(actual, expected)
+    np.testing.assert_array_equal(source, original)
+    assert actual.dtype == expected.dtype
+    assert not np.shares_memory(actual, source)
+    for scales in ((3.0,), (3.0, None, 2.0)):
+        with pytest.raises(ValueError, match="leading plane axis"):
+            MemoryType.NUMPY.normalize_planes(source, dtype, scales)