Merge pull request #83 from kmader/patch-1

Label should warn not error if multiple chunks

dask_ndmeasure/__init__.py

@@ -13,6 +13,7 @@
 
 
 import itertools
+from warnings import warn
 
 import numpy
 import scipy.ndimage
@@ -208,7 +209,7 @@ def label(input, structure=None):
     input = _compat._asarray(input)
 
     if not all([len(c) == 1 for c in input.chunks]):
-        raise ValueError("``input`` must have 1 chunk in all dimensions.")
+        warn("``input`` does not have 1 chunk in all dimensions; it will be consolidated first", RuntimeWarning)
 
     result = dask.delayed(scipy.ndimage.label)(input, structure)
 

tests/test_core.py

@@ -254,18 +254,14 @@ def test_label(shape, chunks, connectivity):
 
     s = spnd.generate_binary_structure(a.ndim, connectivity)
 
-    if all([len(c) == 1 for c in d.chunks]):
-        a_l, a_nl = spnd.label(a, s)
-        d_l, d_nl = dask_ndmeasure.label(d, s)
+    a_l, a_nl = spnd.label(a, s)
+    d_l, d_nl = dask_ndmeasure.label(d, s)
 
-        assert a_nl == d_nl.compute()
+    assert a_nl == d_nl.compute()
 
-        assert a_l.dtype == d_l.dtype
-        assert a_l.shape == d_l.shape
-        assert np.allclose(np.array(a_l), np.array(d_l), equal_nan=True)
-    else:
-        with pytest.raises(ValueError):
-            dask_ndmeasure.label(d, s)
+    assert a_l.dtype == d_l.dtype
+    assert a_l.shape == d_l.shape
+    assert np.allclose(np.array(a_l), np.array(d_l), equal_nan=True)
 
 
 @pytest.mark.parametrize(