Skip to content

Commit 3c7cae9

Browse files
viclafargueviclafargue
authored
Merge branch 'release/26.04' into refcounted-rmm-pools-for-snmg
2 parents 87d4e90 + b2405c5 commit 3c7cae9

File tree

14 files changed

+343
-260
lines changed

14 files changed

+343
-260
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ concurrency:
3535
jobs:
3636
cpp-build:
3737
secrets: inherit
38-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@python-3.14
38+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/26.04
3939
with:
4040
build_type: ${{ inputs.build_type || 'branch' }}
4141
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
python-build:
4747
needs: [cpp-build]
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.14
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.04
5050
with:
5151
build_type: ${{ inputs.build_type || 'branch' }}
5252
branch: ${{ inputs.branch }}
@@ -58,7 +58,7 @@ jobs:
5858
upload-conda:
5959
needs: [cpp-build, python-build]
6060
secrets: inherit
61-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@python-3.14
61+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/26.04
6262
with:
6363
build_type: ${{ inputs.build_type || 'branch' }}
6464
branch: ${{ inputs.branch }}
@@ -68,7 +68,7 @@ jobs:
6868
if: github.ref_type == 'branch'
6969
needs: python-build
7070
secrets: inherit
71-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.14
71+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
7272
with:
7373
arch: "amd64"
7474
branch: ${{ inputs.branch }}
@@ -80,7 +80,7 @@ jobs:
8080
sha: ${{ inputs.sha }}
8181
wheel-build-libraft:
8282
secrets: inherit
83-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
83+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
8484
with:
8585
build_type: ${{ inputs.build_type || 'branch' }}
8686
branch: ${{ inputs.branch }}
@@ -95,7 +95,7 @@ jobs:
9595
wheel-publish-libraft:
9696
needs: wheel-build-libraft
9797
secrets: inherit
98-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@python-3.14
98+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.04
9999
with:
100100
build_type: ${{ inputs.build_type || 'branch' }}
101101
branch: ${{ inputs.branch }}
@@ -106,7 +106,7 @@ jobs:
106106
wheel-build-pylibraft:
107107
needs: wheel-build-libraft
108108
secrets: inherit
109-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
109+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
110110
with:
111111
build_type: ${{ inputs.build_type || 'branch' }}
112112
branch: ${{ inputs.branch }}
@@ -121,7 +121,7 @@ jobs:
121121
wheel-publish-pylibraft:
122122
needs: wheel-build-pylibraft
123123
secrets: inherit
124-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@python-3.14
124+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.04
125125
with:
126126
build_type: ${{ inputs.build_type || 'branch' }}
127127
branch: ${{ inputs.branch }}
@@ -133,7 +133,7 @@ jobs:
133133
wheel-build-raft-dask:
134134
needs: wheel-build-libraft
135135
secrets: inherit
136-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
136+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
137137
with:
138138
build_type: ${{ inputs.build_type || 'branch' }}
139139
branch: ${{ inputs.branch }}
@@ -148,7 +148,7 @@ jobs:
148148
wheel-publish-raft-dask:
149149
needs: wheel-build-raft-dask
150150
secrets: inherit
151-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@python-3.14
151+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.04
152152
with:
153153
build_type: ${{ inputs.build_type || 'branch' }}
154154
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- devcontainer
2727
- telemetry-setup
2828
secrets: inherit
29-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@python-3.14
29+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/26.04
3030
if: always()
3131
with:
3232
needs: ${{ toJSON(needs) }}
@@ -60,7 +60,7 @@ jobs:
6060
changed-files:
6161
secrets: inherit
6262
needs: telemetry-setup
63-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@python-3.14
63+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@release/26.04
6464
with:
6565
files_yaml: |
6666
build_docs:
@@ -167,36 +167,36 @@ jobs:
167167
checks:
168168
secrets: inherit
169169
needs: telemetry-setup
170-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@python-3.14
170+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/26.04
171171
with:
172172
enable_check_generated_files: false
173173
ignored_pr_jobs: telemetry-summarize
174174
conda-cpp-build:
175175
needs: checks
176176
secrets: inherit
177-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@python-3.14
177+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/26.04
178178
with:
179179
build_type: pull-request
180180
script: ci/build_cpp.sh
181181
node_type: cpu16
182182
conda-cpp-tests:
183183
needs: [conda-cpp-build, changed-files]
184184
secrets: inherit
185-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@python-3.14
185+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/26.04
186186
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
187187
with:
188188
build_type: pull-request
189189
script: ci/test_cpp.sh
190190
conda-cpp-checks:
191191
needs: conda-cpp-build
192192
secrets: inherit
193-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@python-3.14
193+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@release/26.04
194194
with:
195195
build_type: pull-request
196196
conda-python-build:
197197
needs: conda-cpp-build
198198
secrets: inherit
199-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.14
199+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.04
200200
with:
201201
build_type: pull-request
202202
script: ci/build_python.sh
@@ -205,15 +205,15 @@ jobs:
205205
conda-python-tests:
206206
needs: [conda-python-build, changed-files]
207207
secrets: inherit
208-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.14
208+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.04
209209
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_conda
210210
with:
211211
build_type: pull-request
212212
script: ci/test_python.sh
213213
docs-build:
214214
needs: [conda-python-build, changed-files]
215215
secrets: inherit
216-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.14
216+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
217217
if: fromJSON(needs.changed-files.outputs.changed_file_groups).build_docs
218218
with:
219219
build_type: pull-request
@@ -224,7 +224,7 @@ jobs:
224224
wheel-build-libraft:
225225
needs: checks
226226
secrets: inherit
227-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
227+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
228228
with:
229229
build_type: pull-request
230230
branch: ${{ inputs.branch }}
@@ -239,7 +239,7 @@ jobs:
239239
wheel-build-pylibraft:
240240
needs: [checks, wheel-build-libraft]
241241
secrets: inherit
242-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
242+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
243243
with:
244244
build_type: pull-request
245245
node_type: cpu8
@@ -251,15 +251,15 @@ jobs:
251251
wheel-tests-pylibraft:
252252
needs: [wheel-build-pylibraft, changed-files]
253253
secrets: inherit
254-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.14
254+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
255255
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
256256
with:
257257
build_type: pull-request
258258
script: ci/test_wheel_pylibraft.sh
259259
wheel-build-raft-dask:
260260
needs: [checks, wheel-build-libraft]
261261
secrets: inherit
262-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.14
262+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
263263
with:
264264
build_type: pull-request
265265
node_type: cpu8
@@ -271,15 +271,15 @@ jobs:
271271
wheel-tests-raft-dask:
272272
needs: [wheel-build-raft-dask, changed-files]
273273
secrets: inherit
274-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.14
274+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
275275
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
276276
with:
277277
build_type: pull-request
278278
script: ci/test_wheel_raft_dask.sh
279279
devcontainer:
280280
needs: telemetry-setup
281281
secrets: inherit
282-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@python-3.14
282+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@release/26.04
283283
with:
284284
arch: '["amd64", "arm64"]'
285285
cuda: '["13.1"]'

