Merge branch 'main' into nvvm

Author: leofang

.gitignore

@@ -27,6 +27,7 @@ cuda_bindings/cuda/bindings/_bindings/cyruntime_ptds.pxd
 cuda_bindings/cuda/bindings/_bindings/cyruntime_ptds.pyx
 cuda_bindings/cuda/bindings/_bindings/cynvrtc.pxd
 cuda_bindings/cuda/bindings/_bindings/cynvrtc.pyx
+cuda_bindings/cuda/bindings/_internal/cufile.pyx
 cuda_bindings/cuda/bindings/_internal/nvjitlink.pyx
 cuda_bindings/cuda/bindings/_internal/nvvm.pyx
 cuda_bindings/cuda/bindings/_lib/utils.pxd

conftest.py

@@ -0,0 +1,45 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+import os
+import pytest
+
+
+def pytest_collection_modifyitems(config, items):
+    cuda_home = os.environ.get("CUDA_HOME")
+    for item in items:
+        nodeid = item.nodeid.replace("\\", "/")
+
+        # Package markers by path
+        if (
+            nodeid.startswith("cuda_pathfinder/tests/")
+            or "/cuda_pathfinder/tests/" in nodeid
+        ):
+            item.add_marker(pytest.mark.pathfinder)
+        if (
+            nodeid.startswith("cuda_bindings/tests/")
+            or "/cuda_bindings/tests/" in nodeid
+        ):
+            item.add_marker(pytest.mark.bindings)
+        if nodeid.startswith("cuda_core/tests/") or "/cuda_core/tests/" in nodeid:
+            item.add_marker(pytest.mark.core)
+
+        # Smoke tests
+        if nodeid.startswith("tests/integration/") or "/tests/integration/" in nodeid:
+            item.add_marker(pytest.mark.smoke)
+
+        # Cython tests (any tests/cython subtree)
+        if (
+            "/tests/cython/" in nodeid
+            or nodeid.endswith("/tests/cython")
+            or ("/cython/" in nodeid and "/tests/" in nodeid)
+        ):
+            item.add_marker(pytest.mark.cython)
+
+            # Gate core cython tests on CUDA_HOME
+            if "core" in item.keywords and not cuda_home:
+                item.add_marker(
+                    pytest.mark.skip(
+                        reason="CUDA_HOME not set; skipping core cython tests"
+                    )
+                )

cuda_bindings/cuda/bindings/_bindings/cydriver.pxd.in

@@ -2239,6 +2239,11 @@ cdef CUresult _cuCheckpointProcessLock(int pid, CUcheckpointLockArgs* args) exce
 cdef CUresult _cuCheckpointProcessCheckpoint(int pid, CUcheckpointCheckpointArgs* args) except ?CUDA_ERROR_NOT_FOUND nogil
 {{endif}}
 
+{{if 'cuCheckpointProcessRestore' in found_functions}}
+
+cdef CUresult _cuCheckpointProcessRestore(int pid, CUcheckpointRestoreArgs* args) except ?CUDA_ERROR_NOT_FOUND nogil
+{{endif}}
+
 {{if 'cuCheckpointProcessUnlock' in found_functions}}
 
 cdef CUresult _cuCheckpointProcessUnlock(int pid, CUcheckpointUnlockArgs* args) except ?CUDA_ERROR_NOT_FOUND nogil

cuda_bindings/cuda/bindings/_bindings/cydriver.pyx.in

@@ -463,6 +463,7 @@ cdef bint __cuPythonInit = False
 {{if 'cuCheckpointProcessGetState' in found_functions}}cdef void *__cuCheckpointProcessGetState = NULL{{endif}}
 {{if 'cuCheckpointProcessLock' in found_functions}}cdef void *__cuCheckpointProcessLock = NULL{{endif}}
 {{if 'cuCheckpointProcessCheckpoint' in found_functions}}cdef void *__cuCheckpointProcessCheckpoint = NULL{{endif}}
+{{if 'cuCheckpointProcessRestore' in found_functions}}cdef void *__cuCheckpointProcessRestore = NULL{{endif}}
 {{if 'cuCheckpointProcessUnlock' in found_functions}}cdef void *__cuCheckpointProcessUnlock = NULL{{endif}}
 {{if 'cuProfilerStart' in found_functions}}cdef void *__cuProfilerStart = NULL{{endif}}
 {{if 'cuProfilerStop' in found_functions}}cdef void *__cuProfilerStop = NULL{{endif}}
