From a221a6fc01648627d3ff914acc0bd91f3ac44626 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 20 Jul 2021 18:29:27 -0400 Subject: [PATCH] Remove use of unneeded int_types dict in skimage.measure.label This was causing a bug on Windows where np.dtype(np.int32).dtype.char == 'l' instead of 'i' --- .../cucim/skimage/measure/_label_kernels.py | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/python/cucim/src/cucim/skimage/measure/_label_kernels.py b/python/cucim/src/cucim/skimage/measure/_label_kernels.py index ce4199e8f..223a5f926 100644 --- a/python/cucim/src/cucim/skimage/measure/_label_kernels.py +++ b/python/cucim/src/cucim/skimage/measure/_label_kernels.py @@ -21,22 +21,10 @@ def _label(x, structure, y, greyscale_mode=False): y_shape = cupy.array(y.shape, dtype=numpy.int32) count = cupy.zeros(2, dtype=numpy.int32) _kernel_init()(x, y) - try: - int_t = int_types[y.dtype.char] - except KeyError: - raise ValueError("y must have int32, uint16, uint32 or uint64 dtype") - if int_t != "int": - raise NotImplementedError( - "Currently only 32-bit integer case is implemented" - ) if greyscale_mode: - _kernel_connect(True, int_t)( - x, y_shape, dirs, ndirs, x.ndim, y, size=y.size - ) + _kernel_connect(True)(x, y_shape, dirs, ndirs, x.ndim, y, size=y.size) else: - _kernel_connect(False, int_t)( - y_shape, dirs, ndirs, x.ndim, y, size=y.size - ) + _kernel_connect(False)(y_shape, dirs, ndirs, x.ndim, y, size=y.size) _kernel_count()(y, count, size=y.size) maxlabel = int(count[0]) # synchronize labels = cupy.empty(maxlabel, dtype=numpy.int32) @@ -184,11 +172,3 @@ def _kernel_finalize(): """, "cucim_nd_label_finalize", ) - - -int_types = { - "i": "int", - "H": "unsigned short", - "I": "unsigned int", - "L": "unsigned long long", -}