Test unary/binary/inplace ops alongside scalars

Author: honno

array_api_tests/dtype_helpers.py

@@ -30,6 +30,7 @@
     'binary_op_to_symbol',
     'unary_op_to_symbol',
     'inplace_op_to_symbol',
+    'op_to_func',
     'fmt_types',
 ]
 
@@ -332,7 +333,7 @@ def result_type(*dtypes: DataType):
 }
 
 
-_op_to_func = {
+op_to_func = {
     '__abs__': 'abs',
     '__add__': 'add',
     '__and__': 'bitwise_and',
@@ -359,7 +360,7 @@ def result_type(*dtypes: DataType):
 }
 
 
-for op, elwise_func in _op_to_func.items():
+for op, elwise_func in op_to_func.items():
     func_in_dtypes[op] = func_in_dtypes[elwise_func]
     func_returns_bool[op] = func_returns_bool[elwise_func]
 

array_api_tests/pytest_helpers.py

@@ -114,14 +114,19 @@ def assert_default_int(func_name: str, dtype: DataType):
 
 
 def assert_shape(
-    func_name: str, out_shape: Union[int, Shape], expected: Union[int, Shape], /, **kw
+    func_name: str,
+    out_shape: Union[int, Shape],
+    expected: Union[int, Shape],
+    /,
+    out_name="out.shape",
+    **kw,
 ):
     if isinstance(out_shape, int):
         out_shape = (out_shape,)
     if isinstance(expected, int):
         expected = (expected,)
     msg = (
-        f"out.shape={out_shape}, but should be {expected} [{func_name}({fmt_kw(kw)})]"
+        f"{out_name}={out_shape}, but should be {expected} [{func_name}({fmt_kw(kw)})]"
     )
     assert out_shape == expected, msg