Skip to content

Commit f664c86

Browse files
mdboommdboom
committed
Fix compilation again
1 parent 2d7c8dd commit f664c86

5 files changed

Lines changed: 27 additions & 26 deletions

File tree

‎cuda_bindings/cuda/bindings/_internal/nvrtc.pxd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ cdef nvrtcResult _nvrtcGetPCHHeapSize(size_t* ret) except?<nvrtcResult>_NVRTCRES
3434
cdef nvrtcResult _nvrtcSetPCHHeapSize(size_t size) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
3535
cdef nvrtcResult _nvrtcGetPCHCreateStatus(nvrtcProgram prog) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
3636
cdef nvrtcResult _nvrtcGetPCHHeapSizeRequired(nvrtcProgram prog, size_t* size) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
37-
cdef nvrtcResult _nvrtcSetFlowCallback(nvrtcProgram prog, void * callback[], void* payload) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
37+
cdef nvrtcResult _nvrtcSetFlowCallback(nvrtcProgram prog, void * callback, void* payload) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
3838
cdef nvrtcResult _nvrtcGetTileIRSize(nvrtcProgram prog, size_t* TileIRSizeRet) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
3939
cdef nvrtcResult _nvrtcGetTileIR(nvrtcProgram prog, char* TileIR) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil

‎cuda_bindings/cuda/bindings/_internal/nvrtc_linux.pyx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -629,13 +629,13 @@ cdef nvrtcResult _nvrtcGetPCHHeapSizeRequired(nvrtcProgram prog, size_t* size) e
629629
prog, size)
630630

631631

632-
cdef nvrtcResult _nvrtcSetFlowCallback(nvrtcProgram prog, void * callback[], void* payload) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil:
632+
cdef nvrtcResult _nvrtcSetFlowCallback(nvrtcProgram prog, void * callback, void* payload) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil:
633633
global __nvrtcSetFlowCallback
634634
_check_or_init_nvrtc()
635635
if __nvrtcSetFlowCallback == NULL:
636636
with gil:
637637
raise FunctionNotFoundError("function nvrtcSetFlowCallback is not found")
638-
return (<nvrtcResult (*)(nvrtcProgram, void **, void*) noexcept nogil>__nvrtcSetFlowCallback)(
638+
return (<nvrtcResult (*)(nvrtcProgram, void *, void*) noexcept nogil>__nvrtcSetFlowCallback)(
639639
prog, callback, payload)
640640

641641

‎cuda_bindings/cuda/bindings/_internal/nvrtc_windows.pyx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,13 +539,13 @@ cdef nvrtcResult _nvrtcGetPCHHeapSizeRequired(nvrtcProgram prog, size_t* size) e
539539
prog, size)
540540

541541

