euler-loading 2.29.0__tar.gz → 2.30.0__tar.gz

{euler_loading-2.29.0 → euler_loading-2.30.0}/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+- Fix `vkitti2.write_depth` and the 16-bit PNG path of
+  `generic_dense_depth.write_depth` on Pillow 13, which rejects
+  `Image.fromarray(uint16, mode="I;16")`; a uint16 array becomes an `I;16`
+  image without the argument on every supported Pillow.
 - `Modality.function` picks a callable from the loader module the dataset head
   names, instead of its `function`; the writer follows it.
   `Modality(path, function="sky_mask")` reads a `class_segmentation` index as

{euler_loading-2.29.0 → euler_loading-2.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: euler-loading
-Version: 2.29.0
+Version: 2.30.0
 Summary: Multi-modal PyTorch dataloader using ds-crawler indices
 Project-URL: Homepage, https://github.com/d-rothen/euler-loading
 Project-URL: Repository, https://github.com/d-rothen/euler-loading

{euler_loading-2.29.0 → euler_loading-2.30.0}/euler_loading/loaders/cpu/generic_dense_depth.py

@@ -240,7 +240,8 @@ def write_depth(path: Union[str, BinaryIO], value: Any, meta: dict[str, Any] | N
             save_image(path, Image.fromarray(depth_f32.astype(np.uint8), mode="L"))
             return
         depth_u16 = np.clip(np.rint(depth_f32), 0, 65535).astype(np.uint16)
-        save_image(path, Image.fromarray(depth_u16, mode="I;16"), format="PNG")
+        # uint16 becomes an I;16 image; Pillow 13 rejects an explicit mode="I;16".
+        save_image(path, Image.fromarray(depth_u16), format="PNG")
         return
 
     depth_f32 = depth.astype(np.float32)

{euler_loading-2.29.0 → euler_loading-2.30.0}/euler_loading/loaders/cpu/vkitti2.py

@@ -227,7 +227,8 @@ def write_depth(path: Union[str, BinaryIO], value: Any, meta: dict[str, Any] | N
     ensure_parent(path)
     depth_m = to_hw(value, name="depth").astype(np.float32)
     depth_cm = np.clip(np.rint(depth_m * 100.0), 0, 65535).astype(np.uint16)
-    save_image(path, Image.fromarray(depth_cm, mode="I;16"), format="PNG")
+    # uint16 becomes an I;16 image; Pillow 13 rejects an explicit mode="I;16".
+    save_image(path, Image.fromarray(depth_cm), format="PNG")
 
 
 @mark_stream_supported

{euler_loading-2.29.0 → euler_loading-2.30.0}/euler_loading/loaders/gpu/generic_dense_depth.py

@@ -225,7 +225,8 @@ def write_depth(path: Union[str, BinaryIO], value: Any, meta: dict[str, Any] | N
             save_image(path, Image.fromarray(depth_f32.astype(np.uint8), mode="L"))
             return
         depth_u16 = np.clip(np.rint(depth_f32), 0, 65535).astype(np.uint16)
-        save_image(path, Image.fromarray(depth_u16, mode="I;16"), format="PNG")
+        # uint16 becomes an I;16 image; Pillow 13 rejects an explicit mode="I;16".
+        save_image(path, Image.fromarray(depth_u16), format="PNG")
         return
 
     depth_f32 = depth.astype(np.float32)

{euler_loading-2.29.0 → euler_loading-2.30.0}/euler_loading/loaders/gpu/vkitti2.py

@@ -214,7 +214,8 @@ def write_depth(path: Union[str, BinaryIO], value: Any, meta: dict[str, Any] | N
     ensure_parent(path)
     depth_m = to_hw(value, name="depth").astype(np.float32)
     depth_cm = np.clip(np.rint(depth_m * 100.0), 0, 65535).astype(np.uint16)
-    save_image(path, Image.fromarray(depth_cm, mode="I;16"), format="PNG")
+    # uint16 becomes an I;16 image; Pillow 13 rejects an explicit mode="I;16".
+    save_image(path, Image.fromarray(depth_cm), format="PNG")
 
 
 @mark_stream_supported

{euler_loading-2.29.0 → euler_loading-2.30.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "euler-loading"
-version = "2.29.0"
+version = "2.30.0"
 description = "Multi-modal PyTorch dataloader using ds-crawler indices"
 readme = "README.md"
 requires-python = ">=3.9"

{euler_loading-2.29.0 → euler_loading-2.30.0}/tests/test_loaders.py

@@ -72,7 +72,7 @@ def depth_path(tmp_path):
     from PIL import Image
 
     arr = np.array([[100, 200], [300, 400]], dtype=np.uint16)
-    img = Image.fromarray(arr, mode="I;16")
+    img = Image.fromarray(arr)  # uint16 -> I;16
     p = tmp_path / "depth.png"
     img.save(p)
     return str(p)
@@ -1406,6 +1406,24 @@ class TestCPUGenericLoaders:
         assert result.shape == (4, 5, 3)
 
 
+class TestGenericDenseDepthWriters:
+    # Values above 255 take the 16-bit PNG path rather than the 8-bit one.
+    DEPTH = np.array([[0, 300], [1000, 65535]], dtype=np.uint16)
+
+    def test_cpu_write_depth_16bit_png_roundtrip(self, tmp_path):
+        path = tmp_path / "depth.png"
+        cpu_generic_dense_depth.write_depth(str(path), self.DEPTH)
+        with Image.open(path) as image:
+            assert image.mode == "I;16"
+        np.testing.assert_array_equal(cpu_generic_dense_depth.depth(str(path)), self.DEPTH)
+
+    def test_gpu_write_depth_16bit_png_roundtrip(self, tmp_path):
+        path = tmp_path / "depth.png"
+        gpu_generic_dense_depth.write_depth(str(path), torch.from_numpy(self.DEPTH.astype(np.int32)))
+        loaded = gpu_generic_dense_depth.depth(str(path))
+        np.testing.assert_array_equal(loaded[0].numpy(), self.DEPTH)
+
+
 class TestGenericWriters:
     """Writer round-trip tests for generic loaders."""