Skip to content

Commit 475fa5c

Browse files
committed
Merge remote-tracking branch 'upstream/main' into auto-release-toc
2 parents 705890b + f3cb5a2 commit 475fa5c

File tree

28 files changed

+2426
-337
lines changed

28 files changed

+2426
-337
lines changed

.github/workflows/bandit.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424

2525
- name: Install uv
2626
uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
27+
with:
28+
enable-cache: false
2729

2830
- name: Get ignore codes
2931
id: ignore-codes

.github/workflows/build-wheel.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
- "3.11"
3434
- "3.12"
3535
- "3.13"
36-
- "3.13t"
3736
- "3.14"
3837
- "3.14t"
3938
name: py${{ matrix.python-version }}
@@ -287,9 +286,7 @@ jobs:
287286
cuda-path: "./cuda_toolkit_prev"
288287

289288
- name: Download cuda.bindings build artifacts from the prior branch
290-
if: ${{ matrix.python-version == '3.13t'
291-
|| matrix.python-version == '3.14'
292-
|| matrix.python-version == '3.14t' }}
289+
if: startsWith(matrix.python-version, '3.14')
293290
env:
294291
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
295292
run: |

.github/workflows/ci.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,28 @@ jobs:
202202
- doc
203203
steps:
204204
- name: Exit
205-
run: exit 0
205+
run: |
206+
# if any dependencies were cancelled, that's a failure
207+
#
208+
# see https://docs.github.com/en/actions/reference/workflows-and-actions/expressions#always
209+
# and https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
210+
# for why this cannot be encoded in the job-level `if:` field
211+
#
212+
# TL; DR: `$REASONS`
213+
#
214+
# The intersection of skipped-as-success and required status checks
215+
# creates a scenario where if you DON'T `always()` run this job, the
216+
# status check UI will block merging and if you DO `always()` run and
217+
# a dependency is _cancelled_ (due to a critical failure, which is
218+
# somehow not considered a failure ¯\_(ツ)_/¯) then the critically
219+
# failing job(s) will timeout causing a cancellation here and the
220+
# build to succeed which we don't want (originally this was just
221+
# 'exit 0')
222+
if ${{ needs.test-linux-64.result == 'cancelled' ||
223+
needs.test-linux-aarch64.result == 'cancelled' ||
224+
needs.test-windows.result == 'cancelled' ||
225+
needs.doc.result == 'cancelled' }}; then
226+
exit 1
227+
else
228+
exit 0
229+
fi

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ repos:
7373
files: ^cuda_pathfinder/cuda/.*\.py$ # Exclude tests directory
7474
args: [--config-file=cuda_pathfinder/pyproject.toml]
7575

76-
# TODO: Reinstate after the workflows have been corrected. See #1146
77-
# - repo: https://github.com/rhysd/actionlint
78-
# rev: "03d0035246f3e81f36aed592ffb4bebf33a03106" # frozen: v1.7.7
79-
# hooks:
80-
# - id: actionlint
76+
- repo: https://github.com/rhysd/actionlint
77+
rev: "03d0035246f3e81f36aed592ffb4bebf33a03106" # frozen: v1.7.7
78+
hooks:
79+
- id: actionlint
80+
args: ["-shellcheck="]
8181

8282
- repo: https://github.com/MarcoGorelli/cython-lint
8383
rev: "d9ff7ce99ef4f2ae8fba93079ca9d76c4651d4ac" # frozen: v0.18.0

