Skip to content

Commit 5fed951

Browse files
leofangleofang
committed
fix multiple issues at once
1 parent 01990c0 commit 5fed951

File tree

6 files changed

+389
-45
lines changed

6 files changed

+389
-45
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ cdef CUfileError_t _cuFileBufDeregister(const void* bufPtr_base) except?<CUfileE
1818
cdef ssize_t _cuFileRead(CUfileHandle_t fh, void* bufPtr_base, size_t size, off_t file_offset, off_t bufPtr_offset) except* nogil
1919
cdef ssize_t _cuFileWrite(CUfileHandle_t fh, const void* bufPtr_base, size_t size, off_t file_offset, off_t bufPtr_offset) except* nogil
2020
cdef CUfileError_t _cuFileDriverOpen() except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
21+
cdef CUfileError_t _cuFileDriverClose_v2() except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
2122
cdef long _cuFileUseCount() except* nogil
2223
cdef CUfileError_t _cuFileDriverGetProperties(CUfileDrvProps_t* props) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
23-
cdef CUfileError_t _cuFileDriverSetPollMode(bool poll, size_t poll_threshold_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
24+
cdef CUfileError_t _cuFileDriverSetPollMode(cpp_bool poll, size_t poll_threshold_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
2425
cdef CUfileError_t _cuFileDriverSetMaxDirectIOSize(size_t max_direct_io_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
2526
cdef CUfileError_t _cuFileDriverSetMaxCacheSize(size_t max_cache_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
2627
cdef CUfileError_t _cuFileDriverSetMaxPinnedMemSize(size_t max_pinned_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
@@ -35,8 +36,8 @@ cdef CUfileError_t _cuFileStreamRegister(CUstream stream, unsigned flags) except
3536
cdef CUfileError_t _cuFileStreamDeregister(CUstream stream) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
3637
cdef CUfileError_t _cuFileGetVersion(int* version) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
3738
cdef CUfileError_t _cuFileGetParameterSizeT(CUFileSizeTConfigParameter_t param, size_t* value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
38-
cdef CUfileError_t _cuFileGetParameterBool(CUFileBoolConfigParameter_t param, bool* value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
39+
cdef CUfileError_t _cuFileGetParameterBool(CUFileBoolConfigParameter_t param, cpp_bool* value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
3940
cdef CUfileError_t _cuFileGetParameterString(CUFileStringConfigParameter_t param, char* desc_str, int len) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4041
cdef CUfileError_t _cuFileSetParameterSizeT(CUFileSizeTConfigParameter_t param, size_t value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
41-
cdef CUfileError_t _cuFileSetParameterBool(CUFileBoolConfigParameter_t param, bool value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
42+
cdef CUfileError_t _cuFileSetParameterBool(CUFileBoolConfigParameter_t param, cpp_bool value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4243
cdef CUfileError_t _cuFileSetParameterString(CUFileStringConfigParameter_t param, const char* desc_str) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil

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

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ cdef void* __cuFileBufDeregister = NULL
4545
cdef void* __cuFileRead = NULL
4646
cdef void* __cuFileWrite = NULL
4747
cdef void* __cuFileDriverOpen = NULL
48+
cdef void* __cuFileDriverClose_v2 = NULL
4849
cdef void* __cuFileUseCount = NULL
4950
cdef void* __cuFileDriverGetProperties = NULL
5051
cdef void* __cuFileDriverSetPollMode = NULL
@@ -150,6 +151,13 @@ cdef int _check_or_init_cufile() except -1 nogil:
150151
handle = load_library(driver_ver)
151152
__cuFileDriverOpen = dlsym(handle, 'cuFileDriverOpen')
152153

154+
global __cuFileDriverClose_v2
155+
__cuFileDriverClose_v2 = dlsym(RTLD_DEFAULT, 'cuFileDriverClose_v2')
156+
if __cuFileDriverClose_v2 == NULL:
157+
if handle == NULL:
158+
handle = load_library(driver_ver)
159+
__cuFileDriverClose_v2 = dlsym(handle, 'cuFileDriverClose_v2')
160+
153161
global __cuFileUseCount
154162
__cuFileUseCount = dlsym(RTLD_DEFAULT, 'cuFileUseCount')
155163
if __cuFileUseCount == NULL:
@@ -340,6 +348,9 @@ cpdef dict _inspect_function_pointers():
340348
global __cuFileDriverOpen
341349
data["__cuFileDriverOpen"] = <intptr_t>__cuFileDriverOpen
342350

351+
global __cuFileDriverClose_v2
352+
data["__cuFileDriverClose_v2"] = <intptr_t>__cuFileDriverClose_v2
353+
343354
global __cuFileUseCount
344355
data["__cuFileUseCount"] = <intptr_t>__cuFileUseCount
345356

@@ -492,6 +503,16 @@ cdef CUfileError_t _cuFileDriverOpen() except?<CUfileError_t>CUFILE_LOADING_ERRO
492503
)
493504

494505

506+
cdef CUfileError_t _cuFileDriverClose_v2() except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
507+
global __cuFileDriverClose_v2
508+
_check_or_init_cufile()
509+
if __cuFileDriverClose_v2 == NULL:
510+
with gil:
511+
raise FunctionNotFoundError("function cuFileDriverClose_v2 is not found")
512+
return (<CUfileError_t (*)() noexcept nogil>__cuFileDriverClose_v2)(
513+
)
514+
515+
495516
cdef long _cuFileUseCount() except* nogil:
496517
global __cuFileUseCount
497518
_check_or_init_cufile()
@@ -512,13 +533,13 @@ cdef CUfileError_t _cuFileDriverGetProperties(CUfileDrvProps_t* props) except?<C
512533
props)
513534

514535

515-
cdef CUfileError_t _cuFileDriverSetPollMode(bool poll, size_t poll_threshold_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
536+
cdef CUfileError_t _cuFileDriverSetPollMode(cpp_bool poll, size_t poll_threshold_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
516537
global __cuFileDriverSetPollMode
517538
_check_or_init_cufile()
518539
if __cuFileDriverSetPollMode == NULL:
519540
with gil:
520541
raise FunctionNotFoundError("function cuFileDriverSetPollMode is not found")
521-
return (<CUfileError_t (*)(bool, size_t) noexcept nogil>__cuFileDriverSetPollMode)(
542+
return (<CUfileError_t (*)(cpp_bool, size_t) noexcept nogil>__cuFileDriverSetPollMode)(
522543
poll, poll_threshold_size)
523544

524545

@@ -663,13 +684,13 @@ cdef CUfileError_t _cuFileGetParameterSizeT(CUFileSizeTConfigParameter_t param,
663684
param, value)
664685

665686

666-
cdef CUfileError_t _cuFileGetParameterBool(CUFileBoolConfigParameter_t param, bool* value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
687+
cdef CUfileError_t _cuFileGetParameterBool(CUFileBoolConfigParameter_t param, cpp_bool* value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
667688
global __cuFileGetParameterBool
668689
_check_or_init_cufile()
669690
if __cuFileGetParameterBool == NULL:
670691
with gil:
671692
raise FunctionNotFoundError("function cuFileGetParameterBool is not found")
672-
return (<CUfileError_t (*)(CUFileBoolConfigParameter_t, bool*) noexcept nogil>__cuFileGetParameterBool)(
693+
return (<CUfileError_t (*)(CUFileBoolConfigParameter_t, cpp_bool*) noexcept nogil>__cuFileGetParameterBool)(
673694
param, value)
674695

675696

@@ -693,13 +714,13 @@ cdef CUfileError_t _cuFileSetParameterSizeT(CUFileSizeTConfigParameter_t param,
693714
param, value)
694715

695716

696-
cdef CUfileError_t _cuFileSetParameterBool(CUFileBoolConfigParameter_t param, bool value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
717+
cdef CUfileError_t _cuFileSetParameterBool(CUFileBoolConfigParameter_t param, cpp_bool value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
697718
global __cuFileSetParameterBool
698719
_check_or_init_cufile()
699720
if __cuFileSetParameterBool == NULL:
700721
with gil:
701722
raise FunctionNotFoundError("function cuFileSetParameterBool is not found")
702-
return (<CUfileError_t (*)(CUFileBoolConfigParameter_t, bool) noexcept nogil>__cuFileSetParameterBool)(
723+
return (<CUfileError_t (*)(CUFileBoolConfigParameter_t, cpp_bool) noexcept nogil>__cuFileSetParameterBool)(
703724
param, value)
704725

705726

‎cuda_bindings/cuda/bindings/cufile.pxd

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ ctypedef cufileRDMAInfo_t RDMAInfo
2020
ctypedef CUfileFSOps_t FSOps
2121
ctypedef CUfileIOEvents_t IOEvents
2222
ctypedef CUfileDrvProps_t DrvProps
23-
ctypedef CUfileDescr_t Descr
2423
ctypedef CUfileIOParams_t IOParams
2524

2625

@@ -45,7 +44,7 @@ ctypedef CUFileStringConfigParameter_t _StringConfigParameter
4544
# Functions
4645
###############################################################################
4746

48-
cpdef handle_register(intptr_t fh, intptr_t descr)
47+
cpdef intptr_t handle_register(intptr_t descr) except? 0
4948
cpdef void handle_deregister(intptr_t fh) except*
5049
cpdef buf_register(intptr_t buf_ptr_base, size_t length, int flags)
5150
cpdef buf_deregister(intptr_t buf_ptr_base)
@@ -54,11 +53,11 @@ cpdef write(intptr_t fh, intptr_t buf_ptr_base, size_t size, off_t file_offset,
5453
cpdef driver_open()
5554
cpdef use_count()
5655
cpdef driver_get_properties(intptr_t props)
57-
cpdef driver_set_poll_mode(bool poll, size_t poll_threshold_size)
56+
cpdef driver_set_poll_mode(bint poll, size_t poll_threshold_size)
5857
cpdef driver_set_max_direct_io_size(size_t max_direct_io_size)
5958
cpdef driver_set_max_cache_size(size_t max_cache_size)
6059
cpdef driver_set_max_pinned_mem_size(size_t max_pinned_size)
61-
cpdef batch_io_set_up(intptr_t batch_idp, unsigned nr)
60+
cpdef intptr_t batch_io_set_up(unsigned nr) except? 0
6261
cpdef batch_io_submit(intptr_t batch_idp, unsigned nr, intptr_t iocbp, unsigned int flags)
6362
cpdef batch_io_get_status(intptr_t batch_idp, unsigned min_nr, intptr_t nr, intptr_t iocbp, intptr_t timeout)
6463
cpdef batch_io_cancel(intptr_t batch_idp)
@@ -67,10 +66,10 @@ cpdef read_async(intptr_t fh, intptr_t buf_ptr_base, intptr_t size_p, intptr_t f
6766
cpdef write_async(intptr_t fh, intptr_t buf_ptr_base, intptr_t size_p, intptr_t file_offset_p, intptr_t buf_ptr_offset_p, intptr_t bytes_written_p, intptr_t stream)
6867
cpdef stream_register(intptr_t stream, unsigned flags)
6968
cpdef stream_deregister(intptr_t stream)
70-
cpdef get_version(intptr_t version)
69+
cpdef int get_version() except? 0
7170
cpdef get_parameter_size_t(int param, intptr_t value)
7271
cpdef get_parameter_bool(int param, intptr_t value)
7372
cpdef get_parameter_string(int param, intptr_t desc_str, int len)
7473
cpdef set_parameter_size_t(int param, size_t value)
75-
cpdef set_parameter_bool(int param, bool value)
74+
cpdef set_parameter_bool(int param, bint value)
7675
cpdef set_parameter_string(int param, intptr_t desc_str)

0 commit comments

Comments
 (0)