Merge branch '12.9.x' into generator-changes-12.9

Author: mdboom

.gitignore

@@ -25,8 +25,6 @@ cuda_bindings/cuda/bindings/_bindings/cyruntime.pxd
 cuda_bindings/cuda/bindings/_bindings/cyruntime.pyx
 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/nvjitlink.pyx
 cuda_bindings/cuda/bindings/_internal/nvvm.pyx
 cuda_bindings/cuda/bindings/_lib/utils.pxd
@@ -37,14 +35,10 @@ cuda_bindings/cuda/bindings/cyruntime.pxd
 cuda_bindings/cuda/bindings/cyruntime.pyx
 cuda_bindings/cuda/bindings/cyruntime_functions.pxi
 cuda_bindings/cuda/bindings/cyruntime_types.pxi
-cuda_bindings/cuda/bindings/cynvrtc.pxd
-cuda_bindings/cuda/bindings/cynvrtc.pyx
 cuda_bindings/cuda/bindings/driver.pxd
 cuda_bindings/cuda/bindings/driver.pyx
 cuda_bindings/cuda/bindings/runtime.pxd
 cuda_bindings/cuda/bindings/runtime.pyx
-cuda_bindings/cuda/bindings/nvrtc.pxd
-cuda_bindings/cuda/bindings/nvrtc.pyx
 cuda_bindings/cuda/bindings/utils/_get_handle.pyx
 
 # Version files from setuptools_scm

cuda_bindings/build_hooks.py

@@ -63,9 +63,7 @@ def _get_cuda_paths() -> list[str]:
         "driver_functions.h",
         "cuda_profiler_api.h",
     ],
-    "nvrtc": [
-        "nvrtc.h",
-    ],
+    # nvrtc: headers no longer parsed at build time (pre-generated by cybind).
     # During compilation, Cython will reference C headers that are not
     # explicitly parsed above. These are the known dependencies:
     #
@@ -390,7 +388,8 @@ def _cleanup_dst_files():
     sources_list = [
         # private
         (["cuda/bindings/_bindings/cydriver.pyx", "cuda/bindings/_bindings/loader.cpp"], None),
-        (["cuda/bindings/_bindings/cynvrtc.pyx"], None),
+        # cynvrtc.pyx is now in cuda/bindings/ (pre-generated by cybind),
+        # picked up by the cuda_bindings_files glob below.
         (["cuda/bindings/_bindings/cyruntime.pyx"], static_runtime_libraries),
         (["cuda/bindings/_bindings/cyruntime_ptds.pyx"], static_runtime_libraries),
         # utils

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

@@ -1,136 +1,59 @@
 # SPDX-FileCopyrightText: Copyright (c) 2021-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
+#
+# This code was automatically generated with version 12.9.0, generator version 0.3.1.dev1603+gcfe73f973. Do not modify it directly.
 
-# This code was automatically generated with version 12.9.0, generator version 49a8141. Do not modify it directly.
-from cuda.bindings.cynvrtc cimport *
+from ..cynvrtc cimport *
 
-{{if 'nvrtcGetErrorString' in found_functions}}
+###############################################################################
+# Wrapper functions
+###############################################################################
 
 cdef const char* _nvrtcGetErrorString(nvrtcResult result) except ?NULL nogil
-{{endif}}
-
-{{if 'nvrtcVersion' in found_functions}}
 
 cdef nvrtcResult _nvrtcVersion(int* major, int* minor) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetNumSupportedArchs' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetNumSupportedArchs(int* numArchs) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetSupportedArchs' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetSupportedArchs(int* supportedArchs) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcCreateProgram' in found_functions}}
 
 cdef nvrtcResult _nvrtcCreateProgram(nvrtcProgram* prog, const char* src, const char* name, int numHeaders, const char** headers, const char** includeNames) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcDestroyProgram' in found_functions}}
 
 cdef nvrtcResult _nvrtcDestroyProgram(nvrtcProgram* prog) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcCompileProgram' in found_functions}}
 
 cdef nvrtcResult _nvrtcCompileProgram(nvrtcProgram prog, int numOptions, const char** options) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetPTXSize' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetPTXSize(nvrtcProgram prog, size_t* ptxSizeRet) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetPTX' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetPTX(nvrtcProgram prog, char* ptx) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetCUBINSize' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetCUBINSize(nvrtcProgram prog, size_t* cubinSizeRet) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetCUBIN' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetCUBIN(nvrtcProgram prog, char* cubin) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetNVVMSize' in found_functions}}
-
-cdef nvrtcResult _nvrtcGetNVVMSize(nvrtcProgram prog, size_t* nvvmSizeRet) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetNVVM' in found_functions}}
-
-cdef nvrtcResult _nvrtcGetNVVM(nvrtcProgram prog, char* nvvm) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetLTOIRSize' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetLTOIRSize(nvrtcProgram prog, size_t* LTOIRSizeRet) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetLTOIR' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetLTOIR(nvrtcProgram prog, char* LTOIR) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetOptiXIRSize' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetOptiXIRSize(nvrtcProgram prog, size_t* optixirSizeRet) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetOptiXIR' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetOptiXIR(nvrtcProgram prog, char* optixir) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetProgramLogSize' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetProgramLogSize(nvrtcProgram prog, size_t* logSizeRet) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetProgramLog' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetProgramLog(nvrtcProgram prog, char* log) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcAddNameExpression' in found_functions}}
 
 cdef nvrtcResult _nvrtcAddNameExpression(nvrtcProgram prog, const char* name_expression) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetLoweredName' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetLoweredName(nvrtcProgram prog, const char* name_expression, const char** lowered_name) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetPCHHeapSize' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetPCHHeapSize(size_t* ret) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcSetPCHHeapSize' in found_functions}}
 
 cdef nvrtcResult _nvrtcSetPCHHeapSize(size_t size) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetPCHCreateStatus' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetPCHCreateStatus(nvrtcProgram prog) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcGetPCHHeapSizeRequired' in found_functions}}
 
 cdef nvrtcResult _nvrtcGetPCHHeapSizeRequired(nvrtcProgram prog, size_t* size) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-
-{{if 'nvrtcSetFlowCallback' in found_functions}}
 
 cdef nvrtcResult _nvrtcSetFlowCallback(nvrtcProgram prog, void* callback, void* payload) except ?NVRTC_ERROR_INVALID_INPUT nogil
-{{endif}}
-