ci/test-matrix.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
{ "ARCH": "amd64", "PY_VER": "3.12", "CUDA_VER": "13.0.2", "LOCAL_CTK": "0", "GPU": "l4", "DRIVER": "latest" },
1515
{ "ARCH": "amd64", "PY_VER": "3.13", "CUDA_VER": "12.9.1", "LOCAL_CTK": "0", "GPU": "l4", "DRIVER": "latest" },
1616
{ "ARCH": "amd64", "PY_VER": "3.13", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "l4", "DRIVER": "latest" },
17-
{ "ARCH": "amd64", "PY_VER": "3.13t", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "l4", "DRIVER": "latest" },
1817
{ "ARCH": "amd64", "PY_VER": "3.14", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "l4", "DRIVER": "latest" },
1918
{ "ARCH": "amd64", "PY_VER": "3.14t", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "l4", "DRIVER": "latest" },
2019
{ "ARCH": "arm64", "PY_VER": "3.9", "CUDA_VER": "12.9.1", "LOCAL_CTK": "0", "GPU": "a100", "DRIVER": "latest" },
@@ -27,7 +26,6 @@
2726
{ "ARCH": "arm64", "PY_VER": "3.12", "CUDA_VER": "13.0.2", "LOCAL_CTK": "0", "GPU": "a100", "DRIVER": "latest" },
2827
{ "ARCH": "arm64", "PY_VER": "3.13", "CUDA_VER": "12.9.1", "LOCAL_CTK": "0", "GPU": "a100", "DRIVER": "latest" },
2928
{ "ARCH": "arm64", "PY_VER": "3.13", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "a100", "DRIVER": "latest" },
30-
{ "ARCH": "arm64", "PY_VER": "3.13t", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "a100", "DRIVER": "latest" },
3129
{ "ARCH": "arm64", "PY_VER": "3.14", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "a100", "DRIVER": "latest" },
3230
{ "ARCH": "arm64", "PY_VER": "3.14t", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "a100", "DRIVER": "latest" }
3331
],
@@ -95,8 +93,6 @@
9593
{ "ARCH": "amd64", "PY_VER": "3.12", "CUDA_VER": "12.9.1", "LOCAL_CTK": "1", "GPU": "t4", "DRIVER": "latest" },
9694
{ "ARCH": "amd64", "PY_VER": "3.13", "CUDA_VER": "13.0.2", "LOCAL_CTK": "0", "GPU": "t4", "DRIVER": "latest" },
9795
{ "ARCH": "amd64", "PY_VER": "3.13", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "l4", "DRIVER": "latest" },
98-
{ "ARCH": "amd64", "PY_VER": "3.13t", "CUDA_VER": "13.0.2", "LOCAL_CTK": "0", "GPU": "t4", "DRIVER": "latest" },
99-
{ "ARCH": "amd64", "PY_VER": "3.13t", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "l4", "DRIVER": "latest" },
10096
{ "ARCH": "amd64", "PY_VER": "3.14", "CUDA_VER": "13.0.2", "LOCAL_CTK": "0", "GPU": "t4", "DRIVER": "latest" },
10197
{ "ARCH": "amd64", "PY_VER": "3.14", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "l4", "DRIVER": "latest" },
10298
{ "ARCH": "amd64", "PY_VER": "3.14t", "CUDA_VER": "13.0.2", "LOCAL_CTK": "0", "GPU": "t4", "DRIVER": "latest" },
@@ -106,9 +102,7 @@
106102
{ "ARCH": "amd64", "PY_VER": "3.12", "CUDA_VER": "11.8.0", "LOCAL_CTK": "0", "GPU": "l4", "DRIVER": "latest" },
107103
{ "ARCH": "amd64", "PY_VER": "3.12", "CUDA_VER": "11.8.0", "LOCAL_CTK": "1", "GPU": "t4", "DRIVER": "latest" },
108104
{ "ARCH": "amd64", "PY_VER": "3.12", "CUDA_VER": "12.9.1", "LOCAL_CTK": "0", "GPU": "t4", "DRIVER": "latest" },
109-
{ "ARCH": "amd64", "PY_VER": "3.12", "CUDA_VER": "12.9.1", "LOCAL_CTK": "1", "GPU": "l4", "DRIVER": "latest" },
110-
{ "ARCH": "amd64", "PY_VER": "3.13t", "CUDA_VER": "13.0.2", "LOCAL_CTK": "0", "GPU": "t4", "DRIVER": "latest" },
111-
{ "ARCH": "amd64", "PY_VER": "3.13t", "CUDA_VER": "13.0.2", "LOCAL_CTK": "1", "GPU": "l4", "DRIVER": "latest" }
105+
{ "ARCH": "amd64", "PY_VER": "3.12", "CUDA_VER": "12.9.1", "LOCAL_CTK": "1", "GPU": "l4", "DRIVER": "latest" }
112106
]
113107
}
114108
}

cuda_bindings/cuda/bindings/_internal/cufile.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
44
#
5-
# This code was automatically generated across versions from 12.9.0 to 13.0.2. Do not modify it directly.
5+
# This code was automatically generated across versions from 12.9.1 to 13.0.2. Do not modify it directly.
66

77
from ..cycufile cimport *
88