@@ -2667,6 +2668,10 @@ cdef int _cuPythonInit() except -1 nogil:
             global __cuCheckpointProcessCheckpoint
             _F_cuGetProcAddress_v2('cuCheckpointProcessCheckpoint', &__cuCheckpointProcessCheckpoint, 12080, CU_GET_PROC_ADDRESS_DEFAULT, NULL)
             {{endif}}
+            {{if 'cuCheckpointProcessRestore' in found_functions}}
+            global __cuCheckpointProcessRestore
+            _F_cuGetProcAddress_v2('cuCheckpointProcessRestore', &__cuCheckpointProcessRestore, 12080, CU_GET_PROC_ADDRESS_DEFAULT, NULL)
+            {{endif}}
             {{if 'cuCheckpointProcessUnlock' in found_functions}}
             global __cuCheckpointProcessUnlock
             _F_cuGetProcAddress_v2('cuCheckpointProcessUnlock', &__cuCheckpointProcessUnlock, 12080, CU_GET_PROC_ADDRESS_DEFAULT, NULL)
@@ -4895,6 +4900,10 @@ cdef int _cuPythonInit() except -1 nogil:
         global __cuCheckpointProcessCheckpoint
         __cuCheckpointProcessCheckpoint = windll.GetProcAddress(handle, 'cuCheckpointProcessCheckpoint')
         {{endif}}
+        {{if 'cuCheckpointProcessRestore' in found_functions}}
+        global __cuCheckpointProcessRestore
+        __cuCheckpointProcessRestore = windll.GetProcAddress(handle, 'cuCheckpointProcessRestore')
+        {{endif}}
         {{if 'cuCheckpointProcessUnlock' in found_functions}}
         global __cuCheckpointProcessUnlock
         __cuCheckpointProcessUnlock = windll.GetProcAddress(handle, 'cuCheckpointProcessUnlock')
@@ -7120,6 +7129,10 @@ cdef int _cuPythonInit() except -1 nogil:
         global __cuCheckpointProcessCheckpoint
         __cuCheckpointProcessCheckpoint = dlfcn.dlsym(handle, 'cuCheckpointProcessCheckpoint')
         {{endif}}
+        {{if 'cuCheckpointProcessRestore' in found_functions}}
+        global __cuCheckpointProcessRestore
+        __cuCheckpointProcessRestore = dlfcn.dlsym(handle, 'cuCheckpointProcessRestore')
+        {{endif}}
         {{if 'cuCheckpointProcessUnlock' in found_functions}}
         global __cuCheckpointProcessUnlock
         __cuCheckpointProcessUnlock = dlfcn.dlsym(handle, 'cuCheckpointProcessUnlock')
@@ -12583,6 +12596,18 @@ cdef CUresult _cuCheckpointProcessCheckpoint(int pid, CUcheckpointCheckpointArgs
     return err
 {{endif}}
 
+{{if 'cuCheckpointProcessRestore' in found_functions}}
+
+cdef CUresult _cuCheckpointProcessRestore(int pid, CUcheckpointRestoreArgs* args) except ?CUDA_ERROR_NOT_FOUND nogil:
+    global __cuCheckpointProcessRestore
+    cuPythonInit()
+    if __cuCheckpointProcessRestore == NULL:
+        with gil:
+            raise RuntimeError('Function "cuCheckpointProcessRestore" not found')
+    err = (<CUresult (*)(int, CUcheckpointRestoreArgs*) except ?CUDA_ERROR_NOT_FOUND nogil> __cuCheckpointProcessRestore)(pid, args)
+    return err
+{{endif}}
+
 {{if 'cuCheckpointProcessUnlock' in found_functions}}
 
 cdef CUresult _cuCheckpointProcessUnlock(int pid, CUcheckpointUnlockArgs* args) except ?CUDA_ERROR_NOT_FOUND nogil:
@@ -15986,6 +16011,13 @@ cpdef dict _inspect_function_pointers():
     data["__cuCheckpointProcessCheckpoint"] = <intptr_t>0
     {{endif}}
 
+    {{if 'cuCheckpointProcessRestore' in found_functions}}
+    global __cuCheckpointProcessRestore
+    data["__cuCheckpointProcessRestore"] = <intptr_t>__cuCheckpointProcessRestore
+    {{else}}
+    data["__cuCheckpointProcessRestore"] = <intptr_t>0
+    {{endif}}
+
     {{if 'cuCheckpointProcessUnlock' in found_functions}}
     global __cuCheckpointProcessUnlock
     data["__cuCheckpointProcessUnlock"] = <intptr_t>__cuCheckpointProcessUnlock