Skip to content

BUG: Return correctly shaped inverse indices in array_api set functions #20819

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
Jan 13, 2022
Merged

BUG: Return correctly shaped inverse indices in array_api set functions #20819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09a379c
BUG: Return correctly shaped inverse indices in `array_api`
honno Jan 11, 2022
d671964
Regression test for inverse indices in `array_api` set functions
honno Jan 13, 2022
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
20 changes: 15 additions & 5 deletions numpy/array_api/_set_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,21 @@ def unique_all(x: Array, /) -> UniqueAllResult:

See its docstring for more information.
"""
res = np.unique(
values, indices, inverse_indices, counts = np.unique(
x._array,
return_counts=True,
return_index=True,
return_inverse=True,
)

return UniqueAllResult(*[Array._new(i) for i in res])
# np.unique() flattens inverse indices, but they need to share x's shape
# See https://github.com/numpy/numpy/issues/20638
inverse_indices = inverse_indices.reshape(x.shape)
return UniqueAllResult(
Array._new(values),
Array._new(indices),
Array._new(inverse_indices),
Array._new(counts),
)


def unique_counts(x: Array, /) -> UniqueCountsResult:
Expand All @@ -68,13 +75,16 @@ def unique_inverse(x: Array, /) -> UniqueInverseResult:

See its docstring for more information.
"""
res = np.unique(
values, inverse_indices = np.unique(
x._array,
return_counts=False,
return_index=False,
return_inverse=True,
)
return UniqueInverseResult(*[Array._new(i) for i in res])
# np.unique() flattens inverse indices, but they need to share x's shape
# See https://github.com/numpy/numpy/issues/20638
inverse_indices = inverse_indices.reshape(x.shape)
return UniqueInverseResult(Array._new(values), Array._new(inverse_indices))


def unique_values(x: Array, /) -> Array:
Expand Down
19 changes: 19 additions & 0 deletions numpy/array_api/tests/test_set_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import pytest
from hypothesis import given
from hypothesis.extra.array_api import make_strategies_namespace

from numpy import array_api as xp

xps = make_strategies_namespace(xp)


@pytest.mark.parametrize("func", [xp.unique_all, xp.unique_inverse])
@given(xps.arrays(dtype=xps.scalar_dtypes(), shape=xps.array_shapes()))
def test_inverse_indices_shape(func, x):
"""
Inverse indices share shape of input array

See https://github.com/numpy/numpy/issues/20638
"""
out = func(x)
assert out.inverse_indices.shape == x.shape