Reorganize all the tests

Author: mdboom

cuda_bindings/cuda/bindings/_test_helpers/__init__.py

@@ -12,19 +12,23 @@
 
 import cuda.bindings.driver as cuda
 
-# Ensure cuda_python_test_helpers is importable. Prefer an installed package;
-# fall back to the sibling checkout. Keep in sync with cuda_core/tests/conftest.py.
+# Keep in sync with cuda_core/tests/conftest.py.
 try:
-    import cuda_python_test_helpers  # noqa: F401
+    import cuda_python_test_helpers._pytest_plugin  # noqa: F401
 except ImportError as e:
     # Don't call .resolve(): resolving symlinks can make parents[2] point
     # somewhere other than the monorepo root if a sub-directory is symlinked.
     _test_helpers_root = pathlib.Path(__file__).parents[2] / "cuda_python_test_helpers"
     if not _test_helpers_root.is_dir():
         raise RuntimeError(f"cuda-python-test-helpers not installed and not found at {_test_helpers_root}") from e
+    for _k in list(sys.modules):
+        if _k == "cuda_python_test_helpers" or _k.startswith("cuda_python_test_helpers."):
+            del sys.modules[_k]
     sys.path.insert(0, str(_test_helpers_root))
     importlib.invalidate_caches()
 
+pytest_plugins = ["cuda_python_test_helpers._pytest_plugin"]
+
 
 def pytest_configure(config):
     # When using `parallel-threads` set up mini-plugin to ensure each thread has a CUDA context

cuda_bindings/cuda/bindings/_test_helpers/arch_check.py

@@ -3,8 +3,7 @@
 
 
 import pytest
-
-from cuda.bindings._test_helpers.arch_check import hardware_supports_nvml
+from cuda_python_test_helpers.arch_check import hardware_supports_nvml
 
 if not hardware_supports_nvml():
     pytest.skip("NVML not supported on this platform", allow_module_level=True)

cuda_bindings/tests/conftest.py

@@ -4,9 +4,9 @@
 from collections import namedtuple
 
 import pytest
+from cuda_python_test_helpers.arch_check import unsupported_before  # noqa: F401
 
 from cuda.bindings import nvml
-from cuda.bindings._test_helpers.arch_check import unsupported_before  # noqa: F401
 
 
 class NVMLInitializer:

cuda_bindings/tests/nvml/__init__.py

@@ -9,8 +9,8 @@
 import pytest
 
 from cuda.bindings import nvml
+from cuda_python_test_helpers import IS_WINDOWS, IS_WSL
 
-from . import util
 from .conftest import unsupported_before
 
 XFAIL_LEGACY_NVLINK_MSG = "Legacy NVLink test expected to fail."
@@ -64,7 +64,7 @@ def test_device_get_handle_by_pci_bus_id(ngpus, pci_info):
 
 
 @pytest.mark.parametrize("scope", [nvml.AffinityScope.NODE, nvml.AffinityScope.SOCKET])
-@pytest.mark.skipif(util.is_wsl() or util.is_windows(), reason="Not supported on WSL or Windows")
+@pytest.mark.skipif(IS_WSL or IS_WINDOWS, reason="Not supported on WSL or Windows")
 def test_device_get_memory_affinity(handles, scope):
     size = 1024
     for handle in handles:
@@ -75,7 +75,7 @@ def test_device_get_memory_affinity(handles, scope):
 
 
 @pytest.mark.parametrize("scope", [nvml.AffinityScope.NODE, nvml.AffinityScope.SOCKET])
-@pytest.mark.skipif(util.is_wsl() or util.is_windows(), reason="Not supported on WSL or Windows")
+@pytest.mark.skipif(IS_WSL or IS_WINDOWS, reason="Not supported on WSL or Windows")
 def test_device_get_cpu_affinity_within_scope(handles, scope):
     size = 1024
     for handle in handles:

cuda_bindings/tests/nvml/conftest.py

@@ -2,29 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 
-import functools
-import platform
-from pathlib import Path
-
 from cuda.bindings import nvml
 
-current_os = platform.system()
-if current_os == "VMkernel":
-    current_os = "Linux"  # Treat VMkernel as Linux
-
-
-def is_windows(os=current_os):
-    return os == "Windows"
-
-
-def is_linux(os=current_os):
-    return os == "Linux"
-
-
-@functools.cache
-def is_wsl(os=current_os):
-    return os == "Linux" and "microsoft" in Path("/proc/version").read_text().lower()
-
 
 def is_vgpu(device):
     """

cuda_bindings/tests/nvml/test_pynvml.py

@@ -10,11 +10,11 @@
 
 import numpy as np
 import pytest
+from cuda_python_test_helpers.mempool import xfail_if_mempool_oom
 
 import cuda.bindings.driver as cuda
 import cuda.bindings.runtime as cudart
 from cuda.bindings import driver
-from cuda.bindings._test_helpers.mempool import xfail_if_mempool_oom
 
 
 def driverVersionLessThan(target):

cuda_bindings/tests/nvml/util.py

@@ -6,12 +6,12 @@
 
 import numpy as np
 import pytest
+from cuda_python_test_helpers.mempool import xfail_if_mempool_oom
 
 import cuda.bindings.driver as cuda
 import cuda.bindings.runtime as cudart
 from cuda import pathfinder
 from cuda.bindings import runtime
-from cuda.bindings._test_helpers.mempool import xfail_if_mempool_oom
 
 
 def isSuccess(err):

cuda_bindings/tests/test_cuda.py

@@ -7,8 +7,7 @@
 import sys
 
 import pytest
-
-from cuda.bindings._test_helpers.pep723 import has_package_requirements_or_skip
+from cuda_python_test_helpers.pep723 import has_package_requirements_or_skip
 
 examples_path = os.path.join(os.path.dirname(__file__), "..", "examples")
 examples_files = glob.glob(os.path.join(examples_path, "**/*.py"), recursive=True)