Merge pull request #181 from asmeurer/torch-fixes

Fix some issues

Author: asmeurer

array_api_tests/test_array_object.py

@@ -250,8 +250,8 @@ def make_param(method_name: str, dtype: DataType, stype: ScalarType) -> Param:
 @pytest.mark.parametrize(
     "method_name, dtype, stype",
     [make_param("__bool__", xp.bool, bool)]
-    + [make_param("__int__", d, int) for d in dh.all_int_dtypes]
-    + [make_param("__index__", d, int) for d in dh.all_int_dtypes]
+    + [make_param("__int__", d, int) for d in dh._filter_stubs(*dh.all_int_dtypes)]
+    + [make_param("__index__", d, int) for d in dh._filter_stubs(*dh.all_int_dtypes)]
     + [make_param("__float__", d, float) for d in dh.float_dtypes],
 )
 @given(data=st.data())

array_api_tests/test_data_type_functions.py

@@ -164,7 +164,7 @@ def test_finfo(dtype):
     # TODO: test values
 
 
-@pytest.mark.parametrize("dtype", dh.all_int_dtypes, ids=make_dtype_id)
+@pytest.mark.parametrize("dtype", dh._filter_stubs(*dh.all_int_dtypes), ids=make_dtype_id)
 def test_iinfo(dtype):
     out = xp.iinfo(dtype)
     f_func = f"[iinfo({dh.dtype_to_name[dtype]})]"

array_api_tests/test_indexing_functions.py

@@ -32,14 +32,16 @@ def test_take(x, data):
 
     out = xp.take(x, indices, axis=axis)
 
-    ph.assert_dtype("take", x.dtype, out.dtype)
+    ph.assert_dtype("take", in_dtype=x.dtype, out_dtype=out.dtype)
     ph.assert_shape(
         "take",
-        out.shape,
-        x.shape[:axis] + (len(_indices),) + x.shape[axis + 1 :],
-        x=x,
-        indices=indices,
-        axis=axis,
+        out_shape=out.shape,
+        expected=x.shape[:axis] + (len(_indices),) + x.shape[axis + 1 :],
+        kw=dict(
+            x=x,
+            indices=indices,
+            axis=axis,
+        ),
     )
     out_indices = sh.ndindex(out.shape)
     axis_indices = list(sh.axis_ndindex(x.shape, axis))
@@ -52,10 +54,10 @@ def test_take(x, data):
                 out_idx = next(out_indices)
                 ph.assert_0d_equals(
                     "take",
-                    sh.fmt_idx(f_take_idx, at_idx),
-                    indexed_x[at_idx],
-                    sh.fmt_idx("out", out_idx),
-                    out[out_idx],
+                    x_repr=sh.fmt_idx(f_take_idx, at_idx),
+                    x_val=indexed_x[at_idx],
+                    out_repr=sh.fmt_idx("out", out_idx),
+                    out_val=out[out_idx],
                 )
     # sanity check
     with pytest.raises(StopIteration):