542-
cdef nvrtcResult _nvrtcSetFlowCallback(nvrtcProgram prog, void * callback[], void* payload) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil:
542+
cdef nvrtcResult _nvrtcSetFlowCallback(nvrtcProgram prog, void * callback, void* payload) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil:
543543
global __nvrtcSetFlowCallback
544544
_check_or_init_nvrtc()
545545
if __nvrtcSetFlowCallback == NULL:
546546
with gil:
547547
raise FunctionNotFoundError("function nvrtcSetFlowCallback is not found")
548-
return (<nvrtcResult (*)(nvrtcProgram, void **, void*) noexcept nogil>__nvrtcSetFlowCallback)(
548+
return (<nvrtcResult (*)(nvrtcProgram, void *, void*) noexcept nogil>__nvrtcSetFlowCallback)(
549549
prog, callback, payload)
550550

551551

‎cuda_bindings/cuda/bindings/cynvrtc.pxd‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,26 @@ from libc.stdint cimport uint32_t, uint64_t
88

99

1010
# ENUMS
11-
ctypedef enum nvrtcResult "nvrtcResult":
12-
NVRTC_SUCCESS "NVRTC_SUCCESS" = 0
13-
NVRTC_ERROR_OUT_OF_MEMORY "NVRTC_ERROR_OUT_OF_MEMORY" = 1
14-
NVRTC_ERROR_PROGRAM_CREATION_FAILURE "NVRTC_ERROR_PROGRAM_CREATION_FAILURE" = 2
15-
NVRTC_ERROR_INVALID_INPUT "NVRTC_ERROR_INVALID_INPUT" = 3
16-
NVRTC_ERROR_INVALID_PROGRAM "NVRTC_ERROR_INVALID_PROGRAM" = 4
17-
NVRTC_ERROR_INVALID_OPTION "NVRTC_ERROR_INVALID_OPTION" = 5
18-
NVRTC_ERROR_COMPILATION "NVRTC_ERROR_COMPILATION" = 6
19-
NVRTC_ERROR_BUILTIN_OPERATION_FAILURE "NVRTC_ERROR_BUILTIN_OPERATION_FAILURE" = 7
20-
NVRTC_ERROR_NO_NAME_EXPRESSIONS_AFTER_COMPILATION "NVRTC_ERROR_NO_NAME_EXPRESSIONS_AFTER_COMPILATION" = 8
21-
NVRTC_ERROR_NO_LOWERED_NAMES_BEFORE_COMPILATION "NVRTC_ERROR_NO_LOWERED_NAMES_BEFORE_COMPILATION" = 9
22-
NVRTC_ERROR_NAME_EXPRESSION_NOT_VALID "NVRTC_ERROR_NAME_EXPRESSION_NOT_VALID" = 10
23-
NVRTC_ERROR_INTERNAL_ERROR "NVRTC_ERROR_INTERNAL_ERROR" = 11
24-
NVRTC_ERROR_TIME_FILE_WRITE_FAILED "NVRTC_ERROR_TIME_FILE_WRITE_FAILED" = 12
25-
NVRTC_ERROR_NO_PCH_CREATE_ATTEMPTED "NVRTC_ERROR_NO_PCH_CREATE_ATTEMPTED" = 13
26-
NVRTC_ERROR_PCH_CREATE_HEAP_EXHAUSTED "NVRTC_ERROR_PCH_CREATE_HEAP_EXHAUSTED" = 14
27-
NVRTC_ERROR_PCH_CREATE "NVRTC_ERROR_PCH_CREATE" = 15
28-
NVRTC_ERROR_CANCELLED "NVRTC_ERROR_CANCELLED" = 16
29-
NVRTC_ERROR_TIME_TRACE_FILE_WRITE_FAILED "NVRTC_ERROR_TIME_TRACE_FILE_WRITE_FAILED" = 17
11+
cdef extern from 'nvrtc.h':
12+
ctypedef enum nvrtcResult:
13+
NVRTC_SUCCESS
14+
NVRTC_ERROR_OUT_OF_MEMORY
15+
NVRTC_ERROR_PROGRAM_CREATION_FAILURE
16+
NVRTC_ERROR_INVALID_INPUT
17+
NVRTC_ERROR_INVALID_PROGRAM
18+
NVRTC_ERROR_INVALID_OPTION
19+
NVRTC_ERROR_COMPILATION
20+
NVRTC_ERROR_BUILTIN_OPERATION_FAILURE
21+
NVRTC_ERROR_NO_NAME_EXPRESSIONS_AFTER_COMPILATION
22+
NVRTC_ERROR_NO_LOWERED_NAMES_BEFORE_COMPILATION
23+
NVRTC_ERROR_NAME_EXPRESSION_NOT_VALID
24+
NVRTC_ERROR_INTERNAL_ERROR
25+
NVRTC_ERROR_TIME_FILE_WRITE_FAILED
26+
NVRTC_ERROR_NO_PCH_CREATE_ATTEMPTED
27+
NVRTC_ERROR_PCH_CREATE_HEAP_EXHAUSTED
28+
NVRTC_ERROR_PCH_CREATE
29+
NVRTC_ERROR_CANCELLED
30+
NVRTC_ERROR_TIME_TRACE_FILE_WRITE_FAILED
3031
cdef enum: _NVRTCRESULT_INTERNAL_LOADING_ERROR = -42
3132

3233

@@ -62,6 +63,6 @@ cdef nvrtcResult nvrtcGetPCHHeapSize(size_t* ret) except?<nvrtcResult>_NVRTCRESU
6263
cdef nvrtcResult nvrtcSetPCHHeapSize(size_t size) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
6364
cdef nvrtcResult nvrtcGetPCHCreateStatus(nvrtcProgram prog) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
6465
cdef nvrtcResult nvrtcGetPCHHeapSizeRequired(nvrtcProgram prog, size_t* size) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
65-
cdef nvrtcResult nvrtcSetFlowCallback(nvrtcProgram prog, void * callback[], void* payload) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
66+
cdef nvrtcResult nvrtcSetFlowCallback(nvrtcProgram prog, void * callback, void* payload) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
6667
cdef nvrtcResult nvrtcGetTileIRSize(nvrtcProgram prog, size_t* TileIRSizeRet) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil
6768
cdef nvrtcResult nvrtcGetTileIR(nvrtcProgram prog, char* TileIR) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil

‎cuda_bindings/cuda/bindings/cynvrtc.pyx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ cdef nvrtcResult nvrtcGetPCHHeapSizeRequired(nvrtcProgram prog, size_t* size) ex
9898
return _nvrtc._nvrtcGetPCHHeapSizeRequired(prog, size)
9999

100100

101-
cdef nvrtcResult nvrtcSetFlowCallback(nvrtcProgram prog, void * callback[], void* payload) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil:
101+
cdef nvrtcResult nvrtcSetFlowCallback(nvrtcProgram prog, void * callback, void* payload) except?<nvrtcResult>_NVRTCRESULT_INTERNAL_LOADING_ERROR nogil:
102102
return _nvrtc._nvrtcSetFlowCallback(prog, callback, payload)
103103

104104

0 commit comments

Comments
 (0)