Skip to content

Commit

Permalink
BUG: Fix np.array_api.can_cast() by not relying on np.can_cast()
Browse files Browse the repository at this point in the history
  • Loading branch information
honno committed Feb 9, 2022
1 parent a6f55fe commit 8eac9a4
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 4 deletions.
14 changes: 10 additions & 4 deletions numpy/array_api/_data_type_functions.py
Expand Up @@ -50,11 +50,17 @@ def can_cast(from_: Union[Dtype, Array], to: Dtype, /) -> bool:
See its docstring for more information.
"""
from ._array_object import Array

if isinstance(from_, Array):
from_ = from_._array
return np.can_cast(from_, to)
from_ = from_.dtype
elif from_ not in _all_dtypes:
raise TypeError(f"{from_=}, but should be an array_api array or dtype")
if to not in _all_dtypes:
raise TypeError(f"{to=}, but should be a dtype")
try:
dtype = _result_type(from_, to)
return to == dtype
except TypeError:
return False


# These are internal objects for the return types of finfo and iinfo, since
Expand Down
21 changes: 21 additions & 0 deletions numpy/array_api/tests/test_data_type_functions.py
@@ -0,0 +1,21 @@
import pytest

from numpy import array_api as xp


@pytest.mark.parametrize(
"from_, to, expected",
[
(xp.int8, xp.int16, True),
(xp.int16, xp.int8, False),
# np.can_cast has discrepancies with the Array API
# See https://github.com/numpy/numpy/issues/20870
(xp.bool, xp.int8, False),
(xp.asarray(0, dtype=xp.uint8), xp.int8, False),
],
)
def test_can_cast(from_, to, expected):
"""
can_cast() returns correct result
"""
assert xp.can_cast(from_, to) == expected
27 changes: 27 additions & 0 deletions numpy/array_api/tests/test_validation.py
@@ -0,0 +1,27 @@
from typing import Callable

import pytest

from numpy import array_api as xp


def p(func: Callable, *args, **kwargs):
f_sig = ", ".join(
[str(a) for a in args] + [f"{k}={v}" for k, v in kwargs.items()]
)
id_ = f"{func.__name__}({f_sig})"
return pytest.param(func, args, kwargs, id=id_)


@pytest.mark.parametrize(
"func, args, kwargs",
[
p(xp.can_cast, 42, xp.int8),
p(xp.can_cast, xp.int8, 42),
p(xp.result_type, 42),
],
)
def test_raises_on_invalid_types(func, args, kwargs):
"""Function raises TypeError when passed invalidly-typed inputs"""
with pytest.raises(TypeError):
func(*args, **kwargs)

0 comments on commit 8eac9a4

Please sign in to comment.