Skip to content

Commit 98b6fe0

Browse files
bdicebdice
authored
Finish CUDA 12.9 migration and use branch-25.06 workflows (#2669)
This PR reverts shared-workflows branches to `branch-25.06` and ensures builds use CUDA 12.8. CUDA 12.9 will be used in the test matrix but not for builds in RAPIDS 25.06. See rapidsai/build-planning#173 (comment) for more information. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Gil Forsyth (https://github.com/gforsyth) URL: #2669
1 parent 945f79d commit 98b6fe0

File tree

11 files changed

+52
-52
lines changed

11 files changed

+52
-52
lines changed

‎.devcontainer/cuda12.9-conda/devcontainer.json renamed to ‎.devcontainer/cuda12.8-conda/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"context": "${localWorkspaceFolder}/.devcontainer",
44
"dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
55
"args": {
6-
"CUDA": "12.9",
6+
"CUDA": "12.8",
77
"PYTHON_PACKAGE_MANAGER": "conda",
88
"BASE": "rapidsai/devcontainers:25.06-cpp-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.9-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.8-conda"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
@@ -20,7 +20,7 @@
2020
"overrideFeatureInstallOrder": [
2121
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
2222
],
23-
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.9-envs}"],
23+
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.8-envs}"],
2424
"postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
2525
"workspaceFolder": "/home/coder",
2626
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/raft,type=bind,consistency=consistent",
@@ -29,7 +29,7 @@
2929
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
3030
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
3131
"source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
32-
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.9-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
32+
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.8-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
3333
],
3434
"customizations": {
3535
"vscode": {

‎.devcontainer/cuda12.9-pip/devcontainer.json renamed to ‎.devcontainer/cuda12.8-pip/devcontainer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"context": "${localWorkspaceFolder}/.devcontainer",
44
"dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
55
"args": {
6-
"CUDA": "12.9",
6+
"CUDA": "12.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:25.06-cpp-cuda12.9-ucx1.18.0-openmpi-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:25.06-cpp-cuda12.8-ucx1.18.0-openmpi-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.9-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.8-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
1818
"ghcr.io/rapidsai/devcontainers/features/cuda:25.6": {
19-
"version": "12.9",
19+
"version": "12.8",
2020
"installcuBLAS": true,
2121
"installcuSOLVER": true,
2222
"installcuRAND": true,
@@ -29,15 +29,15 @@
2929
"ghcr.io/rapidsai/devcontainers/features/cuda",
3030
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
3131
],
32-
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.9-venvs}"],
32+
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.8-venvs}"],
3333
"postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
3434
"workspaceFolder": "/home/coder",
3535
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/raft,type=bind,consistency=consistent",
3636
"mounts": [
3737
"source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
3838
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
3939
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
40-
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.9-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent"
40+
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.8-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent"
4141
],
4242
"customizations": {
4343
"vscode": {

‎.github/workflows/build.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-12.9.0
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
3737
python-build:
3838
needs: [cpp-build]
3939
secrets: inherit
40-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda-12.9.0
40+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
4141
with:
4242
build_type: ${{ inputs.build_type || 'branch' }}
4343
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
upload-conda:
4747
needs: [cpp-build, python-build]
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@cuda-12.9.0
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.06
5050
with:
5151
build_type: ${{ inputs.build_type || 'branch' }}
5252
branch: ${{ inputs.branch }}
@@ -56,7 +56,7 @@ jobs:
5656
if: github.ref_type == 'branch'
5757
needs: python-build
5858
secrets: inherit
59-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-12.9.0
59+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
6060
with:
6161
arch: "amd64"
6262
branch: ${{ inputs.branch }}
@@ -68,7 +68,7 @@ jobs:
6868
sha: ${{ inputs.sha }}
6969
wheel-build-libraft:
7070
secrets: inherit
71-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.9.0
71+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
7272
with:
7373
build_type: ${{ inputs.build_type || 'branch' }}
7474
branch: ${{ inputs.branch }}
@@ -82,7 +82,7 @@ jobs:
8282
wheel-publish-libraft:
8383
needs: wheel-build-libraft
8484
secrets: inherit
85-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-12.9.0
85+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
8686
with:
8787
build_type: ${{ inputs.build_type || 'branch' }}
8888
branch: ${{ inputs.branch }}
@@ -93,7 +93,7 @@ jobs:
9393
wheel-build-pylibraft:
9494
needs: wheel-build-libraft
9595
secrets: inherit
96-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.9.0
96+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
9797
with:
9898
build_type: ${{ inputs.build_type || 'branch' }}
9999
branch: ${{ inputs.branch }}
@@ -105,7 +105,7 @@ jobs:
105105
wheel-publish-pylibraft:
106106
needs: wheel-build-pylibraft
107107
secrets: inherit
108-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-12.9.0
108+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
109109
with:
110110
build_type: ${{ inputs.build_type || 'branch' }}
111111
branch: ${{ inputs.branch }}
@@ -116,7 +116,7 @@ jobs:
116116
wheel-build-raft-dask:
117117
needs: wheel-build-libraft
118118
secrets: inherit
119-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.9.0
119+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
120120
with:
121121
build_type: ${{ inputs.build_type || 'branch' }}
122122
branch: ${{ inputs.branch }}
@@ -128,7 +128,7 @@ jobs:
128128
wheel-publish-raft-dask:
129129
needs: wheel-build-raft-dask
130130
secrets: inherit
131-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-12.9.0
131+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
132132
with:
133133
build_type: ${{ inputs.build_type || 'branch' }}
134134
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml

Lines changed: 16 additions & 16 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@cuda-12.9.0
32+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.06
3333
if: always()
3434
with:
3535
needs: ${{ toJSON(needs) }}
@@ -59,7 +59,7 @@ jobs:
5959
changed-files:
6060
secrets: inherit
6161
needs: telemetry-setup
62-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@cuda-12.9.0
62+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.06
6363
with:
6464
files_yaml: |
6565
test_cpp:
@@ -84,48 +84,48 @@ jobs:
8484
checks:
8585
secrets: inherit
8686
needs: telemetry-setup
87-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@cuda-12.9.0
87+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.06
8888
with:
8989
enable_check_generated_files: false
9090
ignored_pr_jobs: telemetry-summarize
9191
conda-cpp-build:
9292
needs: checks
9393
secrets: inherit
94-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-12.9.0
94+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06
9595
with:
9696
build_type: pull-request
9797
node_type: cpu16
9898
conda-cpp-tests:
9999
needs: [conda-cpp-build, changed-files]
100100
secrets: inherit
101-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-12.9.0
101+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.06
102102
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
103103
with:
104104
build_type: pull-request
105105
conda-cpp-checks:
106106
needs: conda-cpp-build
107107
secrets: inherit
108-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@cuda-12.9.0
108+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-25.06
109109
with:
110110
build_type: pull-request
111111
enable_check_symbols: true
112112
conda-python-build:
113113
needs: conda-cpp-build
114114
secrets: inherit
115-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda-12.9.0
115+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
116116
with:
117117
build_type: pull-request
118118
conda-python-tests:
119119
needs: [conda-python-build, changed-files]
120120
secrets: inherit
121-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-12.9.0
121+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
122122
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
123123
with:
124124
build_type: pull-request
125125
docs-build:
126126
needs: conda-python-build
127127
secrets: inherit
128-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-12.9.0
128+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
129129
with:
130130
build_type: pull-request
131131
node_type: "gpu-l4-latest-1"
@@ -135,7 +135,7 @@ jobs:
135135
wheel-build-libraft:
136136
needs: checks
137137
secrets: inherit
138-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.9.0
138+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
139139
with:
140140
build_type: pull-request
141141
branch: ${{ inputs.branch }}
@@ -149,7 +149,7 @@ jobs:
149149
wheel-build-pylibraft:
150150
needs: [checks, wheel-build-libraft]
151151
secrets: inherit
152-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.9.0
152+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
153153
with:
154154
build_type: pull-request
155155
script: ci/build_wheel_pylibraft.sh
@@ -158,15 +158,15 @@ jobs:
158158
wheel-tests-pylibraft:
159159
needs: [wheel-build-pylibraft, changed-files]
160160
secrets: inherit
161-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.9.0
161+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
162162
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
163163
with:
164164
build_type: pull-request
165165
script: ci/test_wheel_pylibraft.sh
166166
wheel-build-raft-dask:
167167
needs: [checks, wheel-build-libraft]
168168
secrets: inherit
169-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.9.0
169+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
170170
with:
171171
build_type: pull-request
172172
script: "ci/build_wheel_raft_dask.sh"
@@ -175,18 +175,18 @@ jobs:
175175
wheel-tests-raft-dask:
176176
needs: [wheel-build-raft-dask, changed-files]
177177
secrets: inherit
178-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.9.0
178+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
179179
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
180180
with:
181181
build_type: pull-request
182182
script: ci/test_wheel_raft_dask.sh
183183
devcontainer:
184184
needs: telemetry-setup
185185
secrets: inherit
186-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@cuda-12.9.0
186+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.06
187187
with:
188188
arch: '["amd64"]'
189-
cuda: '["12.9"]'
189+
cuda: '["12.8"]'
190190
build_command: |
191191
sccache -z;
192192
build-all -DBUILD_PRIMS_BENCH=ON --verbose;

‎.github/workflows/test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
conda-cpp-checks:
2121
secrets: inherit
22-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@cuda-12.9.0
22+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-25.06
2323
with:
2424
build_type: ${{ inputs.build_type }}
2525
branch: ${{ inputs.branch }}
@@ -28,23 +28,23 @@ jobs:
2828
enable_check_symbols: true
2929
conda-cpp-tests:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-12.9.0
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.06
3232
with:
3333
build_type: ${{ inputs.build_type }}
3434
branch: ${{ inputs.branch }}
3535
date: ${{ inputs.date }}
3636
sha: ${{ inputs.sha }}
3737
conda-python-tests:
3838
secrets: inherit
39-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-12.9.0
39+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
4040
with:
4141
build_type: ${{ inputs.build_type }}
4242
branch: ${{ inputs.branch }}
4343
date: ${{ inputs.date }}
4444
sha: ${{ inputs.sha }}
4545
wheel-tests-pylibraft:
4646
secrets: inherit
47-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.9.0
47+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
4848
with:
4949
build_type: ${{ inputs.build_type }}
5050
branch: ${{ inputs.branch }}
@@ -53,7 +53,7 @@ jobs:
5353
script: ci/test_wheel_pylibraft.sh
5454
wheel-tests-raft-dask:
5555
secrets: inherit
56-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.9.0
56+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
5757
with:
5858
build_type: ${{ inputs.build_type }}
5959
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@cuda-12.9.0
15+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-25.06
1616
with:
1717
sender_login: ${{ github.event.sender.login }}
1818
sender_avatar: ${{ github.event.sender.avatar_url }}

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,15 +240,15 @@ mamba install -c rapidsai -c conda-forge -c nvidia raft-dask pylibraft cuda-vers
240240

241241
```bash
242242
# for CUDA 12.5
243-
mamba install -c rapidsai -c conda-forge -c nvidia raft-dask pylibraft cuda-version=12.9
243+
mamba install -c rapidsai -c conda-forge -c nvidia raft-dask pylibraft cuda-version=12.8
244244
```
245245

246246
Note that the above commands will also install `libraft-headers` and `libraft`.
247247

248248
You can also install the conda packages individually using the `mamba` command above. For example, if you'd like to install RAFT's headers and pre-compiled shared library to use in your project:
249249
```bash
250250
# for CUDA 12.5
251-
mamba install -c rapidsai -c conda-forge -c nvidia libraft libraft-headers cuda-version=12.9
251+
mamba install -c rapidsai -c conda-forge -c nvidia libraft libraft-headers cuda-version=12.8
252252
```
253253

254254
### Installing Python through Pip

‎conda/environments/all_cuda-129_arch-aarch64.yaml renamed to ‎conda/environments/all_cuda-128_arch-aarch64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
- cuda-nvtx-dev
1818
- cuda-profiler-api
1919
- cuda-python>=12.6.2,<13.0a0
20-
- cuda-version=12.9
20+
- cuda-version=12.8
2121
- cupy>=12.0.0
2222
- cxx-compiler
2323
- cython>=3.0.0,<3.1.0a0
@@ -54,4 +54,4 @@ dependencies:
5454
- sphinx<8.2.0
5555
- sysroot_linux-aarch64==2.28
5656
- ucx-py==0.44.*,>=0.0.0a0
57-
name: all_cuda-129_arch-aarch64
57+
name: all_cuda-128_arch-aarch64

0 commit comments

Comments
 (0)