Skip to content

Commit 7233e93

Browse files
committed
Merge branch 'main' into test_generated_file_seal
2 parents 94e42e8 + ec4af50 commit 7233e93

10 files changed

Lines changed: 11 additions & 11 deletions

File tree

cuda_core/cuda/core/_device.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ class Device:
654654
def to_system_device(self) -> 'cuda.core.system.Device':
655655
"""
656656
Get the corresponding :class:`cuda.core.system.Device` (which is used
657-
for NVIDIA Machine Library (NVML) access) for this
657+
for NVIDIA Management Library (NVML) access) for this
658658
:class:`cuda.core.Device` (which is used for CUDA access).
659659
660660
The devices are mapped to one another by their UUID.

cuda_core/cuda/core/_device.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ class Device:
10161016
def to_system_device(self) -> 'cuda.core.system.Device':
10171017
"""
10181018
Get the corresponding :class:`cuda.core.system.Device` (which is used
1019-
for NVIDIA Machine Library (NVML) access) for this
1019+
for NVIDIA Management Library (NVML) access) for this
10201020
:class:`cuda.core.Device` (which is used for CUDA access).
10211021

10221022
The devices are mapped to one another by their UUID.
@@ -1030,7 +1030,7 @@ class Device:
10301030

10311031
if not CUDA_BINDINGS_NVML_IS_COMPATIBLE:
10321032
raise RuntimeError(
1033-
"cuda.core.system.Device requires cuda_bindings 13.1.2+ or 12.9.6+"
1033+
"cuda.core.system.Device requires cuda-bindings 12.9.6+ for CUDA 12.x, or cuda-bindings 13.2.0+ for CUDA 13.x"
10341034
)
10351035

10361036
from cuda.core.system import Device as SystemDevice

cuda_core/cuda/core/system/_device.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ class Device:
13821382
"""
13831383
Get the corresponding :class:`cuda.core.Device` (which is used for CUDA
13841384
access) for this :class:`cuda.core.system.Device` (which is used for
1385-
NVIDIA machine library (NVML) access).
1385+
NVIDIA Management Library (NVML) access).
13861386
13871387
The devices are mapped to one another by their UUID.
13881388

cuda_core/cuda/core/system/_device.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ cdef class Device:
372372
"""
373373
Get the corresponding :class:`cuda.core.Device` (which is used for CUDA
374374
access) for this :class:`cuda.core.system.Device` (which is used for
375-
NVIDIA machine library (NVML) access).
375+
NVIDIA Management Library (NVML) access).
376376

377377
The devices are mapped to one another by their UUID.
378378

cuda_core/cuda/core/system/_nvml_context.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cpdef void _initialize() except *
3333

3434
cpdef inline initialize():
3535
"""
36-
Initializes Nvidia Management Library (NVML), ensuring it only happens once per process.
36+
Initializes NVIDIA Management Library (NVML), ensuring it only happens once per process.
3737
"""
3838
if _NVML_STATE == _NVMLState.DISABLED_LIBRARY_NOT_FOUND or (
3939
_NVML_STATE == _NVMLState.INITIALIZED and getpid() == _NVML_OWNER_PID

cuda_core/cuda/core/system/_nvml_context.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ _lock = threading.Lock()
99

1010
def _initialize() -> None:
1111
"""
12-
Initializes Nvidia Management Library (NVML), ensuring it only happens once per process.
12+
Initializes NVIDIA Management Library (NVML), ensuring it only happens once per process.
1313
"""
1414

1515
def validate() -> None:

cuda_core/cuda/core/system/_nvml_context.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def _get_nvml_state() -> _NVMLState:
2525

2626
cpdef void _initialize() except *:
2727
"""
28-
Initializes Nvidia Management Library (NVML), ensuring it only happens once per process.
28+
Initializes NVIDIA Management Library (NVML), ensuring it only happens once per process.
2929
"""
3030
global _NVML_STATE, _NVML_OWNER_PID
3131

cuda_core/docs/source/api_nvml.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This is the API reference for Pythonic access to CUDA system information,
1010
through the NVIDIA Management Library (NVML).
1111

1212
.. note::
13-
``cuda.core.system`` support requires ``cuda_bindings`` 12.9.6 or later, or 13.2.0 or later.
13+
``cuda.core.system`` support requires ``cuda-bindings`` 12.9.6 or later for CUDA 12.x, or ``cuda-bindings`` 13.2.0 or later for CUDA 13.x.
1414

1515
Basic functions
1616
---------------

cuda_core/tests/system/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
skip_if_nvml_unsupported = pytest.mark.skipif(
2020
SHOULD_SKIP_NVML_TESTS,
21-
reason="NVML support requires cuda.bindings version 12.9.6+ or 13.1.2+, and hardware that supports NVML",
21+
reason="NVML support requires cuda.bindings version 12.9.6+ for CUDA 12.x or 13.2.0+ for CUDA 13.x, and hardware that supports NVML",
2222
)
2323

2424

cuda_core/tests/test_device.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_to_system_device(deinit_cuda):
2525
if not _system.CUDA_BINDINGS_NVML_IS_COMPATIBLE:
2626
with pytest.raises(RuntimeError):
2727
device.to_system_device()
28-
pytest.skip("NVML support requires cuda.bindings version 12.9.6+ or 13.1.2+")
28+
pytest.skip("NVML support requires cuda.bindings version 12.9.6+ for CUDA 12.x or 13.2.0+ for CUDA 13.x")
2929

3030
from cuda.bindings._test_helpers.arch_check import hardware_supports_nvml
3131

0 commit comments

Comments
 (0)