Skip to content

Commit 59a74eb

Browse files
GPUtesterGPUtester
authored
Merge pull request #1546 from rapidsai/release/25.12
Forward-merge release/25.12 into main
2 parents 7a7dfce + c9865d6 commit 59a74eb

8 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎.github/workflows/build.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ concurrency:
3434
jobs:
3535
cpp-build:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
3838
with:
3939
build_type: ${{ inputs.build_type || 'branch' }}
4040
branch: ${{ inputs.branch }}
@@ -44,7 +44,7 @@ jobs:
4444

4545
rocky8-clib-standalone-build:
4646
secrets: inherit
47-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
47+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
4848
strategy:
4949
fail-fast: false
5050
matrix:
@@ -67,7 +67,7 @@ jobs:
6767
rust-build:
6868
needs: cpp-build
6969
secrets: inherit
70-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
70+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
7171
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
7272
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
7373
strategy:
@@ -88,7 +88,7 @@ jobs:
8888
go-build:
8989
needs: cpp-build
9090
secrets: inherit
91-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
91+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
9292
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
9393
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
9494
strategy:
@@ -109,7 +109,7 @@ jobs:
109109
java-build:
110110
needs: cpp-build
111111
secrets: inherit
112-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
112+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
113113
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
114114
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
115115
strategy:
@@ -131,7 +131,7 @@ jobs:
131131
python-build:
132132
needs: [cpp-build]
133133
secrets: inherit
134-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
134+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
135135
with:
136136
build_type: ${{ inputs.build_type || 'branch' }}
137137
branch: ${{ inputs.branch }}
@@ -141,7 +141,7 @@ jobs:
141141
upload-conda:
142142
needs: [cpp-build, python-build]
143143
secrets: inherit
144-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
144+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/25.12
145145
with:
146146
build_type: ${{ inputs.build_type || 'branch' }}
147147
branch: ${{ inputs.branch }}
@@ -156,7 +156,7 @@ jobs:
156156
if: github.ref_type == 'branch'
157157
needs: python-build
158158
secrets: inherit
159-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
159+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
160160
with:
161161
arch: "amd64"
162162
branch: ${{ inputs.branch }}
@@ -168,7 +168,7 @@ jobs:
168168
sha: ${{ inputs.sha }}
169169
wheel-build-libcuvs:
170170
secrets: inherit
171-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
171+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
172172
with:
173173
build_type: ${{ inputs.build_type || 'branch' }}
174174
branch: ${{ inputs.branch }}
@@ -182,7 +182,7 @@ jobs:
182182
wheel-publish-libcuvs:
183183
needs: wheel-build-libcuvs
184184
secrets: inherit
185-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
185+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
186186
with:
187187
build_type: ${{ inputs.build_type || 'branch' }}
188188
branch: ${{ inputs.branch }}
@@ -193,7 +193,7 @@ jobs:
193193
wheel-build-cuvs:
194194
needs: wheel-build-libcuvs
195195
secrets: inherit
196-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
196+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
197197
with:
198198
build_type: ${{ inputs.build_type || 'branch' }}
199199
branch: ${{ inputs.branch }}
@@ -205,7 +205,7 @@ jobs:
205205
wheel-publish-cuvs:
206206
needs: wheel-build-cuvs
207207
secrets: inherit
208-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
208+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
209209
with:
210210
build_type: ${{ inputs.build_type || 'branch' }}
211211
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- devcontainer
3030
- telemetry-setup
3131
secrets: inherit
32-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
32+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/25.12
3333
if: always()
3434
with:
3535
needs: ${{ toJSON(needs) }}
@@ -56,7 +56,7 @@ jobs:
5656
changed-files:
5757
needs: telemetry-setup
5858
secrets: inherit
59-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@main
59+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@release/25.12
6060
with:
6161
files_yaml: |
6262
test_cpp:
@@ -132,52 +132,52 @@ jobs:
132132
checks:
133133
needs: telemetry-setup
134134
secrets: inherit
135-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
135+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/25.12
136136
with:
137137
enable_check_generated_files: false
138138
ignored_pr_jobs: "telemetry-summarize"
139139
conda-cpp-build:
140140
needs: checks
141141
secrets: inherit
142-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
142+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
143143
with:
144144
build_type: pull-request
145145
node_type: cpu16
146146
script: ci/build_cpp.sh
147147
conda-cpp-tests:
148148
needs: [conda-cpp-build, changed-files]
149149
secrets: inherit
150-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
150+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
151151
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
152152
with:
153153
build_type: pull-request
154154
script: ci/test_cpp.sh
155155
conda-cpp-checks:
156156
needs: conda-cpp-build
157157
secrets: inherit
158-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@main
158+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@release/25.12
159159
with:
160160
build_type: pull-request
161161
symbol_exclusions: (void (thrust::|cub::))
162162
conda-python-build:
163163
needs: conda-cpp-build
164164
secrets: inherit
165-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
165+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/25.12
166166
with:
167167
build_type: pull-request
168168
script: ci/build_python.sh
169169
conda-python-tests:
170170
needs: [conda-python-build, changed-files]
171171
secrets: inherit
172-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
172+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
173173
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
174174
with:
175175
build_type: pull-request
176176
script: ci/test_python.sh
177177
rocky8-clib-standalone-build:
178178
needs: [checks]
179179
secrets: inherit
180-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
180+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
181181
strategy:
182182
fail-fast: false
183183
matrix:
@@ -198,7 +198,7 @@ jobs:
198198
rocky8-clib-tests:
199199
needs: [rocky8-clib-standalone-build, changed-files]
200200
secrets: inherit
201-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
201+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
202202
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
203203
strategy:
204204
fail-fast: false
@@ -217,7 +217,7 @@ jobs:
217217
conda-java-build-and-tests:
218218
needs: [conda-cpp-build, changed-files]
219219
secrets: inherit
220-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
220+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
221221
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_java || fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
222222
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
223223
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
@@ -238,7 +238,7 @@ jobs:
238238
rust-build:
239239
needs: [conda-cpp-build, changed-files]
240240
secrets: inherit
241-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
241+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
242242
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_rust || fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
243243
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
244244
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
@@ -257,7 +257,7 @@ jobs:
257257
go-build:
258258
needs: [conda-cpp-build, changed-files]
259259
secrets: inherit
260-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
260+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
261261
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_go || fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
262262
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
263263
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
@@ -276,7 +276,7 @@ jobs:
276276
docs-build:
277277
needs: conda-python-build
278278
secrets: inherit
279-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
279+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
280280
with:
281281
build_type: pull-request
282282
node_type: "gpu-l4-latest-1"
@@ -286,7 +286,7 @@ jobs:
286286
wheel-build-libcuvs:
287287
needs: checks
288288
secrets: inherit
289-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
289+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
290290
with:
291291
build_type: pull-request
292292
script: ci/build_wheel_libcuvs.sh
@@ -297,7 +297,7 @@ jobs:
297297
wheel-build-cuvs:
298298
needs: wheel-build-libcuvs
299299
secrets: inherit
300-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
300+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
301301
with:
302302
build_type: pull-request
303303
script: ci/build_wheel_cuvs.sh
@@ -306,15 +306,15 @@ jobs:
306306
wheel-tests-cuvs:
307307
needs: [wheel-build-cuvs, changed-files]
308308
secrets: inherit
309-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
309+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
310310
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
311311
with:
312312
build_type: pull-request
313313
script: ci/test_wheel_cuvs.sh
314314
devcontainer:
315315
secrets: inherit
316316
needs: telemetry-setup
317-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@main
317+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@release/25.12
318318
with:
319319
arch: '["amd64", "arm64"]'
320320
cuda: '["13.0"]'

