Skip to content

ENH: allow numpy integer scalars to index fileslice #903

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

Merged
merged 2 commits into from
Apr 16, 2020
Merged

ENH: allow numpy integer scalars to index fileslice #903

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e41afc
ENH: allow numpy integer scalars to index fileslice
Apr 9, 2020
19d8782
RF: directly check `ndim`
MichielCottaar Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nibabel/fileslice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def is_fancy(sliceobj):
if not isinstance(sliceobj, tuple):
sliceobj = (sliceobj,)
for slicer in sliceobj:
if hasattr(slicer, 'dtype'): # ndarray always fancy
if hasattr(slicer, 'dtype') and slicer.ndim > 0: # ndarray always fancy
return True
# slice or Ellipsis or None OK for basic
if isinstance(slicer, slice) or slicer in (None, Ellipsis):
Expand Down
28 changes: 22 additions & 6 deletions nibabel/tests/test_fileslice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def _check_slice(sliceobj):


def test_is_fancy():
slices = (2, [2], [2, 3], Ellipsis, np.array(2), np.array((2, 3)))
slices = (2, [2], [2, 3], Ellipsis, np.array((2, 3)))
for slice0 in slices:
_check_slice(slice0)
_check_slice((slice0,)) # tuple is same
Expand All @@ -46,7 +46,7 @@ def test_is_fancy():
assert not is_fancy((None,))
assert not is_fancy((None, 1))
assert not is_fancy((1, None))
# Chack that actual False returned (rather than falsey)
# Check that actual False returned (rather than falsey)
assert is_fancy(1) is False


Expand All @@ -57,7 +57,9 @@ def test_canonical_slicers():
slice(0, 9),
slice(1, 10),
slice(1, 10, 2),
2)
2,
np.array(2))

shape = (10, 10)
for slice0 in slicers:
assert canonical_slicers((slice0,), shape) == (slice0, slice(None))
Expand Down Expand Up @@ -93,9 +95,9 @@ def test_canonical_slicers():
assert canonical_slicers(slice(None), shape) == (slice(None), slice(None))
# Check fancy indexing raises error
with pytest.raises(ValueError):
canonical_slicers((np.array(1), 1), shape)
canonical_slicers((np.array([1]), 1), shape)
with pytest.raises(ValueError):
canonical_slicers((1, np.array(1)), shape)
canonical_slicers((1, np.array([1])), shape)
# Check out of range integer raises error
with pytest.raises(ValueError):
canonical_slicers((10,), shape)
Expand All @@ -111,6 +113,11 @@ def test_canonical_slicers():
# Check negative -> positive
assert canonical_slicers(-1, shape) == (9, slice(None))
assert canonical_slicers((slice(None), -1), shape) == (slice(None), 9)
# check numpy integer scalars behave the same as numpy integers
assert canonical_slicers(np.array(2), shape) == canonical_slicers(2, shape)
assert canonical_slicers((np.array(2), np.array(1)), shape) == canonical_slicers((2, 1), shape)
assert canonical_slicers((2, np.array(1)), shape) == canonical_slicers((2, 1), shape)
assert canonical_slicers((np.array(2), 1), shape) == canonical_slicers((2, 1), shape)


def test_slice2outax():
Expand Down Expand Up @@ -664,20 +671,29 @@ def slicer_samples(shape):
if ndim == 0:
return
yield (None, 0)
yield (None, np.array(0))
yield (0, None)
yield (np.array(0), None)
yield (Ellipsis, -1)
yield (Ellipsis, np.array(-1))
yield (-1, Ellipsis)
yield (np.array(-1), Ellipsis)
yield (None, Ellipsis)
yield (Ellipsis, None)
yield (Ellipsis, None, None)
if ndim == 1:
return
yield (0, None, slice(None))
yield (np.array(0), None, slice(None))
yield (Ellipsis, -1, None)
yield (Ellipsis, np.array(-1), None)
yield (0, Ellipsis, None)
yield (np.array(0), Ellipsis, None)
if ndim == 2:
return
yield (slice(None), 0, -1, None)
yield (slice(None), np.array(0), np.array(-1), None)
yield (np.array(0), slice(None), np.array(-1), None)


def test_fileslice():
Expand Down Expand Up @@ -711,7 +727,7 @@ def test_fileslice_errors():
_check_slicer((1,), arr, fobj, 0, 'C')
# Fancy indexing raises error
with pytest.raises(ValueError):
fileslice(fobj, (np.array(1),), (2, 3, 4), arr.dtype)
fileslice(fobj, (np.array([1]),), (2, 3, 4), arr.dtype)


def test_fileslice_heuristic():
Expand Down