Skip to content

Backport recent generator changes to the 13.4.x branch to fix nvbug6771788 #3152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mdboom wants to merge 1 commit into from
+8,601 −6,313
Closed

Backport recent generator changes to the 13.4.x branch to fix nvbug6771788 #3152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions cuda_bindings/cuda/bindings/_internal/_fast_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0


# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=581469c1fadb5f72c43b478d73f2b905562136c8723a25e2f4240b5b681e2894
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=35d522fae601127f3ffc9d0de45d9adf2572934ee3308f5d99567aa8efd5ae77
"""
This is a replacement for the stdlib enum.IntEnum.

Expand Down Expand Up @@ -33,10 +33,14 @@ def __init__(cls, name, bases, namespace):
else:
continue

singleton = int.__new__(cls, value)
singleton.__doc__ = doc
singleton._name = name
cls.__singletons__[value] = singleton
# A name sharing a value with an already-processed member is an
# alias (e.g. a deprecated name kept for backward compatibility):
# it resolves to the same singleton, but isn't a distinct member.
if (singleton := cls.__singletons__.get(value)) is None:
singleton = int.__new__(cls, value)
singleton.__doc__ = doc
singleton._name = name
cls.__singletons__[value] = singleton
cls.__members__[name] = singleton

for name, member in cls.__members__.items():
Expand All @@ -46,10 +50,10 @@ def __repr__(cls) -> str:
return f"<enum '{cls.__name__}'>"

def __len__(cls) -> int:
return len(cls.__members__)
return len(cls.__singletons__)

def __iter__(cls) -> Iterator["FastEnum"]:
return iter(cls.__members__.values())
return iter(cls.__singletons__.values())

def __contains__(cls, item: Any) -> bool:
return item in cls.__singletons__
Expand Down
12 changes: 6 additions & 6 deletions cuda_bindings/cuda/bindings/_internal/driver_linux.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
# This code was automatically generated across versions from 12.9.0 to 13.4.1. Do not modify it directly.
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=f23c5b6833163c19813f5a513216d2a4192b545a5ae8a47ffe7c95ebbc9bdbaf
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=c6a477ceb1a35675c0ffe5e40f9826ea3e3bd9cbec23720f78fe4cf28feafbe0


# <<<< PREAMBLE CONTENT >>>>
Expand Down Expand Up @@ -1896,19 +1896,19 @@ cdef int _init_driver() except -1 nogil:
cuGetProcAddress_v2('cuGreenCtxStreamCreate', <void **>&__cuGreenCtxStreamCreate, 12050, ptds_mode, NULL)

global __cuLogsRegisterCallback
cuGetProcAddress_v2('cuLogsRegisterCallback', <void **>&__cuLogsRegisterCallback, 12080, ptds_mode, NULL)
cuGetProcAddress_v2('cuLogsRegisterCallback', <void **>&__cuLogsRegisterCallback, 12090, ptds_mode, NULL)

global __cuLogsUnregisterCallback
cuGetProcAddress_v2('cuLogsUnregisterCallback', <void **>&__cuLogsUnregisterCallback, 12080, ptds_mode, NULL)
cuGetProcAddress_v2('cuLogsUnregisterCallback', <void **>&__cuLogsUnregisterCallback, 12090, ptds_mode, NULL)

global __cuLogsCurrent
cuGetProcAddress_v2('cuLogsCurrent', <void **>&__cuLogsCurrent, 12080, ptds_mode, NULL)
cuGetProcAddress_v2('cuLogsCurrent', <void **>&__cuLogsCurrent, 12090, ptds_mode, NULL)

global __cuLogsDumpToFile
cuGetProcAddress_v2('cuLogsDumpToFile', <void **>&__cuLogsDumpToFile, 12080, ptds_mode, NULL)
cuGetProcAddress_v2('cuLogsDumpToFile', <void **>&__cuLogsDumpToFile, 12090, ptds_mode, NULL)

global __cuLogsDumpToMemory
cuGetProcAddress_v2('cuLogsDumpToMemory', <void **>&__cuLogsDumpToMemory, 12080, ptds_mode, NULL)
cuGetProcAddress_v2('cuLogsDumpToMemory', <void **>&__cuLogsDumpToMemory, 12090, ptds_mode, NULL)

global __cuCheckpointProcessGetRestoreThreadId
cuGetProcAddress_v2('cuCheckpointProcessGetRestoreThreadId', <void **>&__cuCheckpointProcessGetRestoreThreadId, 12080, ptds_mode, NULL)
Expand Down
12 changes: 6 additions & 6 deletions cuda_bindings/cuda/bindings/_internal/driver_windows.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
#
# This code was automatically generated across versions from 12.9.0 to 13.4.1. Do not modify it directly.
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=f49a90c93b3876714d90f8948fabc654d408ba6c8bc3a122503b1d1ef663f434
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=a04dbfec5a461010c493b3aca0b092910ff3eb49d31942a68c957309892b2aa6


# <<<< PREAMBLE CONTENT >>>>
Expand Down Expand Up @@ -1899,19 +1899,19 @@ cdef int _init_driver() except -1 nogil:
cuGetProcAddress_v2('cuGreenCtxStreamCreate', <void **>&__cuGreenCtxStreamCreate, 12050, ptds_mode, NULL)

global __cuLogsRegisterCallback
cuGetProcAddress_v2('cuLogsRegisterCallback', <void **>&__cuLogsRegisterCallback, 12080, ptds_mode, NULL)
cuGetProcAddress_v2('cuLogsRegisterCallback', <void **>&__cuLogsRegisterCallback, 12090, ptds_mode, NULL)

global __cuLogsUnregisterCallback
cuGetProcAddress_v2('cuLogsUnregisterCallback', <void **>&__cuLogsUnregisterCallback, 12080, ptds_mode, NULL)
cuGetProcAddress_v2('cuLogsUnregisterCallback', <void **>&__cuLogsUnregisterCallback, 12090, ptds_mode, NULL)

global __cuLogsCurrent
cuGetProcAddress_v2('cuLogsCurrent', <void **>&__cuLogsCurrent, 12080, ptds_mode, NULL)
cuGetProcAddress_v2('cuLogsCurrent', <void **>&__cuLogsCurrent, 12090, ptds_mode, NULL)

global __cuLogsDumpToFile
cuGetProcAddress_v2('cuLogsDumpToFile', <void **>&__cuLogsDumpToFile, 12080, ptds_mode, NULL)
cuGetProcAddress_v2('cuLogsDumpToFile', <void **>&__cuLogsDumpToFile, 12090, ptds_mode, NULL)

global __cuLogsDumpToMemory
cuGetProcAddress_v2('cuLogsDumpToMemory', <void **>&__cuLogsDumpToMemory, 12080, ptds_mode, NULL)
cuGetProcAddress_v2('cuLogsDumpToMemory', <void **>&__cuLogsDumpToMemory, 12090, ptds_mode, NULL)

global __cuCheckpointProcessGetRestoreThreadId
cuGetProcAddress_v2('cuCheckpointProcessGetRestoreThreadId', <void **>&__cuCheckpointProcessGetRestoreThreadId, 12080, ptds_mode, NULL)
Expand Down
4 changes: 1 addition & 3 deletions cuda_bindings/cuda/bindings/_lib/utils.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ from cpython.buffer cimport PyBuffer_Release, Py_buffer
cdef class _HelperKernelParams:
cdef Py_buffer _pybuffer
cdef bint _pyobj_acquired
cdef void** _ckernelParams
cdef void** ckernelParams
cdef char* _ckernelParamsData
cdef int _length
cdef bint _malloc_list_created

cdef struct _HelperInputVoidPtrStruct:
Py_buffer _pybuffer
Expand Down
Loading
Loading