Allow pytest to skip on optional modules by default

Signed-off-by: Jay Gu <jagu@nvidia.com>

Author: haijieg

pyproject.toml

@@ -65,8 +65,6 @@ include = [
 [tool.setuptools.package-data]
 "cuda.tile" = ["VERSION"]
 
-[tool.pytest_env]
-CUDA_TILE_COMPILER_TIMEOUT_SEC = "60"
 
 [tool.uv]
 managed = true

pytest.ini

@@ -8,3 +8,5 @@ python_functions = test_* bench_*
 addopts = --strict-markers
 markers =
     use_mlir: mark tests that depend on mlir which requires the "internal" extension
+env =
+    CUDA_TILE_COMPILER_TIMEOUT_SEC=60

test/bench_rms_norm.py

@@ -7,7 +7,6 @@
 import pytest
 import torch
 import cuda.tile as ct
-import cuda.tile_experimental as ct_experimental
 import itertools
 from math import ceil
 from util import estimate_bench_iter, next_power_of_2, is_ampere_or_ada
@@ -17,6 +16,8 @@
 from functools import partial
 from types import SimpleNamespace
 
+ct_experimental = pytest.importorskip("cuda.tile_experimental")
+
 
 @pytest.fixture(params=[
     (262144, 1024),

test/conftest.py

@@ -15,6 +15,28 @@
 from cuda.tile._compile import _get_max_supported_bytecode_version
 
 
+def pytest_addoption(parser):
+    parser.addoption(
+        "--error-on-import-skip",
+        action="store_true",
+        default=False,
+        help="Treat import-related skips as errors",
+    )
+
+
+def pytest_configure(config):
+    if config.getoption("error_on_import_skip", default=False):
+        _original = pytest.importorskip
+
+        def strict_importorskip(modname, *args, **kwargs):
+            try:
+                return _original(modname, *args, **kwargs)
+            except pytest.skip.Exception as e:
+                pytest.fail(f"Required import skipped: {e}")
+
+        pytest.importorskip = strict_importorskip
+
+
 @cache
 def get_tileiras_version():
     return _get_max_supported_bytecode_version(tempfile.gettempdir())

test/test_autotuner.py

@@ -9,11 +9,14 @@
 from functools import partial
 from util import assert_equal
 
-import cuda.tile_experimental._autotuner as autotuner_mod
-from cuda.tile_experimental import autotune_launch, clear_autotune_cache
 from cuda.tile._cext import default_tile_context
 from cuda.tile._exception import TileCompilerTimeoutError, TileCompilerExecutionError
 
+ct_experimental = pytest.importorskip("cuda.tile_experimental")
+autotuner_mod = ct_experimental._autotuner
+autotune_launch = ct_experimental.autotune_launch
+clear_autotune_cache = ct_experimental.clear_autotune_cache
+
 
 @ct.kernel
 def dummy_kernel(x, TILE_SIZE: ct.Constant[int]):

test/util.py

@@ -165,8 +165,8 @@ def _find_filecheck_bin() -> Optional[str]:
 
 
 def filecheck(bytecode_buf: bytearray, check_directive: str) -> None:
-    from cuda.tile_internal._internal_cext import bytecode_to_mlir_text
-    mlir_text = bytecode_to_mlir_text(bytecode_buf)
+    mod = pytest.importorskip("cuda.tile_internal._internal_cext")
+    mlir_text = mod.bytecode_to_mlir_text(bytecode_buf)
 
     filecheck_bin = _find_filecheck_bin()
     with (