Skip to content

Test newaxis in test_getitem #121

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 1 commit into from
May 17, 2022
Merged

Test newaxis in test_getitem #121

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/numpy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ jobs:
# https://github.com/numpy/numpy/issues/20326#issuecomment-1012380448
array_api_tests/test_set_functions.py

# https://github.com/numpy/numpy/issues/21373
array_api_tests/test_array_object.py::test_getitem

# missing copy arg
array_api_tests/test_signatures.py::test_func_signature[reshape]

Expand Down
34 changes: 20 additions & 14 deletions array_api_tests/test_array_object.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,35 @@ def test_getitem(shape, data):
obj = data.draw(scalar_objects(dtype, shape), label="obj")
x = xp.asarray(obj, dtype=dtype)
note(f"{x=}")
key = data.draw(xps.indices(shape=shape), label="key")
key = data.draw(xps.indices(shape=shape, allow_newaxis=True), label="key")

out = x[key]

ph.assert_dtype("__getitem__", x.dtype, out.dtype)
_key = tuple(key) if isinstance(key, tuple) else (key,)
if Ellipsis in _key:
start_a = _key.index(Ellipsis)
stop_a = start_a + (len(shape) - (len(_key) - 1))
slices = tuple(slice(None, None) for _ in range(start_a, stop_a))
_key = _key[:start_a] + slices + _key[start_a + 1 :]
nonexpanding_key = tuple(i for i in _key if i is not None)
start_a = nonexpanding_key.index(Ellipsis)
stop_a = start_a + (len(shape) - (len(nonexpanding_key) - 1))
slices = tuple(slice(None) for _ in range(start_a, stop_a))
start_pos = _key.index(Ellipsis)
_key = _key[:start_pos] + slices + _key[start_pos + 1 :]
axes_indices = []
out_shape = []
for a, i in enumerate(_key):
if isinstance(i, int):
axes_indices.append([i])
a = 0
for i in _key:
if i is None:
out_shape.append(1)
else:
side = shape[a]
indices = range(side)[i]
axes_indices.append(indices)
out_shape.append(len(indices))
if isinstance(i, int):
axes_indices.append([i])
else:
assert isinstance(i, slice) # sanity check
side = shape[a]
indices = range(side)[i]
axes_indices.append(indices)
out_shape.append(len(indices))
a += 1
out_shape = tuple(out_shape)
ph.assert_shape("__getitem__", out.shape, out_shape)
assume(all(len(indices) > 0 for indices in axes_indices))
Expand Down Expand Up @@ -104,8 +112,6 @@ def test_setitem(shape, data):
)


# TODO: make mask tests optional

@pytest.mark.data_dependent_shapes
@given(hh.shapes(), st.data())
def test_getitem_masking(shape, data):
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pytest
hypothesis>=6.31.1
hypothesis>=6.45.0
ndindex>=1.6