Construct test case name in ph.assert_dtype()

Author: honno

array_api_tests/pytest_helpers.py

@@ -1,4 +1,5 @@
 from inspect import getfullargspec
+from typing import Tuple
 
 from . import dtype_helpers as dh
 from . import function_stubs
@@ -38,11 +39,21 @@ def doesnt_raise(function, message=''):
 def nargs(func_name):
     return len(getfullargspec(getattr(function_stubs, func_name)).args)
 
-def assert_dtype(test_case: str, result_name: str, dtype: DataType, expected: DataType):
+
+def assert_dtype(
+    func_name: str,
+    in_dtypes: Tuple[DataType, ...],
+    out_name: str,
+    out_dtype: DataType,
+    expected: DataType
+):
+    f_in_dtypes = dh.fmt_types(in_dtypes)
+    f_out_dtype = dh.dtype_to_name[out_dtype]
+    f_expected = dh.dtype_to_name[expected]
     msg = (
-        f'{result_name}={dh.dtype_to_name[dtype]}, '
-        f'but should be {dh.dtype_to_name[expected]} [{test_case}]'
+        f"{out_name}={f_out_dtype}, but should be {f_expected} "
+        f"[{func_name}({f_in_dtypes})]"
     )
-    assert dtype == expected, msg
+    assert out_dtype == expected, msg
 
 

array_api_tests/test_type_promotion.py

@@ -20,9 +20,7 @@
 @given(hh.mutually_promotable_dtypes(None))
 def test_result_type(dtypes):
     out = xp.result_type(*dtypes)
