Skip to content

Commit 4b3f214

Browse files
bdicebdice
authored
Finish CUDA 12.9 migration and use branch-25.06 workflows (#879)
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) - Gil Forsyth (https://github.com/gforsyth) Approvers: - Gil Forsyth (https://github.com/gforsyth) - https://github.com/jakirkham URL: #879
1 parent bf0d881 commit 4b3f214

8 files changed

Lines changed: 23 additions & 24 deletions

File tree

‎.github/workflows/build.yaml‎

Lines changed: 6 additions & 6 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 }}
@@ -38,7 +38,7 @@ jobs:
3838
if: github.ref_type == 'branch'
3939
needs: [python-build]
4040
secrets: inherit
41-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-12.9.0
41+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
4242
with:
4343
arch: "amd64"
4444
branch: ${{ inputs.branch }}
@@ -51,7 +51,7 @@ jobs:
5151
python-build:
5252
needs: [cpp-build]
5353
secrets: inherit
54-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda-12.9.0
54+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
5555
with:
5656
build_type: ${{ inputs.build_type || 'branch' }}
5757
branch: ${{ inputs.branch }}
@@ -60,15 +60,15 @@ jobs:
6060
upload-conda:
6161
needs: [cpp-build, python-build]
6262
secrets: inherit
63-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@cuda-12.9.0
63+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.06
6464
with:
6565
build_type: ${{ inputs.build_type || 'branch' }}
6666
branch: ${{ inputs.branch }}
6767
date: ${{ inputs.date }}
6868
sha: ${{ inputs.sha }}
6969
wheel-build:
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 }}
@@ -80,7 +80,7 @@ jobs:
8080
wheel-publish:
8181
needs: wheel-build
8282
secrets: inherit
83-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@cuda-12.9.0
83+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
8484
with:
8585
build_type: ${{ inputs.build_type || 'branch' }}
8686
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- wheel-tests
2222
- telemetry-setup
2323
secrets: inherit
24-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@cuda-12.9.0
24+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.06
2525
telemetry-setup:
2626
runs-on: ubuntu-latest
2727
continue-on-error: true
@@ -36,31 +36,31 @@ jobs:
3636
checks:
3737
secrets: inherit
3838
needs: telemetry-setup
39-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@cuda-12.9.0
39+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.06
4040
with:
4141
ignored_pr_jobs: telemetry-summarize
4242
conda-cpp-build:
4343
needs: checks
4444
secrets: inherit
45-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@cuda-12.9.0
45+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06
4646
with:
4747
build_type: pull-request
4848
conda-python-build:
4949
needs: conda-cpp-build
5050
secrets: inherit
51-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@cuda-12.9.0
51+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
5252
with:
5353
build_type: pull-request
5454
conda-python-tests:
5555
needs: conda-python-build
5656
secrets: inherit
57-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-12.9.0
57+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
5858
with:
5959
build_type: pull-request
6060
docs-build:
6161
needs: conda-python-build
6262
secrets: inherit
63-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@cuda-12.9.0
63+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
6464
with:
6565
build_type: pull-request
6666
node_type: "gpu-l4-latest-1"
@@ -70,7 +70,7 @@ jobs:
7070
wheel-build:
7171
needs: checks
7272
secrets: inherit
73-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@cuda-12.9.0
73+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
7474
with:
7575
build_type: pull-request
7676
script: ci/build_wheel.sh
@@ -79,7 +79,7 @@ jobs:
7979
wheel-tests:
8080
needs: wheel-build
8181
secrets: inherit
82-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.9.0
82+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
8383
with:
8484
build_type: pull-request
8585
script: ci/test_wheel.sh

‎.github/workflows/test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ on:
1919
jobs:
2020
conda-python-tests:
2121
secrets: inherit
22-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@cuda-12.9.0
22+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
2323
with:
2424
build_type: ${{ inputs.build_type }}
2525
branch: ${{ inputs.branch }}
2626
date: ${{ inputs.date }}
2727
sha: ${{ inputs.sha }}
2828
wheel-tests:
2929
secrets: inherit
30-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@cuda-12.9.0
30+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
3131
with:
3232
build_type: ${{ inputs.build_type }}
3333
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 }}

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
@@ -11,7 +11,7 @@ dependencies:
1111
- cmake>=3.30.4
1212
- cuda-cudart-dev
1313
- cuda-nvcc
14-
- cuda-version=12.9
14+
- cuda-version=12.8
1515
- cupy>=12.0.0
1616
- cxx-compiler
1717
- gcc_linux-aarch64=13.*
@@ -45,4 +45,4 @@ dependencies:
4545
- tifffile>=2022.8.12
4646
- pip:
4747
- opencv-python-headless>=4.6
48-
name: all_cuda-129_arch-aarch64
48+
name: all_cuda-128_arch-aarch64

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- cmake>=3.30.4
1212
- cuda-cudart-dev
1313
- cuda-nvcc
14-
- cuda-version=12.9
14+
- cuda-version=12.8
1515
- cupy>=12.0.0
1616
- cxx-compiler
1717
- gcc_linux-64=13.*
@@ -47,4 +47,4 @@ dependencies:
4747
- yasm
4848
- pip:
4949
- opencv-python-headless>=4.6
50-
name: all_cuda-129_arch-x86_64
50+
name: all_cuda-128_arch-x86_64

‎dependencies.yaml‎

Lines changed: 1 addition & 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.9"]
6+
cuda: ["11.8", "12.8"]
77
arch: [x86_64, aarch64]
88
includes:
99
- build

‎python/cucim/tests/test_cucim.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
def test_main():
2222
runner = CliRunner()
23-
result = runner.invoke(main, [])
23+
result = runner.invoke(main, ["--help"])
2424

25-
# assert result.output == '()\n'
2625
assert result.exit_code == 0

0 commit comments

Comments
 (0)