Rework requires() mark: rename to requires_module, use importorskip

Rename the mark to requires_module and reimplement it as a thin wrapper
around pytest.importorskip, forwarding *args/**kwargs directly. Version
arguments are now strings (matching importorskip's minversion parameter)
rather than integer tuples. Update all call sites accordingly.

Made-with: Cursor

Author: Andy-Jost

cuda_core/tests/graph/test_advanced.py

@@ -6,12 +6,12 @@
 import numpy as np
 import pytest
 from helpers.graph_kernels import compile_common_kernels, compile_conditional_kernels
-from helpers.marks import requires
+from helpers.marks import requires_module
 
 from cuda.core import Device, LaunchConfig, LegacyPinnedMemoryResource, launch
 
 
-@requires(np, 2, 1)
+@requires_module(np, "2.1")
 def test_graph_child_graph(init_cuda):
     mod = compile_common_kernels()
     add_one = mod.get_kernel("add_one")
@@ -64,7 +64,7 @@ def test_graph_child_graph(init_cuda):
     b.close()
 
 
-@requires(np, 2, 1)
+@requires_module(np, "2.1")
 def test_graph_update(init_cuda):
     mod = compile_conditional_kernels(int)
     add_one = mod.get_kernel("add_one")

cuda_core/tests/graph/test_basic.py

@@ -6,7 +6,7 @@
 import numpy as np
 import pytest
 from helpers.graph_kernels import compile_common_kernels
-from helpers.marks import requires
+from helpers.marks import requires_module
 
 from cuda.core import Device, GraphBuilder, LaunchConfig, LegacyPinnedMemoryResource, launch
 
@@ -117,7 +117,7 @@ def test_graph_is_join_required(init_cuda):
     gb.end_building().complete()
 
 
-@requires(np, 2, 1)
+@requires_module(np, "2.1")
 def test_graph_repeat_capture(init_cuda):
     mod = compile_common_kernels()
     add_one = mod.get_kernel("add_one")

cuda_core/tests/graph/test_conditional.py

@@ -8,15 +8,15 @@
 import numpy as np
 import pytest
 from helpers.graph_kernels import compile_conditional_kernels
-from helpers.marks import requires
+from helpers.marks import requires_module
 
 from cuda.core import Device, GraphBuilder, LaunchConfig, LegacyPinnedMemoryResource, launch
 
 
 @pytest.mark.parametrize(
     "condition_value", [True, False, ctypes.c_bool(True), ctypes.c_bool(False), np.bool_(True), np.bool_(False), 1, 0]
 )
-@requires(np, 2, 1)
+@requires_module(np, "2.1")
 def test_graph_conditional_if(init_cuda, condition_value):
     mod = compile_conditional_kernels(type(condition_value))
     add_one = mod.get_kernel("add_one")
@@ -80,7 +80,7 @@ def test_graph_conditional_if(init_cuda, condition_value):
 @pytest.mark.parametrize(
     "condition_value", [True, False, ctypes.c_bool(True), ctypes.c_bool(False), np.bool_(True), np.bool_(False), 1, 0]
 )
-@requires(np, 2, 1)
+@requires_module(np, "2.1")
 def test_graph_conditional_if_else(init_cuda, condition_value):
     mod = compile_conditional_kernels(type(condition_value))
     add_one = mod.get_kernel("add_one")
@@ -152,7 +152,7 @@ def test_graph_conditional_if_else(init_cuda, condition_value):
 
 
 @pytest.mark.parametrize("condition_value", [0, 1, 2, 3])
-@requires(np, 2, 1)
+@requires_module(np, "2.1")
 def test_graph_conditional_switch(init_cuda, condition_value):
     mod = compile_conditional_kernels(type(condition_value))
     add_one = mod.get_kernel("add_one")
@@ -243,7 +243,7 @@ def test_graph_conditional_switch(init_cuda, condition_value):
 
 
 @pytest.mark.parametrize("condition_value", [True, False, 1, 0])
-@requires(np, 2, 1)
+@requires_module(np, "2.1")
 def test_graph_conditional_while(init_cuda, condition_value):
     mod = compile_conditional_kernels(type(condition_value))
     add_one = mod.get_kernel("add_one")

cuda_core/tests/graph/test_device_launch.py

@@ -12,7 +12,7 @@
 
 import numpy as np
 import pytest
-from helpers.marks import requires
+from helpers.marks import requires_module
 
 from cuda.core import (
     Device,
@@ -83,7 +83,7 @@ def _compile_device_launcher_kernel():
     Device().compute_capability.major < 9,
     reason="Device-side graph launch requires Hopper (sm_90+) architecture",
 )
-@requires(np, 2, 1)
+@requires_module(np, "2.1")
 def test_device_launch_basic(init_cuda):
     """Test basic device-side graph launch functionality.
 
@@ -135,7 +135,7 @@ def test_device_launch_basic(init_cuda):
     Device().compute_capability.major < 9,
     reason="Device-side graph launch requires Hopper (sm_90+) architecture",
 )
-@requires(np, 2, 1)
+@requires_module(np, "2.1")
 def test_device_launch_multiple(init_cuda):
     """Test that device-side graph launch can be executed multiple times.
 

cuda_core/tests/helpers/marks.py

@@ -3,37 +3,43 @@
 
 """Reusable pytest marks for cuda_core tests."""
 
-import importlib
-import types
+import inspect
 
 import pytest
 
 
-def requires(module, *version):
-    """Skip the test if a module is missing or older than the given version.
+def requires_module(module, *args, **kwargs):
+    """Skip the test if a module is missing or older than required.
+
+    Thin wrapper around :func:`pytest.importorskip`.  The first argument
+    may be a module object or a string; all remaining positional and
+    keyword arguments (``minversion``, ``reason``, ``exc_type``) are
+    forwarded.
+
+    Prefer this over ``pytest.importorskip`` when:
+
+    - You need finer granularity than module scope or a test body; this
+      mark can decorate classes, individual tests, or ``pytest.param`` entries.
+    - You want to skip before fixtures run, avoiding setup costs.
+    - The module is already imported and you want to pass it directly.
 
     Usage::
 
-        @requires(np, 2, 1)
+        @requires_module("numpy", "2.1")
         def test_foo(): ...
 
 
-        @requires("scipy", 1, 12)
+        @requires_module(np, minversion="2.1")
         def test_bar(): ...
     """
-    if isinstance(module, str):
-        name = module
-        try:
-            module = importlib.import_module(name)
-        except ImportError:
-            return pytest.mark.skip(reason=f"{name} is not installed")
-    elif isinstance(module, types.ModuleType):
-        name = module.__name__
-    else:
+    if inspect.ismodule(module):
+        module = module.__name__
+    elif not isinstance(module, str):
         raise TypeError(f"expected module or string, got {type(module).__name__}")
 
-    n = len(version)
-    parts = module.__version__.split(".")[:n]
-    installed = tuple(int(p) for p in parts)
-    ver_str = ".".join(str(v) for v in version)
-    return pytest.mark.skipif(installed < version, reason=f"need {name} {ver_str}+")
+    try:
+        pytest.importorskip(module, *args, **kwargs)
+    except pytest.skip.Skipped as exc:
+        return pytest.mark.skipif(True, reason=str(exc))
+    else:
+        return pytest.mark.skipif(False, reason="")

cuda_core/tests/test_launcher.py

@@ -4,7 +4,7 @@
 import ctypes
 
 import helpers
-from helpers.marks import requires
+from helpers.marks import requires_module
 from helpers.misc import StreamWrapper
 
 try:
@@ -191,7 +191,7 @@ def test_launch_invalid_values(init_cuda):
 
 
 @pytest.mark.parametrize("python_type, cpp_type, init_value", PARAMS)
-@requires(np, 2, 1)
+@requires_module(np, "2.1")
 def test_launch_scalar_argument(python_type, cpp_type, init_value):
     dev = Device()
     dev.set_current()
@@ -290,7 +290,7 @@ def test_cooperative_launch():
         "device_memory_resource",  # kludgy, but can go away after #726 is resolved
         pytest.param(
             LegacyPinnedMemoryResource,
-            marks=requires(np, 2, 2, 5),
+            marks=requires_module(np, "2.2.5"),
         ),
     ],
 )

cuda_core/tests/test_utils.py

@@ -26,7 +26,7 @@
     ml_dtypes = None
 import numpy as np
 import pytest
-from helpers.marks import requires
+from helpers.marks import requires_module
 
 from cuda.core import Device
 from cuda.core._dlpack import DLDeviceType
@@ -86,7 +86,7 @@ def convert_strides_to_counts(strides, itemsize):
         # readonly is fixed recently (numpy/numpy#26501)
         pytest.param(
             np.frombuffer(b""),
-            marks=requires(np, 2, 1),
+            marks=requires_module(np, "2.1"),
         ),
     ),
 )