Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG: ndimage.value_indices: deal with unfixed types #20644

Merged
merged 1 commit into from
May 15, 2024
Merged

BUG: ndimage.value_indices: deal with unfixed types #20644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions scipy/ndimage/src/nd_image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,11 @@ static PyObject *NI_ValueIndices(PyObject *self, PyObject *args)
case NPY_UINT32: CASE_VALUEINDICES_SET_MINMAX(npy_uint32); break;
case NPY_INT64: CASE_VALUEINDICES_SET_MINMAX(npy_int64); break;
case NPY_UINT64: CASE_VALUEINDICES_SET_MINMAX(npy_uint64); break;
default:
switch(arrType) {
case NPY_UINT: CASE_VALUEINDICES_SET_MINMAX(npy_uint); break;
case NPY_INT: CASE_VALUEINDICES_SET_MINMAX(npy_int); break;
}
}
NI_ITERATOR_NEXT(ndiIter, arrData);
}
Expand All @@ -1016,6 +1021,11 @@ static PyObject *NI_ValueIndices(PyObject *self, PyObject *args)
case NPY_UINT32: CASE_VALUEINDICES_MAKEHISTOGRAM(npy_uint32); break;
case NPY_INT64: CASE_VALUEINDICES_MAKEHISTOGRAM(npy_int64); break;
case NPY_UINT64: CASE_VALUEINDICES_MAKEHISTOGRAM(npy_uint64); break;
default:
switch(arrType) {
case NPY_INT: CASE_VALUEINDICES_MAKEHISTOGRAM(npy_int); break;
case NPY_UINT: CASE_VALUEINDICES_MAKEHISTOGRAM(npy_uint); break;
}
}
}

Expand Down Expand Up @@ -1047,6 +1057,11 @@ static PyObject *NI_ValueIndices(PyObject *self, PyObject *args)
case NPY_UINT32: CASE_VALUEINDICES_MAKE_VALUEOBJ_FROMOFFSET(npy_uint32, ii); break;
case NPY_INT64: CASE_VALUEINDICES_MAKE_VALUEOBJ_FROMOFFSET(npy_int64, ii); break;
case NPY_UINT64: CASE_VALUEINDICES_MAKE_VALUEOBJ_FROMOFFSET(npy_uint64, ii); break;
default:
switch(arrType) {
case NPY_INT: CASE_VALUEINDICES_MAKE_VALUEOBJ_FROMOFFSET(npy_int, ii); break;
case NPY_UINT: CASE_VALUEINDICES_MAKE_VALUEOBJ_FROMOFFSET(npy_uint, ii); break;
}
}
/* Create a tuple of <ndim> index arrays */
t = PyTuple_New(ndim);
Expand Down Expand Up @@ -1093,6 +1108,11 @@ static PyObject *NI_ValueIndices(PyObject *self, PyObject *args)
case NPY_UINT32: CASE_VALUEINDICES_GET_VALUEOFFSET(npy_uint32); break;
case NPY_INT64: CASE_VALUEINDICES_GET_VALUEOFFSET(npy_int64); break;
case NPY_UINT64: CASE_VALUEINDICES_GET_VALUEOFFSET(npy_uint64); break;
default:
switch(arrType) {
case NPY_INT: CASE_VALUEINDICES_GET_VALUEOFFSET(npy_int); break;
case NPY_UINT: CASE_VALUEINDICES_GET_VALUEOFFSET(npy_uint); break;
}
}

if (ignoreValIsNone || (!valueIsIgnore)) {
Expand Down
10 changes: 10 additions & 0 deletions scipy/ndimage/tests/test_measurements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
assert_equal,
suppress_warnings,
)
import pytest
from pytest import raises as assert_raises

import scipy.ndimage as ndimage
Expand Down Expand Up @@ -1407,3 +1408,12 @@ def test_watershed_ift09(self):
expected = [[1, 1],
[1, 1]]
assert_allclose(out, expected)


@pytest.mark.parametrize("dt", [np.intc, np.uintc])
def test_gh_19423(dt):
rng = np.random.default_rng(123)
max_val = 8
image = rng.integers(low=0, high=max_val, size=(10, 12)).astype(dtype=dt)
val_idx = ndimage.value_indices(image)
assert len(val_idx.keys()) == max_val