out_name -> repr_name

Author: honno

array_api_tests/pytest_helpers.py

@@ -69,15 +69,15 @@ def assert_dtype(
     out_dtype: DataType,
     expected: Optional[DataType] = None,
     *,
-    out_name: str = "out.dtype",
+    repr_name: str = "out.dtype",
 ):
     f_in_dtypes = dh.fmt_types(in_dtypes)
     f_out_dtype = dh.dtype_to_name[out_dtype]
     if expected is None:
         expected = dh.result_type(*in_dtypes)
     f_expected = dh.dtype_to_name[expected]
     msg = (
-        f"{out_name}={f_out_dtype}, but should be {f_expected} "
+        f"{repr_name}={f_out_dtype}, but should be {f_expected} "
         f"[{func_name}({f_in_dtypes})]"
     )
     assert out_dtype == expected, msg
@@ -118,15 +118,15 @@ def assert_shape(
     out_shape: Union[int, Shape],
     expected: Union[int, Shape],
     /,
-    out_name="out.shape",
+    repr_name="out.shape",
     **kw,
 ):
     if isinstance(out_shape, int):
         out_shape = (out_shape,)
     if isinstance(expected, int):
         expected = (expected,)
     msg = (
-        f"{out_name}={out_shape}, but should be {expected} [{func_name}({fmt_kw(kw)})]"
+        f"{repr_name}={out_shape}, but should be {expected} [{func_name}({fmt_kw(kw)})]"
     )
     assert out_shape == expected, msg
 

array_api_tests/test_elementwise_functions.py

@@ -358,7 +358,7 @@ def test_bitwise_and(
     if not right_is_scalar:
         # TODO: generate indices without broadcasting arrays (see test_equal comment)
         shape = broadcast_shapes(left.shape, right.shape)
-        ph.assert_shape(func_name, res.shape, shape, out_name=f"{res_name}.shape")
+        ph.assert_shape(func_name, res.shape, shape, repr_name=f"{res_name}.shape")
         _left = xp.broadcast_to(left, shape)
         _right = xp.broadcast_to(right, shape)
 
@@ -409,7 +409,7 @@ def test_bitwise_left_shift(
         # TODO: generate indices without broadcasting arrays (see test_equal comment)
         shape = broadcast_shapes(left.shape, right.shape)
         ph.assert_shape(
-            "bitwise_left_shift", res.shape, shape, out_name=f"{res_name}.shape"
+            "bitwise_left_shift", res.shape, shape, repr_name=f"{res_name}.shape"
         )
         _left = xp.broadcast_to(left, shape)
         _right = xp.broadcast_to(right, shape)
@@ -477,7 +477,7 @@ def test_bitwise_or(
     if not right_is_scalar:
         # TODO: generate indices without broadcasting arrays (see test_equal comment)
         shape = broadcast_shapes(left.shape, right.shape)
-        ph.assert_shape("bitwise_or", res.shape, shape, out_name=f"{res_name}.shape")
+        ph.assert_shape("bitwise_or", res.shape, shape, repr_name=f"{res_name}.shape")
         _left = xp.broadcast_to(left, shape)
         _right = xp.broadcast_to(right, shape)
 
@@ -528,7 +528,7 @@ def test_bitwise_right_shift(
         # TODO: generate indices without broadcasting arrays (see test_equal comment)
         shape = broadcast_shapes(left.shape, right.shape)
         ph.assert_shape(
-            "bitwise_right_shift", res.shape, shape, out_name=f"{res_name}.shape"
+            "bitwise_right_shift", res.shape, shape, repr_name=f"{res_name}.shape"
         )
         _left = xp.broadcast_to(left, shape)
         _right = xp.broadcast_to(right, shape)
@@ -568,7 +568,7 @@ def test_bitwise_xor(
     if not right_is_scalar:
         # TODO: generate indices without broadcasting arrays (see test_equal comment)
         shape = broadcast_shapes(left.shape, right.shape)
-        ph.assert_shape("bitwise_xor", res.shape, shape, out_name=f"{res_name}.shape")
+        ph.assert_shape("bitwise_xor", res.shape, shape, repr_name=f"{res_name}.shape")
         _left = xp.broadcast_to(left, shape)
         _right = xp.broadcast_to(right, shape)
 

array_api_tests/test_type_promotion.py

@@ -25,7 +25,7 @@
 @given(hh.mutually_promotable_dtypes(None))
 def test_result_type(dtypes):
     out = xp.result_type(*dtypes)
-    ph.assert_dtype("result_type", dtypes, out, out_name="out")
+    ph.assert_dtype("result_type", dtypes, out, repr_name="out")
 
 
 # The number and size of generated arrays is arbitrarily limited to prevent
@@ -48,7 +48,7 @@ def test_meshgrid(dtypes, data):
     assert math.prod(x.size for x in arrays) <= hh.MAX_ARRAY_SIZE  # sanity check
     out = xp.meshgrid(*arrays)
     for i, x in enumerate(out):
-        ph.assert_dtype("meshgrid", dtypes, x.dtype, out_name=f"out[{i}].dtype")
+        ph.assert_dtype("meshgrid", dtypes, x.dtype, repr_name=f"out[{i}].dtype")
 
 
 @given(
@@ -312,7 +312,7 @@ def test_inplace_op_promotion(op, expr, in_dtypes, out_dtype, shapes, data):
     except OverflowError:
         reject()
     x1 = locals_["x1"]
-    ph.assert_dtype(op, in_dtypes, x1.dtype, out_dtype, out_name="x1.dtype")
+    ph.assert_dtype(op, in_dtypes, x1.dtype, out_dtype, repr_name="x1.dtype")
 
 
 op_scalar_params: List[Param[str, str, DataType, ScalarType, DataType]] = []
@@ -381,7 +381,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(op, (dtype, in_stype), x.dtype, dtype, out_name="x.dtype")
+    ph.assert_dtype(op, (dtype, in_stype), x.dtype, dtype, repr_name="x.dtype")
 
 
 if __name__ == "__main__":