@@ -18,6 +18,7 @@ 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() except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
2122
cdef CUfileError_t _cuFileDriverClose_v2() except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
2223
cdef long _cuFileUseCount() except* nogil
2324
cdef CUfileError_t _cuFileDriverGetProperties(CUfileDrvProps_t* props) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
@@ -41,7 +42,6 @@ cdef CUfileError_t _cuFileGetParameterString(CUFileStringConfigParameter_t param
4142
cdef CUfileError_t _cuFileSetParameterSizeT(CUFileSizeTConfigParameter_t param, size_t value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4243
cdef CUfileError_t _cuFileSetParameterBool(CUFileBoolConfigParameter_t param, cpp_bool value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4344
cdef CUfileError_t _cuFileSetParameterString(CUFileStringConfigParameter_t param, const char* desc_str) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
44-
cdef CUfileError_t _cuFileDriverClose() except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4545
cdef CUfileError_t _cuFileGetParameterMinMaxValue(CUFileSizeTConfigParameter_t param, size_t* min_value, size_t* max_value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4646
cdef CUfileError_t _cuFileSetStatsLevel(int level) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil
4747
cdef CUfileError_t _cuFileGetStatsLevel(int* level) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil

cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
44
#
5-
# This code was automatically generated across versions from 12.9.0 to 13.0.2. Do not modify it directly.
5+
# This code was automatically generated across versions from 12.9.1 to 13.0.2. Do not modify it directly.
66

77
from libc.stdint cimport intptr_t, uintptr_t
88
import threading
@@ -68,6 +68,7 @@ cdef void* __cuFileBufDeregister = NULL
6868
cdef void* __cuFileRead = NULL
6969
cdef void* __cuFileWrite = NULL
7070
cdef void* __cuFileDriverOpen = NULL
71+
cdef void* __cuFileDriverClose = NULL
7172
cdef void* __cuFileDriverClose_v2 = NULL
7273
cdef void* __cuFileUseCount = NULL
7374
cdef void* __cuFileDriverGetProperties = NULL
@@ -91,7 +92,6 @@ cdef void* __cuFileGetParameterString = NULL
9192
cdef void* __cuFileSetParameterSizeT = NULL
9293
cdef void* __cuFileSetParameterBool = NULL
9394
cdef void* __cuFileSetParameterString = NULL
94-
cdef void* __cuFileDriverClose = NULL
9595
cdef void* __cuFileGetParameterMinMaxValue = NULL
9696
cdef void* __cuFileSetStatsLevel = NULL
9797
cdef void* __cuFileGetStatsLevel = NULL
@@ -167,6 +167,13 @@ cdef int __check_or_init_cufile() except -1 nogil:
167167
handle = load_library()
168168
__cuFileDriverOpen = dlsym(handle, 'cuFileDriverOpen')
169169

170+
global __cuFileDriverClose
171+
__cuFileDriverClose = dlsym(RTLD_DEFAULT, 'cuFileDriverClose')
172+
if __cuFileDriverClose == NULL:
173+
if handle == NULL:
174+
handle = load_library()
175+
__cuFileDriverClose = dlsym(handle, 'cuFileDriverClose')
176+
170177
global __cuFileDriverClose_v2
171178
__cuFileDriverClose_v2 = dlsym(RTLD_DEFAULT, 'cuFileDriverClose_v2')
172179
if __cuFileDriverClose_v2 == NULL:
@@ -328,13 +335,6 @@ cdef int __check_or_init_cufile() except -1 nogil:
328335
handle = load_library()
329336
__cuFileSetParameterString = dlsym(handle, 'cuFileSetParameterString')
330337

331-
global __cuFileDriverClose
332-
__cuFileDriverClose = dlsym(RTLD_DEFAULT, 'cuFileDriverClose')
333-
if __cuFileDriverClose == NULL:
334-
if handle == NULL:
335-
handle = load_library()
336-
__cuFileDriverClose = dlsym(handle, 'cuFileDriverClose')
337-
338338
global __cuFileGetParameterMinMaxValue
339339
__cuFileGetParameterMinMaxValue = dlsym(RTLD_DEFAULT, 'cuFileGetParameterMinMaxValue')
340340
if __cuFileGetParameterMinMaxValue == NULL:
@@ -462,6 +462,9 @@ cpdef dict _inspect_function_pointers():
462462
global __cuFileDriverOpen
463463
data["__cuFileDriverOpen"] = <intptr_t>__cuFileDriverOpen
464464

465+
global __cuFileDriverClose
466+
data["__cuFileDriverClose"] = <intptr_t>__cuFileDriverClose
467+
465468
global __cuFileDriverClose_v2
466469
data["__cuFileDriverClose_v2"] = <intptr_t>__cuFileDriverClose_v2
467470

@@ -531,9 +534,6 @@ cpdef dict _inspect_function_pointers():
531534
global __cuFileSetParameterString
532535
data["__cuFileSetParameterString"] = <intptr_t>__cuFileSetParameterString
533536

534-
global __cuFileDriverClose
535-
data["__cuFileDriverClose"] = <intptr_t>__cuFileDriverClose
536-
537537
global __cuFileGetParameterMinMaxValue
538538
data["__cuFileGetParameterMinMaxValue"] = <intptr_t>__cuFileGetParameterMinMaxValue
539539

@@ -656,6 +656,16 @@ cdef CUfileError_t _cuFileDriverOpen() except?<CUfileError_t>CUFILE_LOADING_ERRO
656656
)
657657

658658

659+
cdef CUfileError_t _cuFileDriverClose() except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
660+
global __cuFileDriverClose
661+
_check_or_init_cufile()
662+
if __cuFileDriverClose == NULL:
663+
with gil:
664+
raise FunctionNotFoundError("function cuFileDriverClose is not found")
665+
return (<CUfileError_t (*)() noexcept nogil>__cuFileDriverClose)(
666+
)
667+
668+
659669
cdef CUfileError_t _cuFileDriverClose_v2() except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
660670
global __cuFileDriverClose_v2
661671
_check_or_init_cufile()
@@ -887,16 +897,6 @@ cdef CUfileError_t _cuFileSetParameterString(CUFileStringConfigParameter_t param
887897
param, desc_str)
888898

889899

890-
cdef CUfileError_t _cuFileDriverClose() except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
891-
global __cuFileDriverClose
892-
_check_or_init_cufile()
893-
if __cuFileDriverClose == NULL:
894-
with gil:
895-
raise FunctionNotFoundError("function cuFileDriverClose is not found")
896-
return (<CUfileError_t (*)() noexcept nogil>__cuFileDriverClose)(
897-
)
898-
899-
900900
cdef CUfileError_t _cuFileGetParameterMinMaxValue(CUFileSizeTConfigParameter_t param, size_t* min_value, size_t* max_value) except?<CUfileError_t>CUFILE_LOADING_ERROR nogil:
901901
global __cuFileGetParameterMinMaxValue
902902
_check_or_init_cufile()
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
33

4-
__version__ = "13.0.2"
4+
__version__ = "13.0.3"

cuda_bindings/cuda/bindings/cufile.pxd

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
44
#
5-
# This code was automatically generated across versions from 12.9.0 to 13.0.2. Do not modify it directly.
5+
# This code was automatically generated across versions from 12.9.1 to 13.0.2. Do not modify it directly.
66

77
from libc.stdint cimport intptr_t
88

@@ -18,12 +18,7 @@ ctypedef CUfileBatchHandle_t BatchHandle
1818
ctypedef CUfileError_t Error
1919
ctypedef cufileRDMAInfo_t RDMAInfo
2020
ctypedef CUfileFSOps_t FSOps
21-
ctypedef CUfileOpCounter_t OpCounter
22-
ctypedef CUfilePerGpuStats_t PerGpuStats
2321
ctypedef CUfileDrvProps_t DrvProps
24-
ctypedef CUfileStatsLevel1_t StatsLevel1
25-
ctypedef CUfileStatsLevel2_t StatsLevel2
26-
ctypedef CUfileStatsLevel3_t StatsLevel3
2722

2823

2924
###############################################################################
@@ -77,3 +72,15 @@ cpdef str get_parameter_string(int param, int len)
7772
cpdef set_parameter_size_t(int param, size_t value)
7873
cpdef set_parameter_bool(int param, bint value)
7974
cpdef set_parameter_string(int param, intptr_t desc_str)
75+
cpdef tuple get_parameter_min_max_value(int param)
76+
cpdef set_stats_level(int level)
77+
cpdef int get_stats_level() except? 0
78+
cpdef stats_start()
79+
cpdef stats_stop()
80+
cpdef stats_reset()
81+
cpdef get_stats_l1(intptr_t stats)
82+
cpdef get_stats_l2(intptr_t stats)
83+
cpdef get_stats_l3(intptr_t stats)
84+
cpdef size_t get_bar_size_in_kb(int gpu_ind_ex) except? 0
85+
cpdef set_parameter_posix_pool_slab_array(intptr_t size_values, intptr_t count_values, int len)
86+
cpdef get_parameter_posix_pool_slab_array(intptr_t size_values, intptr_t count_values, int len)

0 commit comments

Comments
 (0)