Add --disable-data-dependent-shapes option

Author: honno

array_api_tests/test_searching_functions.py

@@ -76,7 +76,7 @@ def test_argmin(x, data):
         ph.assert_scalar_equals("argmin", int, out_idx, min_i, expected)
 
 
-# TODO: skip if opted out
+@pytest.mark.data_dependent_shapes
 @given(xps.arrays(dtype=xps.scalar_dtypes(), shape=hh.shapes(min_side=1)))
 def test_nonzero(x):
     out = xp.nonzero(x)

array_api_tests/test_set_functions.py

@@ -12,7 +12,7 @@
 from . import shape_helpers as sh
 from . import xps
 
-pytestmark = pytest.mark.ci
+pytestmark = [pytest.mark.ci, pytest.mark.data_dependent_shapes]
 
 
 @given(xps.arrays(dtype=xps.scalar_dtypes(), shape=hh.shapes(min_side=1)))

conftest.py

@@ -35,6 +35,13 @@ def pytest_addoption(parser):
         default=[],
         help="disable testing for Array API extension(s)",
     )
+    # data-dependent shape
+    parser.addoption(
+        "--disable-data-dependent-shapes",
+        "--disable-dds",
+        action="store_true",
+        help="disable testing functions with output shapes dependent on input",
+    )
     # CI
     parser.addoption(
         "--ci",
@@ -47,6 +54,9 @@ def pytest_configure(config):
     config.addinivalue_line(
         "markers", "xp_extension(ext): tests an Array API extension"
     )
+    config.addinivalue_line(
+        "markers", "data_dependent_shapes: output shapes are dependent on inputs"
+    )
     config.addinivalue_line("markers", "ci: primary test")
     # Hypothesis
     hypothesis_max_examples = config.getoption("--hypothesis-max-examples")
@@ -83,9 +93,15 @@ def xp_has_ext(ext: str) -> bool:
 
 def pytest_collection_modifyitems(config, items):
     disabled_exts = config.getoption("--disable-extension")
+    disabled_dds = config.getoption("--disable-data-dependent-shapes")
     ci = config.getoption("--ci")
     for item in items:
         markers = list(item.iter_markers())
+        # skip if specified in skips.txt
+        for id_ in skip_ids:
+            if item.nodeid.startswith(id_):
+                item.add_marker(mark.skip(reason="skips.txt"))
+                break
         # skip if disabled or non-existent extension
         ext_mark = next((m for m in markers if m.name == "xp_extension"), None)
         if ext_mark is not None:
@@ -96,11 +112,14 @@ def pytest_collection_modifyitems(config, items):
                 )
             elif not xp_has_ext(ext):
                 item.add_marker(mark.skip(reason=f"{ext} not found in array module"))
-        # skip if specified in skips.txt
-        for id_ in skip_ids:
-            if item.nodeid.startswith(id_):
-                item.add_marker(mark.skip(reason="skips.txt"))
-                break
+        # skip if disabled by dds flag
+        if disabled_dds:
+            for m in markers:
+                if m.name == "data_dependent_shapes":
+                    item.add_marker(
+                        mark.skip(reason="disabled via --disable-data-dependent-shapes")
+                    )
+                    break
         # skip if test not appropiate for CI
         if ci:
             ci_mark = next((m for m in markers if m.name == "ci"), None)