Skip tests without NVML

Author: mdboom

cuda_core/cuda/core/experimental/system/__init__.py

@@ -13,17 +13,19 @@
     "get_process_name",
 ]
 
-try:
+
+import cuda.bindings
+
+from .system import *
+
+# We need both the existence of cuda.bindings._nvml and a sufficient version
+# with the APIs implemented as we need them.
+
+if tuple(int(x) for x in cuda.bindings.__version__.split(".")) >= (13, 1, 1):
     from cuda.bindings import _nvml
-except ImportError:
-    # Support the earlier non-NVML implementation of these methods if we
-    # have cuda.bindings < 13.1.1
 
-    from .system import *
-else:
     from ._nvml_context import initialize
     from .device import Device, DeviceArchitecture
-    from .system import *
 
     initialize()
 

cuda_core/tests/system/__init__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0

cuda_core/tests/system/conftest.py

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+
+import cuda.bindings
+import pytest
+
+CUDA_BINDINGS_VERSION = tuple(int(x) for x in cuda.bindings.__version__.split("."))
+
+
+NVML_SUPPORTED = CUDA_BINDINGS_VERSION >= (13, 1, 1)
+
+
+skip_if_nvml_unsupported = pytest.mark.skipif(
+    not NVML_SUPPORTED, reason="NVML support requires cuda.bindings version 13.1.1 or later"
+)

cuda_core/tests/system/test_nvml_context.py

@@ -2,6 +2,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# ruff: noqa: E402
+
+from .conftest import skip_if_nvml_unsupported
+
+pytestmark = skip_if_nvml_unsupported
+
 import multiprocessing as mp
 from platform import uname
 

cuda_core/tests/system/test_system_device.py

@@ -2,6 +2,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# ruff: noqa: E402
+
+from .conftest import skip_if_nvml_unsupported
+
+pytestmark = skip_if_nvml_unsupported
+
 import os
 import re
 

cuda_core/tests/system/test_system_system.py

@@ -2,6 +2,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# ruff: noqa: E402
+
+from .conftest import skip_if_nvml_unsupported
+
+pytestmark = skip_if_nvml_unsupported
+
 import os
 
 import pytest