Skip to content

Commit 91567ef

Browse files
benfredbenfred
authored
Merge branch 'main' into c_abi_checker
2 parents d6d52ba + dd2e749 commit 91567ef

File tree

44 files changed

+928
-488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+928
-488
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
branch: ${{ inputs.branch }}
6363
arch: "${{matrix.arch}}"
6464
date: ${{ inputs.date }}
65-
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
65+
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.11"
6666
node_type: "cpu16"
6767
requires_license_builder: true
6868
script: "ci/build_standalone_c.sh"

‎.github/workflows/pr.yaml‎

Lines changed: 179 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,74 +60,240 @@ jobs:
6060
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@main
6161
with:
6262
files_yaml: |
63+
build_docs:
64+
- '**'
65+
- '!.devcontainer/**'
66+
- '!.github/CODEOWNERS'
67+
- '!.github/ISSUE_TEMPLATE/**'
68+
- '!.github/PULL_REQUEST_TEMPLATE.md'
69+
- '!.github/copy-pr-bot.yaml'
70+
- '!.github/labeler.yml'
71+
- '!.github/ops-bot.yaml'
72+
- '!.github/release.yml'
73+
- '!.github/workflows/publish-rust.yaml'
74+
- '!.github/workflows/trigger-breaking-change-alert.yaml'
75+
- '!.pre-commit-config.yaml'
76+
- '!.shellcheckrc'
77+
- '!Dockerfile'
78+
- '!ci/check_style.sh'
79+
- '!ci/release/update-version.sh'
80+
- '!ci/run*.sh'
81+
- '!ci/test*.sh'
82+
- '!ci/validate_wheel.sh'
83+
- '!thirdparty/LICENSES/**'
6384
test_cpp:
6485
- '**'
6586
- '!.devcontainer/**'
87+
- '!.github/CODEOWNERS'
88+
- '!.github/ISSUE_TEMPLATE/**'
89+
- '!.github/PULL_REQUEST_TEMPLATE.md'
90+
- '!.github/copy-pr-bot.yaml'
91+
- '!.github/labeler.yml'
92+
- '!.github/ops-bot.yaml'
93+
- '!.github/release.yml'
94+
- '!.github/workflows/publish-rust.yaml'
95+
- '!.github/workflows/trigger-breaking-change-alert.yaml'
6696
- '!.pre-commit-config.yaml'
97+
- '!.shellcheckrc'
98+
- '!Dockerfile'
6799
- '!README.md'
100+
- '!ci/build_docs.sh'
101+
- '!ci/build_python.sh'
102+
- '!ci/build_wheel*.sh'
103+
- '!ci/check_style.sh'
68104
- '!ci/release/update-version.sh'
105+
- '!ci/run_cuvs_pytests.sh'
106+
- '!ci/test_java.sh'
107+
- '!ci/test_python.sh'
108+
- '!ci/test_wheel_cuvs.sh'
109+
- '!ci/validate_wheel.sh'
69110
- '!docs/**'
111+
- '!go/**'
70112
- '!img/**'
113+
- '!java/**'
71114
- '!notebooks/**'
72115
- '!python/**'
73116
- '!rust/**'
74-
- '!go/**'
75117
- '!thirdparty/LICENSES/**'
76118
test_java:
77119
- '**'
78120
- '!.devcontainer/**'
121+
- '!.github/CODEOWNERS'
122+
- '!.github/ISSUE_TEMPLATE/**'
123+
- '!.github/PULL_REQUEST_TEMPLATE.md'
124+
- '!.github/copy-pr-bot.yaml'
125+
- '!.github/labeler.yml'
126+
- '!.github/ops-bot.yaml'
127+
- '!.github/release.yml'
128+
- '!.github/workflows/publish-rust.yaml'
129+
- '!.github/workflows/trigger-breaking-change-alert.yaml'
79130
- '!.pre-commit-config.yaml'
80-
- '!README.md'
131+
- '!.shellcheckrc'
132+
- '!ci/build_docs.sh'
133+
- '!ci/build_go.sh'
134+
- '!ci/build_python.sh'
135+
- '!ci/build_rust.sh'
136+
- '!ci/build_wheel*.sh'
137+
- '!ci/checkstyle.sh'
138+
- '!ci/run_cuvs_pytests.sh'
139+
- '!ci/test_cpp.sh'
140+
- '!ci/test_python.sh'
141+
- '!ci/test_wheel_cuvs.sh'
142+
- '!ci/validate_wheel.sh'
143+
- '!Dockerfile'
81144
- '!docs/**'
82145
- '!img/**'
83146
- '!notebooks/**'
84147
- '!python/**'
85148
- '!rust/**'
86149
- '!go/**'
87150
- '!thirdparty/LICENSES/**'
88-
test_notebooks:
151+
test_python_conda:
89152
- '**'
90153
- '!.devcontainer/**'
154+
- '!.github/CODEOWNERS'
155+
- '!.github/ISSUE_TEMPLATE/**'
156+
- '!.github/PULL_REQUEST_TEMPLATE.md'
157+
- '!.github/copy-pr-bot.yaml'
158+
- '!.github/labeler.yml'
159+
- '!.github/ops-bot.yaml'
160+
- '!.github/release.yml'
161+
- '!.github/workflows/publish-rust.yaml'
162+
- '!.github/workflows/trigger-breaking-change-alert.yaml'
91163
- '!.pre-commit-config.yaml'
164+
- '!.shellcheckrc'
165+
- '!ci/build_go.sh'
166+
- '!ci/build_java.sh'
167+
- '!ci/build_rust.sh'
168+
- '!ci/check_style.sh'
92169
- '!ci/release/update-version.sh'
170+
- '!ci/run_ctests.sh'
171+
- '!ci/run_cuvs_pytests.sh'
172+
- '!ci/test_cpp.sh'
173+
- '!ci/test_java.sh'
174+
- '!ci/test_standalone_c.sh'
175+
- '!ci/test_wheel_cuvs.sh'
176+
- '!ci/validate_wheel.sh'
177+
- '!Dockerfile'
93178
- '!README.md'
94-
- '!rust/**'
179+
- '!docs/**'
95180
- '!go/**'
181+
- '!img/**'
182+
- '!java/**'
183+
- '!notebooks/**'
184+
- '!rust/**'
96185
- '!thirdparty/LICENSES/**'
97-
test_python:
186+
test_python_wheels:
98187
- '**'
99188
- '!.devcontainer/**'
189+
- '!.github/CODEOWNERS'
190+
- '!.github/ISSUE_TEMPLATE/**'
191+
- '!.github/PULL_REQUEST_TEMPLATE.md'
192+
- '!.github/copy-pr-bot.yaml'
193+
- '!.github/labeler.yml'
194+
- '!.github/ops-bot.yaml'
195+
- '!.github/release.yml'
196+
- '!.github/workflows/publish-rust.yaml'
197+
- '!.github/workflows/trigger-breaking-change-alert.yaml'
100198
- '!.pre-commit-config.yaml'
199+
- '!.shellcheckrc'
200+
- '!ci/build_cpp.sh'
201+
- '!ci/build_docs.sh'
202+
- '!ci/build_go.sh'
203+
- '!ci/build_java.sh'
204+
- '!ci/build_python.sh'
205+
- '!ci/build_rust.sh'
206+
- '!ci/build_standalone_c.sh'
207+
- '!ci/check_style.sh'
101208
- '!ci/release/update-version.sh'
209+
- '!ci/run_ctests.sh'
210+
- '!ci/test_cpp.sh'
211+
- '!ci/test_java.sh'
212+
- '!ci/test_python.sh'
213+
- '!ci/test_standalone_c.sh'
214+
- '!ci/validate_wheel.sh'
215+
- '!Dockerfile'
102216
- '!README.md'
103217
- '!docs/**'
218+
- '!java/**'
219+
- '!go/**'
104220
- '!img/**'
105221
- '!notebooks/**'
106222
- '!rust/**'
107-
- '!go/**'
108223
- '!thirdparty/LICENSES/**'
109224
test_rust:
110225
- '**'
111226
- '!.devcontainer/**'
227+
- '!.github/CODEOWNERS'
228+
- '!.github/ISSUE_TEMPLATE/**'
229+
- '!.github/PULL_REQUEST_TEMPLATE.md'
230+
- '!.github/copy-pr-bot.yaml'
231+
- '!.github/labeler.yml'
232+
- '!.github/ops-bot.yaml'
233+
- '!.github/release.yml'
234+
- '!.github/workflows/publish-rust.yaml'
235+
- '!.github/workflows/trigger-breaking-change-alert.yaml'
112236
- '!.pre-commit-config.yaml'
237+
- '!.shellcheckrc'
238+
- '!Dockerfile'
113239
- '!README.md'
240+
- '!ci/build_docs.sh'
241+
- '!ci/build_go.sh'
242+
- '!ci/build_java.sh'
243+
- '!ci/build_python.sh'
244+
- '!ci/build_wheel*.sh'
245+
- '!ci/check_style.sh'
246+
- '!ci/release/update-version.sh'
247+
- '!ci/run_ctests.sh'
248+
- '!ci/run_cuvs_pytests.sh'
249+
- '!ci/test_cpp.sh'
250+
- '!ci/test_java.sh'
251+
- '!ci/test_python.sh'
252+
- '!ci/test_wheel_cuvs.sh'
253+
- '!ci/validate_wheel.sh'
114254
- '!docs/**'
255+
- '!go/**'
115256
- '!img/**'
257+
- '!java/**'
116258
- '!notebooks/**'
117259
- '!python/**'
118-
- '!java/**'
119-
- '!go/**'
120260
- '!thirdparty/LICENSES/**'
121261
test_go:
122262
- '**'
123263
- '!.devcontainer/**'
264+
- '!.github/CODEOWNERS'
265+
- '!.github/ISSUE_TEMPLATE/**'
266+
- '!.github/PULL_REQUEST_TEMPLATE.md'
267+
- '!.github/copy-pr-bot.yaml'
268+
- '!.github/labeler.yml'
269+
- '!.github/ops-bot.yaml'
270+
- '!.github/release.yml'
271+
- '!.github/workflows/publish-rust.yaml'
272+
- '!.github/workflows/trigger-breaking-change-alert.yaml'
124273
- '!.pre-commit-config.yaml'
274+
- '!.shellcheckrc'
275+
- '!Dockerfile'
125276
- '!README.md'
277+
- '!ci/build_docs.sh'
278+
- '!ci/build_java.sh'
279+
- '!ci/build_python.sh'
280+
- '!ci/build_rust.sh'
281+
- '!ci/build_wheel*.sh'
282+
- '!ci/check_style.sh'
283+
- '!ci/release/update-version.sh'
284+
- '!ci/run_ctests.sh'
285+
- '!ci/run_cuvs_pytests.sh'
286+
- '!ci/test_cpp.sh'
287+
- '!ci/test_java.sh'
288+
- '!ci/test_python.sh'
289+
- '!ci/test_standalone_c.sh'
290+
- '!ci/test_wheel_cuvs.sh'
291+
- '!ci/validate_wheel.sh'
126292
- '!docs/**'
127293
- '!img/**'
294+
- '!java/**'
128295
- '!notebooks/**'
129296
- '!python/**'
130-
- '!java/**'
131297
- '!rust/**'
132298
- '!thirdparty/LICENSES/**'
133299
checks:
@@ -176,7 +342,7 @@ jobs:
176342
needs: [conda-python-build, changed-files]
177343
secrets: inherit
178344
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
179-
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
345+
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_conda
180346
with:
181347
build_type: pull-request
182348
script: ci/test_python.sh
@@ -198,7 +364,7 @@ jobs:
198364
build_type: pull-request
199365
arch: "${{matrix.arch}}"
200366
date: ${{ inputs.date }}_c
201-
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
367+
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.11"
202368
node_type: "cpu16"
203369
requires_license_builder: true
204370
script: "ci/build_standalone_c.sh --build-tests"
@@ -225,7 +391,7 @@ jobs:
225391
node_type: "gpu-l4-latest-1"
226392
arch: "${{matrix.arch}}"
227393
date: ${{ inputs.date }}_c
228-
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.10"
394+
container_image: "rapidsai/ci-wheel:26.04-cuda${{ matrix.cuda_version }}-rockylinux8-py3.11"
229395
script: "ci/test_standalone_c.sh libcuvs_c_${{ matrix.cuda_version }}_${{ matrix.arch }}.tar.gz"
230396
sha: ${{ inputs.sha }}
231397
conda-java-build-and-tests:
@@ -327,7 +493,7 @@ jobs:
327493
needs: [wheel-build-cuvs, changed-files]
328494
secrets: inherit
329495
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
330-
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
496+
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
331497
with:
332498
build_type: pull-request
333499
script: ci/test_wheel_cuvs.sh

