Skip to content

Commit a422e94

Browse files
cjnoletcjnolet
authored
Merge branch 'main' into fix-sort-columns-per-row
2 parents f65142a + c38237f commit a422e94

11 files changed

Lines changed: 61 additions & 52 deletions

File tree

.devcontainer/cuda13.1-conda/devcontainer.json renamed to .devcontainer/cuda13.2-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": "13.1",
6+
"CUDA": "13.2",
77
"PYTHON_PACKAGE_MANAGER": "conda",
88
"BASE": "rapidsai/devcontainers:26.06-cpp-mambaforge"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.06-cuda13.1-conda",
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.06-cuda13.2-conda",
1515
"--ulimit",
1616
"nofile=500000"
1717
],
@@ -22,7 +22,7 @@
2222
"overrideFeatureInstallOrder": [
2323
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
2424
],
25-
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda13.1-envs}"],
25+
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda13.2-envs}"],
2626
"postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
2727
"workspaceFolder": "/home/coder",
2828
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/raft,type=bind,consistency=consistent",
@@ -31,7 +31,7 @@
3131
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
3232
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
3333
"source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
34-
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda13.1-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
34+
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda13.2-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
3535
],
3636
"customizations": {
3737
"vscode": {

.devcontainer/cuda13.1-pip/devcontainer.json renamed to .devcontainer/cuda13.2-pip/devcontainer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
"context": "${localWorkspaceFolder}/.devcontainer",
44
"dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
55
"args": {
6-
"CUDA": "13.1",
6+
"CUDA": "13.2",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:26.06-cpp-cuda13.1-ucx1.19.0-openmpi5.0.10"
8+
"BASE": "rapidsai/devcontainers:26.06-cpp-cuda13.2-ucx1.19.0-openmpi5.0.10"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.06-cuda13.1-pip",
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.06-cuda13.2-pip",
1515
"--ulimit",
1616
"nofile=500000"
1717
],
1818
"hostRequirements": {"gpu": "optional"},
1919
"features": {
2020
"ghcr.io/rapidsai/devcontainers/features/cuda:26.6": {
21-
"version": "13.1",
21+
"version": "13.2",
2222
"installcuBLAS": true,
2323
"installcuSOLVER": true,
2424
"installcuRAND": true,
@@ -31,15 +31,15 @@
3131
"ghcr.io/rapidsai/devcontainers/features/cuda",
3232
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
3333
],
34-
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda13.1-venvs}"],
34+
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda13.2-venvs}"],
3535
"postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
3636
"workspaceFolder": "/home/coder",
3737
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/raft,type=bind,consistency=consistent",
3838
"mounts": [
3939
"source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
4040
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
4141
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
42-
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda13.1-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent"
42+
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda13.2-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent"
4343
],
4444
"customizations": {
4545
"vscode": {

‎.github/workflows/build.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
packages: read
4444
pull-requests: read
4545
secrets: inherit # zizmor: ignore[secrets-inherit]
46-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
46+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-13.2.0
4747
with:
4848
build_type: ${{ inputs.build_type || 'branch' }}
4949
branch: ${{ inputs.branch }}
@@ -60,7 +60,7 @@ jobs:
6060
packages: read
6161
pull-requests: read
6262
secrets: inherit # zizmor: ignore[secrets-inherit]
63-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
63+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda-13.2.0
6464
with:
6565
build_type: ${{ inputs.build_type || 'branch' }}
6666
branch: ${{ inputs.branch }}
@@ -78,7 +78,7 @@ jobs:
7878
packages: read
7979
pull-requests: read
8080
secrets: inherit # zizmor: ignore[secrets-inherit]
81-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
81+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@cuda-13.2.0
8282
with:
8383
build_type: ${{ inputs.build_type || 'branch' }}
8484
branch: ${{ inputs.branch }}
@@ -94,7 +94,7 @@ jobs:
9494
packages: read
9595
pull-requests: read
9696
secrets: inherit # zizmor: ignore[secrets-inherit]
97-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
97+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-13.2.0
9898
with:
9999
arch: "amd64"
100100
branch: ${{ inputs.branch }}
@@ -112,7 +112,7 @@ jobs:
112112
packages: read
113113
pull-requests: read
114114
secrets: inherit # zizmor: ignore[secrets-inherit]
115-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
115+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
116116
with:
117117
build_type: ${{ inputs.build_type || 'branch' }}
118118
branch: ${{ inputs.branch }}
@@ -133,7 +133,7 @@ jobs:
133133
packages: read
134134
pull-requests: read
135135
secrets: inherit # zizmor: ignore[secrets-inherit]
136-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
136+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-13.2.0
137137
with:
138138
build_type: ${{ inputs.build_type || 'branch' }}
139139
branch: ${{ inputs.branch }}
@@ -150,7 +150,7 @@ jobs:
150150
packages: read
151151
pull-requests: read
152152
secrets: inherit # zizmor: ignore[secrets-inherit]
153-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
153+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
154154
with:
155155
build_type: ${{ inputs.build_type || 'branch' }}
156156
branch: ${{ inputs.branch }}
@@ -171,7 +171,7 @@ jobs:
171171
packages: read
172172
pull-requests: read
173173
secrets: inherit # zizmor: ignore[secrets-inherit]
174-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
174+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-13.2.0
175175
with:
176176
build_type: ${{ inputs.build_type || 'branch' }}
177177
branch: ${{ inputs.branch }}
@@ -189,7 +189,7 @@ jobs:
189189
packages: read
190190
pull-requests: read
191191
secrets: inherit # zizmor: ignore[secrets-inherit]
192-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
192+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
193193
with:
194194
build_type: ${{ inputs.build_type || 'branch' }}
195195
branch: ${{ inputs.branch }}
@@ -210,7 +210,7 @@ jobs:
210210
packages: read
211211
pull-requests: read
212212
secrets: inherit # zizmor: ignore[secrets-inherit]
213-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
213+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-13.2.0
214214
with:
215215
build_type: ${{ inputs.build_type || 'branch' }}
216216
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
packages: read
3434
pull-requests: read
3535
secrets: inherit # zizmor: ignore[secrets-inherit]
36-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
36+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@cuda-13.2.0
3737
if: always()
3838
with:
3939
needs: ${{ toJSON(needs) }}
@@ -77,7 +77,7 @@ jobs:
7777
packages: read
7878
pull-requests: read
7979
secrets: inherit # zizmor: ignore[secrets-inherit]
80-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@main
80+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@cuda-13.2.0
8181
with:
8282
files_yaml: |
8383
build_docs:
@@ -190,7 +190,7 @@ jobs:
190190
packages: read
191191
pull-requests: read
192192
secrets: inherit # zizmor: ignore[secrets-inherit]
193-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
193+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@cuda-13.2.0
194194
with:
195195
enable_check_generated_files: false
196196
ignored_pr_jobs: telemetry-summarize
@@ -203,7 +203,7 @@ jobs:
203203
packages: read
204204
pull-requests: read
205205
secrets: inherit # zizmor: ignore[secrets-inherit]
206-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
206+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-13.2.0
207207
with:
208208
build_type: pull-request
209209
script: ci/build_cpp.sh
@@ -217,7 +217,7 @@ jobs:
217217
packages: read
218218
pull-requests: read
219219
secrets: inherit # zizmor: ignore[secrets-inherit]
220-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
220+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-13.2.0
221221
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
222222
with:
223223
build_type: pull-request
@@ -231,7 +231,7 @@ jobs:
231231
packages: read
232232
pull-requests: read
233233
secrets: inherit # zizmor: ignore[secrets-inherit]
234-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@main
234+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@cuda-13.2.0
235235
with:
236236
build_type: pull-request
237237
conda-python-build:
@@ -243,7 +243,7 @@ jobs:
243243
packages: read
244244
pull-requests: read
245245
secrets: inherit # zizmor: ignore[secrets-inherit]
246-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
246+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda-13.2.0
247247
with:
248248
build_type: pull-request
249249
script: ci/build_python.sh
@@ -258,7 +258,7 @@ jobs:
258258
packages: read
259259
pull-requests: read
260260
secrets: inherit # zizmor: ignore[secrets-inherit]
261-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
261+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-13.2.0
262262
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_conda
263263
with:
264264
build_type: pull-request
@@ -272,7 +272,7 @@ jobs:
272272
packages: read
273273
pull-requests: read
274274
secrets: inherit # zizmor: ignore[secrets-inherit]
275-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
275+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-13.2.0
276276
if: fromJSON(needs.changed-files.outputs.changed_file_groups).build_docs
277277
with:
278278
build_type: pull-request
@@ -289,7 +289,7 @@ jobs:
289289
packages: read
290290
pull-requests: read
291291
secrets: inherit # zizmor: ignore[secrets-inherit]
292-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
292+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
293293
with:
294294
build_type: pull-request
295295
branch: ${{ inputs.branch }}
@@ -310,7 +310,7 @@ jobs:
310310
packages: read
311311
pull-requests: read
312312
secrets: inherit # zizmor: ignore[secrets-inherit]
313-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
313+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
314314
with:
315315
build_type: pull-request
316316
node_type: cpu8
@@ -328,7 +328,7 @@ jobs:
328328
packages: read
329329
pull-requests: read
330330
secrets: inherit # zizmor: ignore[secrets-inherit]
331-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
331+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-13.2.0
332332
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
333333
with:
334334
build_type: pull-request
@@ -342,7 +342,7 @@ jobs:
342342
packages: read
343343
pull-requests: read
344344
secrets: inherit # zizmor: ignore[secrets-inherit]
345-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
345+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-13.2.0
346346
with:
347347
build_type: pull-request
348348
node_type: cpu8
@@ -360,7 +360,7 @@ jobs:
360360
packages: read
361361
pull-requests: read
362362
secrets: inherit # zizmor: ignore[secrets-inherit]
363-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
363+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-13.2.0
364364
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
365365
with:
366366
build_type: pull-request
@@ -374,10 +374,10 @@ jobs:
374374
packages: read
375375
pull-requests: read
376376
secrets: inherit # zizmor: ignore[secrets-inherit]
377-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@main
377+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@cuda-13.2.0
378378
with:
379379
arch: '["amd64", "arm64"]'
380-
cuda: '["13.1"]'
380+
cuda: '["13.2"]'
381381
node_type: "cpu8"
382382
env: |
383383
SCCACHE_DIST_MAX_RETRIES=inf

‎.github/workflows/test.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
packages: read
3434
pull-requests: read
3535
secrets: inherit # zizmor: ignore[secrets-inherit]
36-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@main
36+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@cuda-13.2.0
3737
with:
3838
build_type: ${{ inputs.build_type }}
3939
branch: ${{ inputs.branch }}
@@ -47,7 +47,7 @@ jobs:
4747
packages: read
4848
pull-requests: read
4949
secrets: inherit # zizmor: ignore[secrets-inherit]
50-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
50+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-13.2.0
5151
with:
5252
build_type: ${{ inputs.build_type }}
5353
branch: ${{ inputs.branch }}
@@ -62,7 +62,7 @@ jobs:
6262
packages: read
6363
pull-requests: read
6464
secrets: inherit # zizmor: ignore[secrets-inherit]
65-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
65+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-13.2.0
6666
with:
6767
build_type: ${{ inputs.build_type }}
6868
branch: ${{ inputs.branch }}
@@ -77,7 +77,7 @@ jobs:
7777
packages: read
7878
pull-requests: read
7979
secrets: inherit # zizmor: ignore[secrets-inherit]
80-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
80+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-13.2.0
8181
with:
8282
build_type: ${{ inputs.build_type }}
8383
branch: ${{ inputs.branch }}
@@ -92,7 +92,7 @@ jobs:
9292
packages: read
9393
pull-requests: read
9494
secrets: inherit # zizmor: ignore[secrets-inherit]
95-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
95+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-13.2.0
9696
with:
9797
build_type: ${{ inputs.build_type }}
9898
branch: ${{ inputs.branch }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
packages: read
2222
pull-requests: read
2323
secrets: inherit # zizmor: ignore[secrets-inherit]
24-
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@main
24+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@cuda-13.2.0
2525
with:
2626
sender_login: ${{ github.event.sender.login }}
2727
sender_avatar: ${{ github.event.sender.avatar_url }}

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Use the following command, depending on your CUDA version, to install all of the
213213

214214
```bash
215215
# CUDA 13
216-
mamba install -c rapidsai -c conda-forge raft-dask pylibraft cuda-version=13.1
216+
mamba install -c rapidsai -c conda-forge raft-dask pylibraft cuda-version=13.2
217217

218218
# CUDA 12
219219
mamba install -c rapidsai -c conda-forge raft-dask pylibraft cuda-version=12.9
@@ -225,7 +225,7 @@ You can also install the conda packages individually using the `mamba` command a
225225

226226
```bash
227227
# CUDA 13
228-
mamba install -c rapidsai -c conda-forge libraft libraft-headers cuda-version=13.1
228+
mamba install -c rapidsai -c conda-forge libraft libraft-headers cuda-version=13.2
229229

230230
# CUDA 12
231231
mamba install -c rapidsai -c conda-forge libraft libraft-headers cuda-version=12.9

conda/environments/all_cuda-131_arch-aarch64.yaml renamed to conda/environments/all_cuda-132_arch-aarch64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- cuda-nvtx-dev
1515
- cuda-profiler-api
1616
- cuda-python>=13.0.1,<14.0
17-
- cuda-version=13.1
17+
- cuda-version=13.2
1818
- cupy>=13.6.0
1919
- cxx-compiler
2020
- cython>=3.2.2
@@ -51,4 +51,4 @@ dependencies:
5151
- sysroot_linux-aarch64==2.28
5252
- pip:
5353
- nvidia-sphinx-theme
54-
name: all_cuda-131_arch-aarch64
54+
name: all_cuda-132_arch-aarch64

0 commit comments

Comments
 (0)