Skip to content

Commit 2cafc81

Browse files
KyleFromNVIDIAKyleFromNVIDIA
authored
Build and test with CUDA 12.5.1 (rapidsai#1607)
This PR updates the latest CUDA build/test version 12.2.2 to 12.5.1. Contributes to rapidsai/build-planning#73 Authors: - Kyle Edwards (https://github.com/KyleFromNVIDIA) - https://github.com/jakirkham Approvers: - https://github.com/jakirkham - James Lamb (https://github.com/jameslamb) URL: rapidsai#1607
1 parent 4299608 commit 2cafc81

File tree

7 files changed

+39
-35
lines changed

7 files changed

+39
-35
lines changed

‎.devcontainer/cuda12.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": "12.2",
6+
"CUDA": "12.5",
77
"PYTHON_PACKAGE_MANAGER": "conda",
88
"BASE": "rapidsai/devcontainers:24.08-cpp-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.2-conda"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.5-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.2-envs}"],
23+
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.5-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/rmm,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.2-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
32+
"source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.5-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
3333
],
3434
"customizations": {
3535
"vscode": {

‎.devcontainer/cuda12.2-pip/devcontainer.json‎

Lines changed: 5 additions & 5 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.2",
6+
"CUDA": "12.5",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:24.08-cpp-cuda12.2-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:24.08-cpp-cuda12.5-ubuntu22.04"
99
}
1010
},
1111
"runArgs": [
1212
"--rm",
1313
"--name",
14-
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.2-pip"
14+
"${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.08-cuda12.5-pip"
1515
],
1616
"hostRequirements": {"gpu": "optional"},
1717
"features": {
@@ -20,15 +20,15 @@
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/pip,local/share/${localWorkspaceFolderBasename}-cuda12.2-venvs}"],
23+
"initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.5-venvs}"],
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/rmm,type=bind,consistency=consistent",
2727
"mounts": [
2828
"source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
2929
"source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
3030
"source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
31-
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.2-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent"
31+
"source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.5-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent"
3232
],
3333
"customizations": {
3434
"vscode": {

‎.github/workflows/build.yaml‎

Lines changed: 8 additions & 8 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@branch-24.08
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-12.5.1
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@branch-24.08
40+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda-12.5.1
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@branch-24.08
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@cuda-12.5.1
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@branch-24.08
59+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-12.5.1
6060
with:
6161
build_type: ${{ inputs.build_type || 'branch' }}
6262
branch: ${{ inputs.branch }}
@@ -68,7 +68,7 @@ jobs:
6868
run_script: "ci/build_docs.sh"
6969
wheel-build-cpp:
7070
secrets: inherit
71-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.08
71+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.5.1
7272
with:
7373
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
7474
build_type: ${{ inputs.build_type || 'branch' }}
@@ -79,7 +79,7 @@ jobs:
7979
wheel-build-python:
8080
needs: wheel-build-cpp
8181
secrets: inherit
82-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.08
82+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.5.1
8383
with:
8484
build_type: ${{ inputs.build_type || 'branch' }}
8585
branch: ${{ inputs.branch }}
@@ -89,7 +89,7 @@ jobs:
8989
wheel-publish-cpp:
9090
needs: wheel-build-cpp
9191
secrets: inherit
92-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.08
92+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-12.5.1
9393
with:
9494
build_type: ${{ inputs.build_type || 'branch' }}
9595
branch: ${{ inputs.branch }}
@@ -100,7 +100,7 @@ jobs:
100100
wheel-publish-python:
101101
needs: wheel-build-python
102102
secrets: inherit
103-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.08
103+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-12.5.1
104104
with:
105105
build_type: ${{ inputs.build_type || 'branch' }}
106106
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,40 +23,40 @@ jobs:
2323
- wheel-tests
2424
- devcontainer
2525
secrets: inherit
26-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.08
26+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@cuda-12.5.1
2727
checks:
2828
secrets: inherit
29-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.08
29+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@cuda-12.5.1
3030
with:
3131
enable_check_generated_files: false
3232
conda-cpp-build:
3333
needs: checks
3434
secrets: inherit
35-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.08
35+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-12.5.1
3636
with:
3737
build_type: pull-request
3838
conda-cpp-tests:
3939
needs: conda-cpp-build
4040
secrets: inherit
41-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.08
41+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-12.5.1
4242
with:
4343
build_type: pull-request
4444
conda-python-build:
4545
needs: conda-cpp-build
4646
secrets: inherit
47-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.08
47+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda-12.5.1
4848
with:
4949
build_type: pull-request
5050
conda-python-tests:
5151
needs: conda-python-build
5252
secrets: inherit
53-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.08
53+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-12.5.1
5454
with:
5555
build_type: pull-request
5656
docs-build:
5757
needs: conda-python-build
5858
secrets: inherit
59-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.08
59+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-12.5.1
6060
with:
6161
build_type: pull-request
6262
node_type: "gpu-v100-latest-1"
@@ -66,31 +66,31 @@ jobs:
6666
wheel-build-cpp:
6767
needs: checks
6868
secrets: inherit
69-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.08
69+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.5.1
7070
with:
7171
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
7272
build_type: pull-request
7373
script: ci/build_wheel_cpp.sh
7474
wheel-build-python:
7575
needs: wheel-build-cpp
7676
secrets: inherit
77-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.08
77+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.5.1
7878
with:
7979
build_type: pull-request
8080
script: ci/build_wheel_python.sh
8181
wheel-tests:
8282
needs: wheel-build-python
8383
secrets: inherit
84-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.08
84+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.5.1
8585
with:
8686
build_type: pull-request
8787
script: ci/test_wheel.sh
8888
devcontainer:
8989
secrets: inherit
90-
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.08
90+
uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@cuda-12.5.1
9191
with:
9292
arch: '["amd64"]'
93-
cuda: '["12.2"]'
93+
cuda: '["12.5"]'
9494
build_command: |
9595
sccache -z;
9696
build-all -DBUILD_BENCHMARKS=ON --verbose;

‎.github/workflows/test.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ on:
1616
jobs:
1717
cpp-tests:
1818
secrets: inherit
19-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.08
19+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-12.5.1
2020
with:
2121
build_type: nightly
2222
branch: ${{ inputs.branch }}
2323
date: ${{ inputs.date }}
2424
sha: ${{ inputs.sha }}
2525
python-tests:
2626
secrets: inherit
27-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.08
27+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-12.5.1
2828
with:
2929
build_type: nightly
3030
branch: ${{ inputs.branch }}
3131
date: ${{ inputs.date }}
3232
sha: ${{ inputs.sha }}
3333
wheel-tests:
3434
secrets: inherit
35-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.08
35+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.5.1
3636
with:
3737
build_type: nightly
3838
branch: ${{ inputs.branch }}

conda/environments/all_cuda-122_arch-x86_64.yaml renamed to conda/environments/all_cuda-125_arch-x86_64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
- cmake>=3.26.4,!=3.30.0
1313
- cuda-nvcc
1414
- cuda-python>=12.0,<13.0a0
15-
- cuda-version=12.2
15+
- cuda-version=12.5
1616
- cxx-compiler
1717
- cython>=3.0.0
1818
- doxygen=1.9.1
@@ -40,4 +40,4 @@ dependencies:
4040
- sphinx-markdown-tables
4141
- sphinx_rtd_theme
4242
- sysroot_linux-64==2.17
43-
name: all_cuda-122_arch-x86_64
43+
name: all_cuda-125_arch-x86_64

‎dependencies.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ files:
33
all:
44
output: conda
55
matrix:
6-
cuda: ["11.8", "12.2"]
6+
cuda: ["11.8", "12.5"]
77
arch: [x86_64]
88
includes:
99
- build
@@ -213,6 +213,10 @@ dependencies:
213213
cuda: "12.2"
214214
packages:
215215
- cuda-version=12.2
216+
- matrix:
217+
cuda: "12.5"
218+
packages:
219+
- cuda-version=12.5
216220
cuda:
217221
specific:
218222
- output_types: conda

0 commit comments

Comments
 (0)