summaryrefslogtreecommitdiff
path: root/numpy/array_api
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2022-02-09 14:36:58 -0700
committerGitHub <noreply@github.com>2022-02-09 14:36:58 -0700
commit69cce4014fd16c5182e9d133a273ef29a5a70adc (patch)
tree292f7570467bb979d52d9a8a3fc53010d716b6bf /numpy/array_api
parent1cacb2ffb1113167a4995f4f4c183f9a8356c2f0 (diff)
parent995f5464b6c5d8569e159a96c6af106721a4e6d5 (diff)
downloadnumpy-69cce4014fd16c5182e9d133a273ef29a5a70adc.tar.gz
Merge pull request #20883 from honno/xp-can-cast
BUG: Fix `np.array_api.can_cast()` by not relying on `np.can_cast()`
Diffstat (limited to 'numpy/array_api')
-rw-r--r--numpy/array_api/_data_type_functions.py19
-rw-r--r--numpy/array_api/tests/test_data_type_functions.py19
-rw-r--r--numpy/array_api/tests/test_validation.py27
3 files changed, 61 insertions, 4 deletions
diff --git a/numpy/array_api/_data_type_functions.py b/numpy/array_api/_data_type_functions.py
index e4d6db61b..1fb6062f6 100644
--- a/numpy/array_api/_data_type_functions.py
+++ b/numpy/array_api/_data_type_functions.py
@@ -50,11 +50,22 @@ 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")
+ # Note: We avoid np.can_cast() as it has discrepancies with the array API.
+ # See https://github.com/numpy/numpy/issues/20870
+ try:
+ # We promote `from_` and `to` together. We then check if the promoted
+ # dtype is `to`, which indicates if `from_` can (up)cast to `to`.
+ dtype = _result_type(from_, to)
+ return to == dtype
+ except TypeError:
+ # _result_type() raises if the dtypes don't promote together
+ return False
# These are internal objects for the return types of finfo and iinfo, since
diff --git a/numpy/array_api/tests/test_data_type_functions.py b/numpy/array_api/tests/test_data_type_functions.py
new file mode 100644
index 000000000..efe3d0abd
--- /dev/null
+++ b/numpy/array_api/tests/test_data_type_functions.py
@@ -0,0 +1,19 @@
+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),
+ (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
diff --git a/numpy/array_api/tests/test_validation.py b/numpy/array_api/tests/test_validation.py
new file mode 100644
index 000000000..0dd100d15
--- /dev/null
+++ b/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)