PartSegCore-compiled-backend 0.15.3__tar.gz → 0.15.4__tar.gz

{PartSegCore_compiled_backend-0.15.3/src/PartSegCore_compiled_backend.egg-info → PartSegCore_compiled_backend-0.15.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PartSegCore_compiled_backend
-Version: 0.15.3
+Version: 0.15.4
 Summary: PartSegCore compiled backend,
 Author-email: Grzegorz Bokota <g.bokota@cent.uw.edu.pl>
 License: BSD-3-Clause

{PartSegCore_compiled_backend-0.15.3 → PartSegCore_compiled_backend-0.15.4}/src/PartSegCore_compiled_backend/_napari_mapping.pyx

@@ -28,23 +28,23 @@ ctypedef fused out_types:
     out_types_mod
     cnp.float32_t
 
-def _zero_preserving_modulo_seq(label_types[:] labels,  label_types modulo, label_types to_zero, out_types_mod[:] out):
+def _zero_preserving_modulo_seq(label_types[:] labels,  out_types_mod modulo, label_types to_zero, out_types_mod[:] out):
     cdef Py_ssize_t i
     cdef Py_ssize_t n = labels.shape[0]
     for i in range(n):
         if labels[i] == to_zero:
             out[i] = 0
         else:
-            out[i] = ((labels[i] - 1)  % modulo) + 1
+            out[i] = ((modulo + ((labels[i] - 1) % modulo)) % modulo) + 1
 
-def _zero_preserving_modulo_par(label_types[:] labels, label_types modulo, label_types to_zero, out_types_mod[:] out):
+def _zero_preserving_modulo_par(label_types[:] labels, out_types_mod modulo, label_types to_zero, out_types_mod[:] out):
     cdef Py_ssize_t i
     cdef Py_ssize_t n = labels.shape[0]
     for i in prange(n, nogil=True):
         if labels[i] == to_zero:
             out[i] = 0
         else:
-            out[i] = ((labels[i] - 1) % modulo) + 1
+            out[i] = ((modulo + ((labels[i] - 1) % modulo)) % modulo) + 1
 
 
 def _map_array_par(label_types[:] labels, dict dkt, out_types[:] out, out_types def_val=0):

{PartSegCore_compiled_backend-0.15.3 → PartSegCore_compiled_backend-0.15.4}/src/PartSegCore_compiled_backend/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.15.3'
-__version_tuple__ = version_tuple = (0, 15, 3)
+__version__ = version = '0.15.4'
+__version_tuple__ = version_tuple = (0, 15, 4)

{PartSegCore_compiled_backend-0.15.3 → PartSegCore_compiled_backend-0.15.4/src/PartSegCore_compiled_backend.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PartSegCore_compiled_backend
-Version: 0.15.3
+Version: 0.15.4
 Summary: PartSegCore compiled backend,
 Author-email: Grzegorz Bokota <g.bokota@cent.uw.edu.pl>
 License: BSD-3-Clause

{PartSegCore_compiled_backend-0.15.3 → PartSegCore_compiled_backend-0.15.4}/src/tests/test_napari_mapping.py

@@ -37,6 +37,19 @@ def test_zero_preserving_modulo(func, data):
     npt.assert_array_equal(out, _zero_preserving_modulo_numpy(data, 10, np.uint8, 0))
 
 
+@pytest.mark.parametrize('func', [zero_preserving_modulo_parallel, zero_preserving_modulo_sequential])
+@pytest.mark.parametrize('background_num', [0, 1, 2, -1])
+def test_background_label(func, background_num):
+    data = np.zeros((10, 10), dtype=np.int32)
+    data[1:-1, 1:-1] = 1
+    data[2:-2, 2:-2] = 2
+    data[4:-4, 4:-4] = -1
+
+    res = func(data, 49, background_num)
+    np.testing.assert_array_equal(res == 0, data == background_num)
+    np.testing.assert_array_equal(res != 0, data != background_num)
+
+
 @pytest.mark.parametrize('func', [map_array_parallel, map_array_sequential])
 @pytest.mark.parametrize('data', DATA_LI, ids=DATA_IDS)
 def test_map_array(func, data):