‎.github/workflows/test.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
conda-cpp-checks:
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@main
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@release/25.12
2929
with:
3030
build_type: ${{ inputs.build_type }}
3131
branch: ${{ inputs.branch }}
@@ -34,7 +34,7 @@ jobs:
3434
symbol_exclusions: (void (thrust::|cub::))
3535
conda-cpp-tests:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
3838
with:
3939
build_type: ${{ inputs.build_type }}
4040
branch: ${{ inputs.branch }}
@@ -43,7 +43,7 @@ jobs:
4343
sha: ${{ inputs.sha }}
4444
conda-python-tests:
4545
secrets: inherit
46-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
46+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
4747
with:
4848
build_type: ${{ inputs.build_type }}
4949
branch: ${{ inputs.branch }}
@@ -52,7 +52,7 @@ jobs:
5252
sha: ${{ inputs.sha }}
5353
conda-java-tests:
5454
secrets: inherit
55-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
55+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
5656
# Artifacts are not published from these jobs, so it's safe to run for multiple CUDA versions.
5757
# If these jobs start producing artifacts, the names will have to differentiate between CUDA versions.
5858
strategy:
@@ -72,7 +72,7 @@ jobs:
7272
script: "ci/test_java.sh"
7373
wheel-tests-cuvs:
7474
secrets: inherit
75-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
75+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
7676
with:
7777
build_type: ${{ inputs.build_type }}
7878
branch: ${{ inputs.branch }}

