ENH: test atan2, hypot, logaddexp with scalars

Author: ev-br

array_api_tests/test_operators_and_elementwise_functions.py

@@ -821,10 +821,30 @@ def test_atan(x):
 @given(*hh.two_mutual_arrays(dh.real_float_dtypes))
 def test_atan2(x1, x2):
     out = xp.atan2(x1, x2)
-    ph.assert_dtype("atan2", in_dtype=[x1.dtype, x2.dtype], out_dtype=out.dtype)
-    ph.assert_result_shape("atan2", in_shapes=[x1.shape, x2.shape], out_shape=out.shape)
-    refimpl = cmath.atan2 if x1.dtype in dh.complex_dtypes else math.atan2
-    binary_assert_against_refimpl("atan2", x1, x2, out, refimpl)
+    _assert_correctness_binary(
+        "atan",
+        cmath.atan2 if x1.dtype in dh.complex_dtypes else math.atan2,
+        in_dtypes=[x1.dtype, x2.dtype],
+        in_shapes=[x1.shape, x2.shape],
+        in_arrs=[x1, x2],
+        out=out,
+    )
+
+
+@pytest.mark.min_version("2024.12")
+@given(hh.array_and_py_scalar(dh.real_float_dtypes))
+def test_atan2_with_scalars(x1x2):
+    x1, x2 = x1x2
+    out = xp.atan2(x1, x2)
+    in_dtypes, in_shapes, (x1a, x2a) = _convert_scalars_helper(x1, x2)
+    _assert_correctness_binary(
+        "atan2",
+        cmath.atan2 if x1a.dtype in dh.complex_dtypes else math.atan2,
+        in_dtypes=in_dtypes,
+        in_shapes=in_shapes,
+        in_arrs=[x1a, x2a],
+        out=out,
+    )
 
 
 @given(hh.arrays(dtype=hh.all_floating_dtypes(), shape=hh.shapes()))
@@ -1290,11 +1310,31 @@ def test_greater_equal(ctx, data):
 @given(*hh.two_mutual_arrays(dh.real_float_dtypes))
 def test_hypot(x1, x2):
     out = xp.hypot(x1, x2)
-    ph.assert_dtype("hypot", in_dtype=[x1.dtype, x2.dtype], out_dtype=out.dtype)
-    ph.assert_result_shape("hypot", in_shapes=[x1.shape, x2.shape], out_shape=out.shape)
-    binary_assert_against_refimpl("hypot", x1, x2, out, math.hypot)
+    _assert_correctness_binary(
+        "hypot",
+        math.hypot,
+        in_dtypes=[x1.dtype, x2.dtype],
+        in_shapes=[x1.shape, x2.shape],
+        in_arrs=[x1, x2],
+        out=out
+    )
 
 
+@pytest.mark.min_version("2024.12")
+@given(hh.array_and_py_scalar(dh.real_float_dtypes))
+def test_hypot_with_scalars(x1x2):
+    x1, x2 = x1x2
+    out = xp.hypot(x1, x2)
+    in_dtypes, in_shapes, (x1a, x2a) = _convert_scalars_helper(x1, x2)
+    _assert_correctness_binary(
+        "hypot",
+        math.hypot,
+        in_dtypes=in_dtypes,
+        in_shapes=in_shapes,
+        in_arrs=(x1a, x2a),
+        out=out
+    )
+
 
 @pytest.mark.min_version("2022.12")
 @pytest.mark.skipif(hh.complex_dtypes.is_empty, reason="no complex data types to draw from")
@@ -1443,12 +1483,34 @@ def logaddexp_refimpl(l: float, r: float) -> float:
         raise OverflowError
 
 
+@pytest.mark.min_version("2023.12")
 @given(*hh.two_mutual_arrays(dh.real_float_dtypes))
 def test_logaddexp(x1, x2):
     out = xp.logaddexp(x1, x2)
-    ph.assert_dtype("logaddexp", in_dtype=[x1.dtype, x2.dtype], out_dtype=out.dtype)
-    ph.assert_result_shape("logaddexp", in_shapes=[x1.shape, x2.shape], out_shape=out.shape)
-    binary_assert_against_refimpl("logaddexp", x1, x2, out, logaddexp_refimpl)
+    _assert_correctness_binary(
+        "logaddexp",
+        logaddexp_refimpl,
+        in_dtypes=[x1.dtype, x2.dtype],
+        in_shapes=[x1.shape, x2.shape],
+        in_arrs=[x1, x2],
+        out=out
+    )
+
+
+@pytest.mark.min_version("2024.12")
+@given(hh.array_and_py_scalar(dh.real_float_dtypes))
+def test_logaddexp_with_scalars(x1x2):
+    x1, x2 = x1x2
+    out = xp.logaddexp(x1, x2)
+    in_dtypes, in_shapes, (x1a, x2a) = _convert_scalars_helper(x1, x2)
+    _assert_correctness_binary(
+        "logaddexp",
+        logaddexp_refimpl,
+        in_dtypes=in_dtypes,
+        in_shapes=in_shapes,
+        in_arrs=(x1a, x2a),
+        out=out
+    )
 
 
 @given(hh.arrays(dtype=xp.bool, shape=hh.shapes()))