Merge remote-tracking branch 'origin/main' into wheel-size-reduction

Author: Andy-Jost

cuda_bindings/cuda/bindings/_internal/utils.pyx

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
@@ -8,6 +8,28 @@ from libcpp.utility cimport move
 from cython.operator cimport dereference as deref
 
 
+cdef extern from *:
+    """
+    #if defined(__clang__)
+        #define _COMPILER_VERSION ("Clang " __clang_version__)
+    #elif defined(__GNUC__) || defined(__GNUG__)
+        #define _COMPILER_VERSION ("GCC " __VERSION__)
+    #elif defined(_MSC_VER)
+        #define _COMPILER_VERSION ("MSVC " Py_STRINGIFY(_MSC_VER))
+    #else
+        #define _COMPILER_VERSION ("Unknown Compiler")
+    #endif
+    """
+    cdef char *_COMPILER_VERSION
+
+
+cpdef str get_c_compiler():
+    """
+    Returns a string describing the C compiler used to build cuda.bindings
+    """
+    return _COMPILER_VERSION.decode()
+
+
 cdef bint is_nested_sequence(data):
     if not cpython.PySequence_Check(data):
         return False

cuda_bindings/tests/nvml/test_cuda.py

@@ -1,6 +1,8 @@
 # SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
+import os
+
 import cuda.bindings.driver as cuda
 from cuda.bindings import nvml
 
@@ -54,4 +56,12 @@ def test_cuda_device_order():
     cuda_devices = get_cuda_device_names()
     nvml_devices = get_nvml_device_names()
 
-    assert cuda_devices == nvml_devices, "CUDA and NVML device lists do not match"
+    if "CUDA_VISIBLE_DEVICES" not in os.environ:
+        # If that environment variable isn't set, the device lists should match exactly
+        assert cuda_devices == nvml_devices, "CUDA and NVML device lists do not match"
+    else:
+        # If the environment variable is set, there may possibly be fewer CUDA devices,
+        # and each of them should still be found in NVML devices.
+        assert len(cuda_devices) <= len(nvml_devices)
+        for cuda_device in cuda_devices:
+            assert cuda_device in nvml_devices, f"CUDA device {cuda_device} not found in NVML device list"

cuda_bindings/tests/test_utils.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
 import importlib
@@ -9,6 +9,7 @@
 
 import pytest
 from cuda.bindings import driver, runtime
+from cuda.bindings._internal.utils import get_c_compiler
 from cuda.bindings.utils import get_cuda_native_handle, get_minimal_required_cuda_ver_from_ptx_ver, get_ptx_ver
 
 have_cufile = importlib.util.find_spec("cuda.bindings.cufile") is not None
@@ -110,3 +111,9 @@ def test_cyclical_imports(module):
     subprocess.check_call(  # noqa: S603
         [sys.executable, Path(__file__).parent / "utils" / "check_cyclical_import.py", f"cuda.bindings.{module}"],
     )
+
+
+def test_get_c_compiler():
+    c_compiler = get_c_compiler()
+    prefix = ("GCC", "Clang", "MSVC", "Unknown")
+    assert sum(c_compiler.startswith(p) for p in prefix) == 1