‎.github/workflows/trigger-breaking-change-alert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
trigger-notifier:
1313
if: contains(github.event.pull_request.labels.*.name, 'breaking')
1414
secrets: inherit
15-
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@main
15+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@release/25.12
1616
with:
1717
sender_login: ${{ github.event.sender.login }}
1818
sender_avatar: ${{ github.event.sender.avatar_url }}

‎RAPIDS_BRANCH‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
main
1+
release/25.12

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ cuvsCagraIndexParamsDestroy(index_params);
171171
cuvsResourcesDestroy(res);
172172
```
173173

174-
For more code examples of the C APIs, including drop-in Cmake project templates, please refer to the [C examples](https://github.com/rapidsai/cuvs/tree/main/examples/c)
174+
For more code examples of the C APIs, including drop-in Cmake project templates, please refer to the [C examples](https://github.com/rapidsai/cuvs/tree/release/25.12/examples/c)
175175

176176
### Rust API
177177

@@ -234,7 +234,7 @@ fn cagra_example() -> Result<()> {
234234
}
235235
```
236236

237-
For more code examples of the Rust APIs, including a drop-in project templates, please refer to the [Rust examples](https://github.com/rapidsai/cuvs/tree/main/examples/rust).
237+
For more code examples of the Rust APIs, including a drop-in project templates, please refer to the [Rust examples](https://github.com/rapidsai/cuvs/tree/release/25.12/examples/rust).
238238

239239
## Contributing
240240

‎docs/source/developer_guide.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ RAFT relies on `clang-format` to enforce code style across all C++ and CUDA sour
187187
1. Do not split empty functions/records/namespaces.
188188
2. Two-space indentation everywhere, including the line continuations.
189189
3. Disable reflowing of comments.
190-
The reasons behind these deviations from the Google style guide are given in comments [here](https://github.com/rapidsai/cuvs/blob/main/cpp/.clang-format).
190+
The reasons behind these deviations from the Google style guide are given in comments [here](https://github.com/rapidsai/cuvs/blob/release/25.12/cpp/.clang-format).
191191

192192
[`doxygen`](https://doxygen.nl/) is used as documentation generator and also as a documentation linter.
193193
In order to run doxygen as a linter on C++/CUDA code, run
@@ -205,7 +205,7 @@ you can run `codespell -i 3 -w .` from the repository root directory.
205205
This will bring up an interactive prompt to select which spelling fixes to apply.
206206

207207
### #include style
208-
[include_checker.py](https://github.com/rapidsai/cuvs/blob/main/cpp/scripts/include_checker.py) is used to enforce the include style as follows:
208+
[include_checker.py](https://github.com/rapidsai/cuvs/blob/release/25.12/cpp/scripts/include_checker.py) is used to enforce the include style as follows:
209209
1. `#include "..."` should be used for referencing local files only. It is acceptable to be used for referencing files in a sub-folder/parent-folder of the same algorithm, but should never be used to include files in other algorithms or between algorithms and the primitives or other dependencies.
210210
2. `#include <...>` should be used for referencing everything else
211211

‎python/cuvs_bench/cuvs_bench/plot/__main__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
# This script is inspired by
6-
# 1: https://github.com/erikbern/ann-benchmarks/blob/main/plot.py
7-
# 2: https://github.com/erikbern/ann-benchmarks/blob/main/ann_benchmarks/plotting/utils.py # noqa: E501
8-
# 3: https://github.com/erikbern/ann-benchmarks/blob/main/ann_benchmarks/plotting/metrics.py # noqa: E501
9-
# License: https://github.com/rapidsai/cuvs/blob/main/thirdparty/LICENSES/LICENSE.ann-benchmark # noqa: E501
6+
# 1: https://github.com/erikbern/ann-benchmarks/blob/release/25.12/plot.py
7+
# 2: https://github.com/erikbern/ann-benchmarks/blob/release/25.12/ann_benchmarks/plotting/utils.py # noqa: E501
8+
# 3: https://github.com/erikbern/ann-benchmarks/blob/release/25.12/ann_benchmarks/plotting/metrics.py # noqa: E501
9+
# License: https://github.com/rapidsai/cuvs/blob/release/25.12/thirdparty/LICENSES/LICENSE.ann-benchmark # noqa: E501
1010

1111
import itertools
1212
import os
@@ -502,7 +502,7 @@ def load_all_results(
502502
is_flag=True,
503503
help="Show raw results (not just Pareto frontier) of the mode argument.",
504504
)
505-
def main(
505+
def release/25.12(
506506
dataset: str,
507507
dataset_path: str,
508508
output_filepath: str,
@@ -603,4 +603,4 @@ def main(
603603

604604

605605
if __name__ == "__main__":
606-
main()
606+
release/25.12()

0 commit comments

Comments
 (0)