‎.pre-commit-config.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION.
1+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION.
22
# SPDX-License-Identifier: Apache-2.0
33

44
repos:
@@ -100,7 +100,7 @@ repos:
100100
^CHANGELOG[.]md$|
101101
^cpp/cmake/patches/cutlass/build-export[.]patch$
102102
- repo: https://github.com/rapidsai/pre-commit-hooks
103-
rev: v1.2.1
103+
rev: v1.3.3
104104
hooks:
105105
- id: verify-copyright
106106
name: verify-copyright-cuvs
@@ -164,6 +164,12 @@ repos:
164164
- id: verify-alpha-spec
165165
- id: verify-codeowners
166166
args: [--fix, --project-prefix=cuvs]
167+
- id: verify-pyproject-license
168+
# ignore the top-level pyproject.toml, which doesn't
169+
# have or need a [project] table
170+
exclude: |
171+
(?x)
172+
^pyproject[.]toml$
167173
- repo: https://github.com/rapidsai/dependency-file-generator
168174
rev: v1.20.0
169175
hooks:

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# Configurable build arguments - override with --build-arg during build
1818
ARG CUDA_VER=12.9.1
1919

20-
# Python version for the conda environment (supported: 3.10, 3.11, 3.12)
20+
# Python version for the conda environment (supported: 3.11, 3.12, 3.13)
2121
ARG PYTHON_VER=3.12
2222

2323
# RAPIDS/cuVS version

‎build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# SPDX-FileCopyrightText: Copyright (c) 2020-2025, NVIDIA CORPORATION.
3+
# SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
44
# SPDX-License-Identifier: Apache-2.0
55

66
# cuvs build scripts
@@ -54,7 +54,7 @@ HELP="$0 [<target> ...] [<flag> ...] [--cmake-args=\"<args>\"] [--cache-tool=<to
5454
--no-nvtx - disable nvtx (profiling markers), but allow enabling it in downstream projects
5555
--no-shared-libs - build without shared libraries
5656
--show_depr_warn - show cmake deprecation warnings
57-
--run-java-test - run Java tests after building
57+
--run-java-tests - run Java tests after building
5858
--build-metrics - filename for generating build metrics report for libcuvs
5959
--incl-cache-stats - include cache statistics in build metrics report
6060
--cmake-args=\\\"<args>\\\" - pass arbitrary list of CMake configuration options (escape all quotes in argument)

0 commit comments

Comments
 (0)