Skip to content

Commit 9ec417f

Browse files
juenglinRalf Juengling
juenglin
and
Ralf Juengling
authored
cuda.bindings: Fix API status handling (#2530)
* cuda.bindings tests: enable BAR lookup test on GH200 * cuda_bindings fixes --------- Co-authored-by: Ralf Juengling <rjuengling@utskinnyjoe-dvt-65.ipp2u1.colossus.nvidia.com>
1 parent 459e0e9 commit 9ec417f

7 files changed

Lines changed: 114 additions & 74 deletions

File tree

‎.github/workflows/test-wheel-linux.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,9 +346,6 @@ jobs:
346346
env:
347347
CUDA_VER: ${{ matrix.CUDA_VER }}
348348
LOCAL_CTK: ${{ matrix.LOCAL_CTK }}
349-
# #2299: BAR-size query returns CUDA_ERROR_NOT_SUPPORTED on G+H;
350-
# skip the test on gh200 runners until upstream cufile guards it.
351-
PYTEST_ADDOPTS: ${{ matrix.GPU == 'gh200' && '--deselect tests/test_cufile.py::test_get_bar_size_in_kb' || '' }}
352349
run: run-tests bindings
353350

354351
- name: Run cuda.bindings benchmarks (smoke test)

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,16 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55
# This code was automatically generated across versions from 12.9.1 to 13.3.0. Do not modify it directly.
6+
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=1788ebb3c332e99a6dc0dcd98c5af472bf42c1c960ba70cb65f294a81712491d
7+
8+
9+
# <<<< PREAMBLE CONTENT >>>>
10+
11+
from libcpp cimport bool as _cyb_bool
12+
13+
14+
# <<<< END OF PREAMBLE CONTENT >>>>
615

7-
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=b70fdd33eb00b70224c097fb28dd1031d82e8a2930356a4428c93e3bd1b52a86
816
from ..cycufile cimport *
917

1018

@@ -23,7 +31,7 @@ cdef CUfileError_t _cuFileDriverClose() except?<CUfileError_t>CUFILE_LOADING_ERR
2331
cdef CUfileError_t _cuFileDriverClose_v2() except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
2432
cdef long _cuFileUseCount() except* nogil
2533
cdef CUfileError_t _cuFileDriverGetProperties(CUfileDrvProps_t* props) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
26-
cdef CUfileError_t _cuFileDriverSetPollMode(cpp_bool poll, size_t poll_threshold_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
34+
cdef CUfileError_t _cuFileDriverSetPollMode(_cyb_bool poll, size_t poll_threshold_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
2735
cdef CUfileError_t _cuFileDriverSetMaxDirectIOSize(size_t max_direct_io_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
2836
cdef CUfileError_t _cuFileDriverSetMaxCacheSize(size_t max_cache_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
2937
cdef CUfileError_t _cuFileDriverSetMaxPinnedMemSize(size_t max_pinned_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
@@ -38,10 +46,10 @@ cdef CUfileError_t _cuFileStreamRegister(CUstream stream, unsigned flags) except
3846
cdef CUfileError_t _cuFileStreamDeregister(CUstream stream) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
3947
cdef CUfileError_t _cuFileGetVersion(int* version) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4048
cdef CUfileError_t _cuFileGetParameterSizeT(CUFileSizeTConfigParameter_t param, size_t* value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
41-
cdef CUfileError_t _cuFileGetParameterBool(CUFileBoolConfigParameter_t param, cpp_bool* value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
49+
cdef CUfileError_t _cuFileGetParameterBool(CUFileBoolConfigParameter_t param, _cyb_bool* value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4250
cdef CUfileError_t _cuFileGetParameterString(CUFileStringConfigParameter_t param, char* desc_str, int len) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4351
cdef CUfileError_t _cuFileSetParameterSizeT(CUFileSizeTConfigParameter_t param, size_t value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
44-
cdef CUfileError_t _cuFileSetParameterBool(CUFileBoolConfigParameter_t param, cpp_bool value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
52+
cdef CUfileError_t _cuFileSetParameterBool(CUFileBoolConfigParameter_t param, _cyb_bool value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4553
cdef CUfileError_t _cuFileSetParameterString(CUFileStringConfigParameter_t param, const char* desc_str) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4654
cdef CUfileError_t _cuFileGetParameterMinMaxValue(CUFileSizeTConfigParameter_t param, size_t* min_value, size_t* max_value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4755
cdef CUfileError_t _cuFileSetStatsLevel(int level) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil

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

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55
# This code was automatically generated across versions from 12.9.1 to 13.3.0. Do not modify it directly.
6-
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=73d6889e33bb56f1e0e63be7a0ba1f176c5c09e6e1adf9c4360d23335e131260
6+
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=5b6e0791dac3bac268169b02ebc748d7375de7189fe7114151716d47791519ad
77

88

99
# <<<< PREAMBLE CONTENT >>>>
@@ -45,7 +45,8 @@ cdef extern from "<dlfcn.h>":
4545
const void * _cyb_RTLD_DEFAULT "RTLD_DEFAULT"
4646

4747
cimport cython as _cyb_cython
48-
from libc.stdint cimport intptr_t as _cyb_intptr_t
48+
from libc.stdint cimport intptr_t
49+
from libcpp cimport bool as _cyb_bool
4950

5051
import threading as _cyb_threading
5152

@@ -435,133 +436,133 @@ cpdef dict _inspect_function_pointers():
435436
_check_or_init_cufile()
436437
cdef dict data = {}
437438
global __cuFileHandleRegister
438-
data["__cuFileHandleRegister"] = <_cyb_intptr_t>__cuFileHandleRegister
439+
data["__cuFileHandleRegister"] = <intptr_t>__cuFileHandleRegister
439440

440441
global __cuFileHandleDeregister
441-
data["__cuFileHandleDeregister"] = <_cyb_intptr_t>__cuFileHandleDeregister
442+
data["__cuFileHandleDeregister"] = <intptr_t>__cuFileHandleDeregister
442443

443444
global __cuFileBufRegister
444-
data["__cuFileBufRegister"] = <_cyb_intptr_t>__cuFileBufRegister
445+
data["__cuFileBufRegister"] = <intptr_t>__cuFileBufRegister
445446

446447
global __cuFileBufDeregister
447-
data["__cuFileBufDeregister"] = <_cyb_intptr_t>__cuFileBufDeregister
448+
data["__cuFileBufDeregister"] = <intptr_t>__cuFileBufDeregister
448449

449450
global __cuFileRead
450-
data["__cuFileRead"] = <_cyb_intptr_t>__cuFileRead
451+
data["__cuFileRead"] = <intptr_t>__cuFileRead
451452

452453
global __cuFileWrite
453-
data["__cuFileWrite"] = <_cyb_intptr_t>__cuFileWrite
454+
data["__cuFileWrite"] = <intptr_t>__cuFileWrite
454455

455456
global __cuFileDriverOpen
456-
data["__cuFileDriverOpen"] = <_cyb_intptr_t>__cuFileDriverOpen
457+
data["__cuFileDriverOpen"] = <intptr_t>__cuFileDriverOpen
457458

458459
global __cuFileDriverClose
459-
data["__cuFileDriverClose"] = <_cyb_intptr_t>__cuFileDriverClose
460+
data["__cuFileDriverClose"] = <intptr_t>__cuFileDriverClose
460461

461462
global __cuFileDriverClose_v2
462-
data["__cuFileDriverClose_v2"] = <_cyb_intptr_t>__cuFileDriverClose_v2
463+
data["__cuFileDriverClose_v2"] = <intptr_t>__cuFileDriverClose_v2
463464

464465
global __cuFileUseCount
465-
data["__cuFileUseCount"] = <_cyb_intptr_t>__cuFileUseCount
466+
data["__cuFileUseCount"] = <intptr_t>__cuFileUseCount
466467

467468
global __cuFileDriverGetProperties
468-
data["__cuFileDriverGetProperties"] = <_cyb_intptr_t>__cuFileDriverGetProperties
469+
data["__cuFileDriverGetProperties"] = <intptr_t>__cuFileDriverGetProperties
469470

470471
global __cuFileDriverSetPollMode
471-
data["__cuFileDriverSetPollMode"] = <_cyb_intptr_t>__cuFileDriverSetPollMode
472+
data["__cuFileDriverSetPollMode"] = <intptr_t>__cuFileDriverSetPollMode
472473

473474
global __cuFileDriverSetMaxDirectIOSize
474-
data["__cuFileDriverSetMaxDirectIOSize"] = <_cyb_intptr_t>__cuFileDriverSetMaxDirectIOSize
475+
data["__cuFileDriverSetMaxDirectIOSize"] = <intptr_t>__cuFileDriverSetMaxDirectIOSize
475476

476477
global __cuFileDriverSetMaxCacheSize
477-
data["__cuFileDriverSetMaxCacheSize"] = <_cyb_intptr_t>__cuFileDriverSetMaxCacheSize
478+
data["__cuFileDriverSetMaxCacheSize"] = <intptr_t>__cuFileDriverSetMaxCacheSize
478479

479480
global __cuFileDriverSetMaxPinnedMemSize
480-
data["__cuFileDriverSetMaxPinnedMemSize"] = <_cyb_intptr_t>__cuFileDriverSetMaxPinnedMemSize
481+
data["__cuFileDriverSetMaxPinnedMemSize"] = <intptr_t>__cuFileDriverSetMaxPinnedMemSize
481482

482483
global __cuFileBatchIOSetUp
483-
data["__cuFileBatchIOSetUp"] = <_cyb_intptr_t>__cuFileBatchIOSetUp
484+
data["__cuFileBatchIOSetUp"] = <intptr_t>__cuFileBatchIOSetUp
484485

485486
global __cuFileBatchIOSubmit
486-
data["__cuFileBatchIOSubmit"] = <_cyb_intptr_t>__cuFileBatchIOSubmit
487+
data["__cuFileBatchIOSubmit"] = <intptr_t>__cuFileBatchIOSubmit
487488

488489
global __cuFileBatchIOGetStatus
489-
data["__cuFileBatchIOGetStatus"] = <_cyb_intptr_t>__cuFileBatchIOGetStatus
490+
data["__cuFileBatchIOGetStatus"] = <intptr_t>__cuFileBatchIOGetStatus
490491

491492
global __cuFileBatchIOCancel
492-
data["__cuFileBatchIOCancel"] = <_cyb_intptr_t>__cuFileBatchIOCancel
493+
data["__cuFileBatchIOCancel"] = <intptr_t>__cuFileBatchIOCancel
493494

494495
global __cuFileBatchIODestroy
495-
data["__cuFileBatchIODestroy"] = <_cyb_intptr_t>__cuFileBatchIODestroy
496+
data["__cuFileBatchIODestroy"] = <intptr_t>__cuFileBatchIODestroy
496497

497498
global __cuFileReadAsync
498-
data["__cuFileReadAsync"] = <_cyb_intptr_t>__cuFileReadAsync
499+
data["__cuFileReadAsync"] = <intptr_t>__cuFileReadAsync
499500

500501
global __cuFileWriteAsync
501-
data["__cuFileWriteAsync"] = <_cyb_intptr_t>__cuFileWriteAsync
502+
data["__cuFileWriteAsync"] = <intptr_t>__cuFileWriteAsync
502503

503504
global __cuFileStreamRegister
504-
data["__cuFileStreamRegister"] = <_cyb_intptr_t>__cuFileStreamRegister
505+
data["__cuFileStreamRegister"] = <intptr_t>__cuFileStreamRegister
505506

506507
global __cuFileStreamDeregister
507-
data["__cuFileStreamDeregister"] = <_cyb_intptr_t>__cuFileStreamDeregister
508+
data["__cuFileStreamDeregister"] = <intptr_t>__cuFileStreamDeregister
508509

509510
global __cuFileGetVersion
510-
data["__cuFileGetVersion"] = <_cyb_intptr_t>__cuFileGetVersion
511+
data["__cuFileGetVersion"] = <intptr_t>__cuFileGetVersion
511512

512513
global __cuFileGetParameterSizeT
513-
data["__cuFileGetParameterSizeT"] = <_cyb_intptr_t>__cuFileGetParameterSizeT
514+
data["__cuFileGetParameterSizeT"] = <intptr_t>__cuFileGetParameterSizeT
514515

515516
global __cuFileGetParameterBool
516-
data["__cuFileGetParameterBool"] = <_cyb_intptr_t>__cuFileGetParameterBool
517+
data["__cuFileGetParameterBool"] = <intptr_t>__cuFileGetParameterBool
517518

518519
global __cuFileGetParameterString
519-
data["__cuFileGetParameterString"] = <_cyb_intptr_t>__cuFileGetParameterString
520+
data["__cuFileGetParameterString"] = <intptr_t>__cuFileGetParameterString
520521

521522
global __cuFileSetParameterSizeT
522-
data["__cuFileSetParameterSizeT"] = <_cyb_intptr_t>__cuFileSetParameterSizeT
523+
data["__cuFileSetParameterSizeT"] = <intptr_t>__cuFileSetParameterSizeT
523524

524525
global __cuFileSetParameterBool
525-
data["__cuFileSetParameterBool"] = <_cyb_intptr_t>__cuFileSetParameterBool
526+
data["__cuFileSetParameterBool"] = <intptr_t>__cuFileSetParameterBool
526527

527528
global __cuFileSetParameterString
528-
data["__cuFileSetParameterString"] = <_cyb_intptr_t>__cuFileSetParameterString
529+
data["__cuFileSetParameterString"] = <intptr_t>__cuFileSetParameterString
529530

530531
global __cuFileGetParameterMinMaxValue
531-
data["__cuFileGetParameterMinMaxValue"] = <_cyb_intptr_t>__cuFileGetParameterMinMaxValue
532+
data["__cuFileGetParameterMinMaxValue"] = <intptr_t>__cuFileGetParameterMinMaxValue
532533

533534
global __cuFileSetStatsLevel
534-
data["__cuFileSetStatsLevel"] = <_cyb_intptr_t>__cuFileSetStatsLevel
535+
data["__cuFileSetStatsLevel"] = <intptr_t>__cuFileSetStatsLevel
535536

536537
global __cuFileGetStatsLevel
537-
data["__cuFileGetStatsLevel"] = <_cyb_intptr_t>__cuFileGetStatsLevel
538+
data["__cuFileGetStatsLevel"] = <intptr_t>__cuFileGetStatsLevel
538539

539540
global __cuFileStatsStart
540-
data["__cuFileStatsStart"] = <_cyb_intptr_t>__cuFileStatsStart
541+
data["__cuFileStatsStart"] = <intptr_t>__cuFileStatsStart
541542

542543
global __cuFileStatsStop
543-
data["__cuFileStatsStop"] = <_cyb_intptr_t>__cuFileStatsStop
544+
data["__cuFileStatsStop"] = <intptr_t>__cuFileStatsStop
544545

545546
global __cuFileStatsReset
546-
data["__cuFileStatsReset"] = <_cyb_intptr_t>__cuFileStatsReset
547+
data["__cuFileStatsReset"] = <intptr_t>__cuFileStatsReset
547548

548549
global __cuFileGetStatsL1
549-
data["__cuFileGetStatsL1"] = <_cyb_intptr_t>__cuFileGetStatsL1
550+
data["__cuFileGetStatsL1"] = <intptr_t>__cuFileGetStatsL1
550551

551552
global __cuFileGetStatsL2
552-
data["__cuFileGetStatsL2"] = <_cyb_intptr_t>__cuFileGetStatsL2
553+
data["__cuFileGetStatsL2"] = <intptr_t>__cuFileGetStatsL2
553554

554555
global __cuFileGetStatsL3
555-
data["__cuFileGetStatsL3"] = <_cyb_intptr_t>__cuFileGetStatsL3
556+
data["__cuFileGetStatsL3"] = <intptr_t>__cuFileGetStatsL3
556557

557558
global __cuFileGetBARSizeInKB
558-
data["__cuFileGetBARSizeInKB"] = <_cyb_intptr_t>__cuFileGetBARSizeInKB
559+
data["__cuFileGetBARSizeInKB"] = <intptr_t>__cuFileGetBARSizeInKB
559560

560561
global __cuFileSetParameterPosixPoolSlabArray
561-
data["__cuFileSetParameterPosixPoolSlabArray"] = <_cyb_intptr_t>__cuFileSetParameterPosixPoolSlabArray
562+
data["__cuFileSetParameterPosixPoolSlabArray"] = <intptr_t>__cuFileSetParameterPosixPoolSlabArray
562563

563564
global __cuFileGetParameterPosixPoolSlabArray
564-
data["__cuFileGetParameterPosixPoolSlabArray"] = <_cyb_intptr_t>__cuFileGetParameterPosixPoolSlabArray
565+
data["__cuFileGetParameterPosixPoolSlabArray"] = <intptr_t>__cuFileGetParameterPosixPoolSlabArray
565566
_cyb_func_ptrs = data
566567
return data
567568

@@ -694,13 +695,13 @@ cdef CUfileError_t _cuFileDriverGetProperties(CUfileDrvProps_t* props) except?<C
694695
props)
695696

696697

697-
cdef CUfileError_t _cuFileDriverSetPollMode(cpp_bool poll, size_t poll_threshold_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
698+
cdef CUfileError_t _cuFileDriverSetPollMode(_cyb_bool poll, size_t poll_threshold_size) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
698699
global __cuFileDriverSetPollMode
699700
_check_or_init_cufile()
700701
if __cuFileDriverSetPollMode == NULL:
701702
with gil:
702703
raise FunctionNotFoundError("function cuFileDriverSetPollMode is not found")
703-
return (<CUfileError_t (*)(cpp_bool, size_t) noexcept nogil>__cuFileDriverSetPollMode)(
704+
return (<CUfileError_t (*)(_cyb_bool, size_t) noexcept nogil>__cuFileDriverSetPollMode)(
704705
poll, poll_threshold_size)
705706

706707

@@ -845,13 +846,13 @@ cdef CUfileError_t _cuFileGetParameterSizeT(CUFileSizeTConfigParameter_t param,
845846
param, value)
846847

847848

848-
cdef CUfileError_t _cuFileGetParameterBool(CUFileBoolConfigParameter_t param, cpp_bool* value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
849+
cdef CUfileError_t _cuFileGetParameterBool(CUFileBoolConfigParameter_t param, _cyb_bool* value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
849850
global __cuFileGetParameterBool
850851
_check_or_init_cufile()
851852
if __cuFileGetParameterBool == NULL:
852853
with gil:
853854
raise FunctionNotFoundError("function cuFileGetParameterBool is not found")
854-
return (<CUfileError_t (*)(CUFileBoolConfigParameter_t, cpp_bool*) noexcept nogil>__cuFileGetParameterBool)(
855+
return (<CUfileError_t (*)(CUFileBoolConfigParameter_t, _cyb_bool*) noexcept nogil>__cuFileGetParameterBool)(
855856
param, value)
856857

857858

@@ -875,13 +876,13 @@ cdef CUfileError_t _cuFileSetParameterSizeT(CUFileSizeTConfigParameter_t param,
875876
param, value)
876877

877878

878-
cdef CUfileError_t _cuFileSetParameterBool(CUFileBoolConfigParameter_t param, cpp_bool value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
879+
cdef CUfileError_t _cuFileSetParameterBool(CUFileBoolConfigParameter_t param, _cyb_bool value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
879880
global __cuFileSetParameterBool
880881
_check_or_init_cufile()
881882
if __cuFileSetParameterBool == NULL:
882883
with gil:
883884
raise FunctionNotFoundError("function cuFileSetParameterBool is not found")
884-
return (<CUfileError_t (*)(CUFileBoolConfigParameter_t, cpp_bool) noexcept nogil>__cuFileSetParameterBool)(
885+
return (<CUfileError_t (*)(CUFileBoolConfigParameter_t, _cyb_bool) noexcept nogil>__cuFileSetParameterBool)(
885886
param, value)
886887

887888

‎cuda_bindings/cuda/bindings/cufile.pxd‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55
# This code was automatically generated across versions from 12.9.1 to 13.3.0. Do not modify it directly.
6+
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=b10e4f1751ee5423db23c6fc953cb0ae37bff7e8937bf1d39ac5fd6eeb0e4e87
7+
8+
9+
10+
# <<<< PREAMBLE CONTENT >>>>
611

7-
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=232df43b5a8960f10286c172abc71222a3822087a1f6134e12d9341f3b53886c
812
from libc.stdint cimport intptr_t
13+
from libcpp cimport bool as _cyb_bool
14+
15+
16+
# <<<< END OF PREAMBLE CONTENT >>>>
917

1018
from .cycufile cimport *
1119

‎cuda_bindings/cuda/bindings/cufile.pyx‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44
#
55
# This code was automatically generated across versions from 12.9.1 to 13.3.0. Do not modify it directly.
6-
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=f107413ea0012a1a854cd3de77d57f649bebd0f586901d4e6384f37288ac5421
6+
# CYTHON-BINDINGS-GENERATED-DO-NOT-MODIFY-THIS-FILE: format=1; content-sha256=1ca8c2d672c5799154a85a73ac7f0f3661943ece8f4d7c1d2e11649a0a537c81
77

88

99
# <<<< PREAMBLE CONTENT >>>>
@@ -12,6 +12,10 @@ cimport cpython as _cyb_cpython
1212
cimport cpython.buffer as _cyb_cpython_buffer
1313
cimport cpython.memoryview as _cyb_cpython_memoryview
1414
from cython cimport view as _cyb_view
15+
from libc.stdint cimport (
16+
intptr_t,
17+
uint64_t,
18+
)
1519
from libc.stdlib cimport (
1620
calloc as _cyb_calloc,
1721
free as _cyb_free,
@@ -21,6 +25,7 @@ from libc.string cimport (
2125
memcmp as _cyb_memcmp,
2226
memcpy as _cyb_memcpy,
2327
)
28+
from libcpp cimport bool as _cyb_bool
2429

2530
from cuda.bindings._internal._fast_enum import FastEnum as _cyb_FastEnum
2631

@@ -2986,9 +2991,12 @@ class cuFileError(Exception):
29862991
@cython.profile(False)
29872992
cdef int check_status(ReturnT status) except 1 nogil:
29882993
if ReturnT is CUfileError_t:
2989-
if status.err != 0 or status.cu_err != 0:
2994+
if IS_CUDA_ERR(status):
29902995
with gil:
29912996
raise cuFileError(status.err, status.cu_err)
2997+
elif IS_CUFILE_ERR(status.err):
2998+
with gil:
2999+
raise cuFileError(status.err)
29923000
elif ReturnT is ssize_t:
29933001
if status == -1:
29943002
# note: this assumes cuFile already properly resets errno in each API
@@ -3107,7 +3115,7 @@ cpdef driver_set_poll_mode(bint poll, size_t poll_threshold_size):
31073115
.. seealso:: `cuFileDriverSetPollMode`
31083116
"""
31093117
with nogil:
3110-
__status__ = cuFileDriverSetPollMode(<cpp_bool>poll, poll_threshold_size)
3118+
__status__ = cuFileDriverSetPollMode(<_cyb_bool>poll, poll_threshold_size)
31113119
check_status(__status__)
31123120

31133121

@@ -3232,7 +3240,7 @@ cpdef size_t get_parameter_size_t(int param) except? 0:
32323240

32333241

32343242
cpdef bint get_parameter_bool(int param) except? 0:
3235-
cdef cpp_bool value
3243+
cdef _cyb_bool value
32363244
with nogil:
32373245
__status__ = cuFileGetParameterBool(<_BoolConfigParameter>param, &value)
32383246
check_status(__status__)
@@ -3256,7 +3264,7 @@ cpdef set_parameter_size_t(int param, size_t value):
32563264

32573265
cpdef set_parameter_bool(int param, bint value):
32583266
with nogil:
3259-
__status__ = cuFileSetParameterBool(<_BoolConfigParameter>param, <cpp_bool>value)
3267+
__status__ = cuFileSetParameterBool(<_BoolConfigParameter>param, <_cyb_bool>value)
32603268
check_status(__status__)
32613269

32623270

0 commit comments

Comments
 (0)