Merge branch 'master' into reciprocal

Author: ev-br

array_api_tests/hypothesis_helpers.py

@@ -370,17 +370,23 @@ def mutually_broadcastable_shapes(
 # TODO: Add support for complex Hermitian matrices
 @composite
 def symmetric_matrices(draw, dtypes=real_floating_dtypes, finite=True, bound=10.):
+    # for now, only generate elements from (1, bound); TODO: restore
+    # generating from (-bound, -1/bound).or.(1/bound, bound)
+    # Note that using `assume` triggers a HealthCheck for filtering too much.
     shape = draw(square_matrix_shapes)
     dtype = draw(dtypes)
     if not isinstance(finite, bool):
         finite = draw(finite)
-    elements = {'allow_nan': False, 'allow_infinity': False} if finite else None
+    if finite:
+        elements = {'allow_nan': False, 'allow_infinity': False,
+                    'min_value': 1, 'max_value': bound}
+    else:
+        elements = None
     a = draw(arrays(dtype=dtype, shape=shape, elements=elements))
     at = ah._matrix_transpose(a)
     H = (a + at)*0.5
     if finite:
         assume(not xp.any(xp.isinf(H)))
-    assume(xp.all((H == 0.) | ((1/bound <= xp.abs(H)) & (xp.abs(H) <= bound))))
     return H
 
 @composite

array_api_tests/test_data_type_functions.py

@@ -129,31 +129,17 @@ def test_broadcast_to(x, data):
     # TODO: test values
 
 
-@given(_from=non_complex_dtypes(), to=non_complex_dtypes(), data=st.data())
-def test_can_cast(_from, to, data):
-    from_ = data.draw(
-        st.just(_from) | hh.arrays(dtype=_from, shape=hh.shapes()), label="from_"
-    )
+@given(_from=hh.all_dtypes, to=hh.all_dtypes)
+def test_can_cast(_from, to):
+    out = xp.can_cast(_from, to)
 
-    out = xp.can_cast(from_, to)
+    expected = False
+    for other in dh.all_dtypes:
+        if dh.promotion_table.get((_from, other)) == to:
+            expected = True
+            break
 
     f_func = f"[can_cast({dh.dtype_to_name[_from]}, {dh.dtype_to_name[to]})]"
-    assert isinstance(out, bool), f"{type(out)=}, but should be bool {f_func}"
-    if _from == xp.bool:
-        expected = to == xp.bool
-    else:
-        same_family = None
-        for dtypes in [dh.all_int_dtypes, dh.real_float_dtypes, dh.complex_dtypes]:
-            if _from in dtypes:
-                same_family = to in dtypes
-                break
-        assert same_family is not None  # sanity check
-        if same_family:
-            from_min, from_max = dh.dtype_ranges[_from]
-            to_min, to_max = dh.dtype_ranges[to]
-            expected = from_min >= to_min and from_max <= to_max
-        else:
-            expected = False
     if expected:
         # cross-kind casting is not explicitly disallowed. We can only test
         # the cases where it should return True. TODO: if expected=False,

array_api_tests/test_operators_and_elementwise_functions.py

@@ -1061,14 +1061,13 @@ def refimpl(_x, _min, _max):
             )
 
 
-if api_version >= "2022.12":
-
-    @given(hh.arrays(dtype=hh.complex_dtypes, shape=hh.shapes()))
-    def test_conj(x):
-        out = xp.conj(x)
-        ph.assert_dtype("conj", in_dtype=x.dtype, out_dtype=out.dtype)
-        ph.assert_shape("conj", out_shape=out.shape, expected=x.shape)
-        unary_assert_against_refimpl("conj", x, out, operator.methodcaller("conjugate"))
+@pytest.mark.min_version("2022.12")
+@given(hh.arrays(dtype=hh.complex_dtypes, shape=hh.shapes()))
+def test_conj(x):
+    out = xp.conj(x)
+    ph.assert_dtype("conj", in_dtype=x.dtype, out_dtype=out.dtype)
+    ph.assert_shape("conj", out_shape=out.shape, expected=x.shape)
+    unary_assert_against_refimpl("conj", x, out, operator.methodcaller("conjugate"))
 
 
 @pytest.mark.min_version("2023.12")
@@ -1263,14 +1262,14 @@ def test_hypot(x1, x2):
     binary_assert_against_refimpl("hypot", x1, x2, out, math.hypot)
 
 
-if api_version >= "2022.12":
 
-    @given(hh.arrays(dtype=hh.complex_dtypes, shape=hh.shapes()))
-    def test_imag(x):
-        out = xp.imag(x)
-        ph.assert_dtype("imag", in_dtype=x.dtype, out_dtype=out.dtype, expected=dh.dtype_components[x.dtype])
-        ph.assert_shape("imag", out_shape=out.shape, expected=x.shape)
-        unary_assert_against_refimpl("imag", x, out, operator.attrgetter("imag"))
+@pytest.mark.min_version("2022.12")
+@given(hh.arrays(dtype=hh.complex_dtypes, shape=hh.shapes()))
+def test_imag(x):
+    out = xp.imag(x)
+    ph.assert_dtype("imag", in_dtype=x.dtype, out_dtype=out.dtype, expected=dh.dtype_components[x.dtype])
+    ph.assert_shape("imag", out_shape=out.shape, expected=x.shape)
+    unary_assert_against_refimpl("imag", x, out, operator.attrgetter("imag"))
 
 
 @given(hh.arrays(dtype=hh.numeric_dtypes, shape=hh.shapes()))
@@ -1575,14 +1574,13 @@ def test_reciprocal(x):
     )
 
 
-if api_version >= "2022.12":
-
-    @given(hh.arrays(dtype=hh.complex_dtypes, shape=hh.shapes()))
-    def test_real(x):
-        out = xp.real(x)
-        ph.assert_dtype("real", in_dtype=x.dtype, out_dtype=out.dtype, expected=dh.dtype_components[x.dtype])
-        ph.assert_shape("real", out_shape=out.shape, expected=x.shape)
-        unary_assert_against_refimpl("real", x, out, operator.attrgetter("real"))
+@pytest.mark.min_version("2022.12")
+@given(hh.arrays(dtype=hh.complex_dtypes, shape=hh.shapes()))
+def test_real(x):
+    out = xp.real(x)
+    ph.assert_dtype("real", in_dtype=x.dtype, out_dtype=out.dtype, expected=dh.dtype_components[x.dtype])
+    ph.assert_shape("real", out_shape=out.shape, expected=x.shape)
+    unary_assert_against_refimpl("real", x, out, operator.attrgetter("real"))
 
 
 @pytest.mark.skip(reason="flaky")