‎.github/workflows/test.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ on:
2525
jobs:
2626
conda-cpp-checks:
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@python-3.14
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@release/26.04
2929
with:
3030
build_type: ${{ inputs.build_type }}
3131
branch: ${{ inputs.branch }}
3232
date: ${{ inputs.date }}
3333
sha: ${{ inputs.sha }}
3434
conda-cpp-tests:
3535
secrets: inherit
36-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@python-3.14
36+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/26.04
3737
with:
3838
build_type: ${{ inputs.build_type }}
3939
branch: ${{ inputs.branch }}
@@ -42,7 +42,7 @@ jobs:
4242
sha: ${{ inputs.sha }}
4343
conda-python-tests:
4444
secrets: inherit
45-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.14
45+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.04
4646
with:
4747
build_type: ${{ inputs.build_type }}
4848
branch: ${{ inputs.branch }}
@@ -51,7 +51,7 @@ jobs:
5151
sha: ${{ inputs.sha }}
5252
wheel-tests-pylibraft:
5353
secrets: inherit
54-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.14
54+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
5555
with:
5656
build_type: ${{ inputs.build_type }}
5757
branch: ${{ inputs.branch }}
@@ -60,7 +60,7 @@ jobs:
6060
script: ci/test_wheel_pylibraft.sh
6161
wheel-tests-raft-dask:
6262
secrets: inherit
63-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.14
63+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
6464
with:
6565
build_type: ${{ inputs.build_type }}
6666
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@python-3.14
15+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@release/26.04
1616
with:
1717
sender_login: ${{ github.event.sender.login }}
1818
sender_avatar: ${{ github.event.sender.avatar_url }}

‎.pre-commit-config.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,31 @@ repos:
150150
- id: verify-codeowners
151151
args: [--fix, --project-prefix=raft]
152152
- id: verify-hardcoded-version
153+
exclude: |
154+
(?x)
155+
(^|/)devcontainer[.]json$|
156+
(^|/)dependencies[.]yaml$|
157+
^[.]github/(workflows|ISSUE_TEMPLATE)/|
158+
(^|/)pom[.]xml$|
159+
^[.]pre-commit-config[.]yaml$|
160+
^conda/environments/|
161+
(^|/)UCXX_BRANCH$|
162+
(^|/)RAPIDS_BRANCH$|
163+
[.](md|rst)$
153164
- id: verify-hardcoded-version
154165
name: verify-hardcoded-version-ucxx
155166
args: [--fix, --version-file=UCXX_VERSION]
167+
exclude: |
168+
(?x)
169+
(^|/)devcontainer[.]json$|
170+
(^|/)dependencies[.]yaml$|
171+
^[.]github/(workflows|ISSUE_TEMPLATE)/|
172+
(^|/)pom[.]xml$|
173+
^[.]pre-commit-config[.]yaml$|
174+
^conda/environments/|
175+
(^|/)UCXX_BRANCH$|
176+
(^|/)RAPIDS_BRANCH$|
177+
[.](md|rst)$
156178
- id: verify-pyproject-license
157179
# ignore the top-level pyproject.toml, which doesn't
158180
# have or need a [project] table

‎RAPIDS_BRANCH‎

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

‎UCXX_BRANCH‎

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

0 commit comments

Comments
 (0)