-    ph.assert_dtype(
-        f'result_type({dh.fmt_types(dtypes)})', 'out', out, dh.result_type(*dtypes)
-    )
+    ph.assert_dtype('result_type', dtypes, 'out', out, dh.result_type(*dtypes))
 
 
 @given(
@@ -37,9 +35,8 @@ def test_meshgrid(dtypes, data):
         arrays.append(x)
     out = xp.meshgrid(*arrays)
     expected = dh.result_type(*dtypes)
-    test_case = f'meshgrid({dh.fmt_types(dtypes)})'
     for i, x in enumerate(out):
-        ph.assert_dtype(test_case, f'out[{i}].dtype', x.dtype, expected)
+        ph.assert_dtype('meshgrid', dtypes, f'out[{i}].dtype', x.dtype, expected)
 
 
 @given(
@@ -53,12 +50,7 @@ def test_concat(shape, dtypes, data):
         x = data.draw(xps.arrays(dtype=dtype, shape=shape), label=f'x{i}')
         arrays.append(x)
     out = xp.concat(arrays)
-    ph.assert_dtype(
-        f'concat({dh.fmt_types(dtypes)})',
-        'out.dtype',
-        out.dtype,
-        dh.result_type(*dtypes),
-    )
+    ph.assert_dtype('concat', dtypes, 'out.dtype', out.dtype, dh.result_type(*dtypes))
 
 
 @given(
@@ -72,12 +64,7 @@ def test_stack(shape, dtypes, data):
         x = data.draw(xps.arrays(dtype=dtype, shape=shape), label=f'x{i}')
         arrays.append(x)
     out = xp.stack(arrays)
-    ph.assert_dtype(
-        f'stack({dh.fmt_types(dtypes)})',
-        'out.dtype',
-        out.dtype,
-        dh.result_type(*dtypes),
-    )
+    ph.assert_dtype('stack', dtypes, 'out.dtype', out.dtype, dh.result_type(*dtypes))
 
 
 bitwise_shift_funcs = [
@@ -163,9 +150,7 @@ def test_func_promotion(func_name, in_dtypes, out_dtype, data):
             out = func(*arrays)
         except OverflowError:
             reject()
-    ph.assert_dtype(
-        f'{func_name}({dh.fmt_types(in_dtypes)})', 'out.dtype', out.dtype, out_dtype
-    )
+    ph.assert_dtype(func_name, in_dtypes, 'out.dtype', out.dtype, out_dtype)
 
 
 promotion_params: List[Param[Tuple[DataType, DataType], DataType]] = []
@@ -185,9 +170,7 @@ def test_where(in_dtypes, out_dtype, shapes, data):
     x2 = data.draw(xps.arrays(dtype=in_dtypes[1], shape=shapes[1]), label='x2')
     cond = data.draw(xps.arrays(dtype=xp.bool, shape=shapes[2]), label='condition')
     out = xp.where(cond, x1, x2)
-    ph.assert_dtype(
-        f'where({dh.fmt_types(in_dtypes)})', 'out.dtype', out.dtype, out_dtype
-    )
+    ph.assert_dtype('where', in_dtypes, 'out.dtype', out.dtype, out_dtype)
 
 
 numeric_promotion_params = promotion_params[1:]
@@ -199,9 +182,7 @@ def test_tensordot(in_dtypes, out_dtype, shapes, data):
     x1 = data.draw(xps.arrays(dtype=in_dtypes[0], shape=shapes[0]), label='x1')
     x2 = data.draw(xps.arrays(dtype=in_dtypes[1], shape=shapes[1]), label='x2')
     out = xp.tensordot(x1, x2)
-    ph.assert_dtype(
-        f'tensordot({dh.fmt_types(in_dtypes)})', 'out.dtype', out.dtype, out_dtype
-    )
+    ph.assert_dtype('tensordot', in_dtypes, 'out.dtype', out.dtype, out_dtype)
 
 
 @pytest.mark.parametrize('in_dtypes, out_dtype', numeric_promotion_params)
@@ -210,9 +191,7 @@ def test_vecdot(in_dtypes, out_dtype, shapes, data):
     x1 = data.draw(xps.arrays(dtype=in_dtypes[0], shape=shapes[0]), label='x1')
     x2 = data.draw(xps.arrays(dtype=in_dtypes[1], shape=shapes[1]), label='x2')
     out = xp.vecdot(x1, x2)
-    ph.assert_dtype(
-        f'vecdot({dh.fmt_types(in_dtypes)})', 'out.dtype', out.dtype, out_dtype
-    )
+    ph.assert_dtype('vecdot', in_dtypes, 'out.dtype', out.dtype, out_dtype)
 
 
 op_params: List[Param[str, str, Tuple[DataType, ...], DataType]] = []
@@ -280,9 +259,7 @@ def test_op_promotion(op, expr, in_dtypes, out_dtype, data):
             out = eval(expr, locals_)
         except OverflowError:
             reject()
-    ph.assert_dtype(
-        f'{op}({dh.fmt_types(in_dtypes)})', 'out.dtype', out.dtype, out_dtype
-    )
+    ph.assert_dtype(op, in_dtypes, 'out.dtype', out.dtype, out_dtype)
 
 
 inplace_params: List[Param[str, str, Tuple[DataType, ...], DataType]] = []
@@ -323,7 +300,7 @@ def test_inplace_op_promotion(op, expr, in_dtypes, out_dtype, shapes, data):
     except OverflowError:
         reject()
     x1 = locals_['x1']
-    ph.assert_dtype(f'{op}({dh.fmt_types(in_dtypes)})', 'x1.dtype', x1.dtype, out_dtype)
+    ph.assert_dtype(op, in_dtypes, 'x1.dtype', x1.dtype, out_dtype)
 
 
 op_scalar_params: List[Param[str, str, DataType, ScalarType, DataType]] = []
@@ -357,9 +334,7 @@ def test_op_scalar_promotion(op, expr, in_dtype, in_stype, out_dtype, data):
         out = eval(expr, {'x': x, 's': s})
     except OverflowError:
         reject()
-    ph.assert_dtype(
-        f'{op}({dh.fmt_types((in_dtype, in_stype))})', 'out.dtype', out.dtype, out_dtype
-    )
+    ph.assert_dtype(op, (in_dtype, in_stype), 'out.dtype', out.dtype, out_dtype)
 
 
 inplace_scalar_params: List[Param[str, str, DataType, ScalarType]] = []
@@ -394,9 +369,7 @@ def test_inplace_op_scalar_promotion(op, expr, dtype, in_stype, data):
         reject()
     x = locals_['x']
     assert x.dtype == dtype, f'{x.dtype=!s}, but should be {dtype}'
-    ph.assert_dtype(
-        f'{op}({dh.fmt_types((dtype, in_stype))})', 'x.dtype', x.dtype, dtype
-    )
+    ph.assert_dtype(op, (dtype, in_stype), 'x.dtype', x.dtype, dtype)
 
 
 if __name__ == '__main__':