Skip to content

Commit 85bf9a5

Browse files
AyodeAweAyodeAwe
committed
Merge remote-tracking branch 'upstream/branch-25.08'
2 parents 31b92f2 + 54cc342 commit 85bf9a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+344
-473
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,21 @@ on:
99
workflow_dispatch:
1010
inputs:
1111
branch:
12+
description: |
13+
branch: git branch the workflow run targets.
14+
Required even when 'sha' is provided because it is also used for organizing artifacts.
1215
required: true
1316
type: string
1417
date:
18+
description: "date: Date (YYYY-MM-DD) this run is for. Used to organize artifacts produced by nightly builds"
1519
required: true
1620
type: string
1721
sha:
22+
description: "sha: full git commit SHA to check out"
1823
required: true
1924
type: string
2025
build_type:
26+
description: "build_type: one of [branch, nightly, pull-request]"
2127
type: string
2228
default: nightly
2329

@@ -28,7 +34,7 @@ concurrency:
2834
jobs:
2935
cpp-build:
3036
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06
37+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.08
3238
with:
3339
build_type: ${{ inputs.build_type || 'branch' }}
3440
branch: ${{ inputs.branch }}
@@ -39,20 +45,20 @@ jobs:
3945
if: github.ref_type == 'branch'
4046
needs: [python-build]
4147
secrets: inherit
42-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
48+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
4349
with:
4450
arch: "amd64"
4551
branch: ${{ inputs.branch }}
4652
build_type: ${{ inputs.build_type || 'branch' }}
47-
container_image: "rapidsai/ci-conda:latest"
53+
container_image: "rapidsai/ci-conda:25.08-latest"
4854
date: ${{ inputs.date }}
4955
node_type: "gpu-l4-latest-1"
5056
script: "ci/build_docs.sh"
5157
sha: ${{ inputs.sha }}
5258
python-build:
5359
needs: [cpp-build]
5460
secrets: inherit
55-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
61+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.08
5662
with:
5763
build_type: ${{ inputs.build_type || 'branch' }}
5864
branch: ${{ inputs.branch }}
@@ -62,15 +68,15 @@ jobs:
6268
upload-conda:
6369
needs: [cpp-build, python-build]
6470
secrets: inherit
65-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.06
71+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.08
6672
with:
6773
build_type: ${{ inputs.build_type || 'branch' }}
6874
branch: ${{ inputs.branch }}
6975
date: ${{ inputs.date }}
7076
sha: ${{ inputs.sha }}
7177
wheel-build:
7278
secrets: inherit
73-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
79+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.08
7480
with:
7581
build_type: ${{ inputs.build_type || 'branch' }}
7682
branch: ${{ inputs.branch }}
@@ -82,7 +88,7 @@ jobs:
8288
wheel-publish:
8389
needs: wheel-build
8490
secrets: inherit
85-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
91+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.08
8692
with:
8793
build_type: ${{ inputs.build_type || 'branch' }}
8894
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
name: pr
2-
32
on:
43
push:
54
branches:
65
- "pull-request/[0-9]+"
7-
86
concurrency:
97
group: ${{ github.workflow }}-${{ github.ref }}
108
cancel-in-progress: true
11-
129
jobs:
1310
pr-builder:
1411
needs:
@@ -21,7 +18,7 @@ jobs:
2118
- wheel-tests
2219
- telemetry-setup
2320
secrets: inherit
24-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.06
21+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.08
2522
telemetry-setup:
2623
runs-on: ubuntu-latest
2724
continue-on-error: true
@@ -36,44 +33,44 @@ jobs:
3633
checks:
3734
secrets: inherit
3835
needs: telemetry-setup
39-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.06
36+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.08
4037
with:
4138
ignored_pr_jobs: telemetry-summarize
4239
conda-cpp-build:
4340
needs: checks
4441
secrets: inherit
45-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06
42+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.08
4643
with:
4744
build_type: pull-request
4845
script: ci/build_cpp.sh
4946
conda-python-build:
5047
needs: conda-cpp-build
5148
secrets: inherit
52-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.08
5350
with:
5451
build_type: pull-request
5552
script: ci/build_python.sh
5653
conda-python-tests:
5754
needs: conda-python-build
5855
secrets: inherit
59-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
56+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.08
6057
with:
6158
build_type: pull-request
6259
script: ci/test_python.sh
6360
docs-build:
6461
needs: conda-python-build
6562
secrets: inherit
66-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
63+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
6764
with:
6865
build_type: pull-request
6966
node_type: "gpu-l4-latest-1"
7067
arch: "amd64"
71-
container_image: "rapidsai/ci-conda:latest"
68+
container_image: "rapidsai/ci-conda:25.08-latest"
7269
script: "ci/build_docs.sh"
7370
wheel-build:
7471
needs: checks
7572
secrets: inherit
76-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
73+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.08
7774
with:
7875
build_type: pull-request
7976
script: ci/build_wheel.sh
@@ -82,11 +79,10 @@ jobs:
8279
wheel-tests:
8380
needs: wheel-build
8481
secrets: inherit
85-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
82+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.08
8683
with:
8784
build_type: pull-request
8885
script: ci/test_wheel.sh
89-
9086
telemetry-summarize:
9187
# This job must use a self-hosted runner to record telemetry traces.
9288
runs-on: linux-amd64-cpu4
@@ -96,3 +92,5 @@ jobs:
9692
steps:
9793
- name: Telemetry summarize
9894
uses: rapidsai/shared-actions/telemetry-dispatch-summarize@main
95+
env:
96+
GH_TOKEN: ${{ github.token }}

‎.github/workflows/test.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,28 @@ on:
44
workflow_dispatch:
55
inputs:
66
branch:
7+
description: |
8+
branch: git branch the workflow run targets.
9+
Required even when 'sha' is provided because it is also used for organizing artifacts.
710
required: true
811
type: string
912
date:
13+
description: "date: Date (YYYY-MM-DD) this run is for. Used to organize artifacts produced by nightly builds"
1014
required: true
1115
type: string
1216
sha:
17+
description: "sha: full git commit SHA to check out"
1318
required: true
1419
type: string
1520
build_type:
21+
description: "build_type: one of [branch, nightly, pull-request]"
1622
type: string
1723
default: nightly
1824

1925
jobs:
2026
conda-python-tests:
2127
secrets: inherit
22-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.08
2329
with:
2430
build_type: ${{ inputs.build_type }}
2531
branch: ${{ inputs.branch }}
@@ -28,7 +34,7 @@ jobs:
2834
sha: ${{ inputs.sha }}
2935
wheel-tests:
3036
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
37+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.08
3238
with:
3339
build_type: ${{ inputs.build_type }}
3440
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@branch-25.06
15+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-25.08
1616
with:
1717
sender_login: ${{ github.event.sender.login }}
1818
sender_avatar: ${{ github.event.sender.avatar_url }}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ repos:
3434
- id: verify-alpha-spec
3535
args: ["--fix", "--mode=release"]
3636
- repo: https://github.com/rapidsai/dependency-file-generator
37-
rev: v1.16.0
37+
rev: v1.19.0
3838
hooks:
3939
- id: rapids-dependency-file-generator
4040
args: ["--clean"]
@@ -43,4 +43,3 @@ repos:
4343
hooks:
4444
- id: shellcheck
4545
args: ["--severity=warning"]
46-
files: ^ci/

‎CHANGELOG.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
# cucim 25.08.00 (6 Aug 2025)
2+
3+
## 🚨 Breaking Changes
4+
5+
- Remove CUDA 11 from dependencies.yaml ([#887](https://github.com/rapidsai/cucim/pull/887)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
6+
- stop uploading packages to downloads.rapids.ai ([#883](https://github.com/rapidsai/cucim/pull/883)) [@jameslamb](https://github.com/jameslamb)
7+
8+
## 🐛 Bug Fixes
9+
10+
- Drop unused variable `CUDA_MAJOR_VERSION` ([#907](https://github.com/rapidsai/cucim/pull/907)) [@jakirkham](https://github.com/jakirkham)
11+
- Fix test failures due to deprecated Pillow Image.fromarray 'mode' parameter ([#901](https://github.com/rapidsai/cucim/pull/901)) [@grlee77](https://github.com/grlee77)
12+
- Adding GH_TOKEN pass-through to summarize job ([#891](https://github.com/rapidsai/cucim/pull/891)) [@msarahan](https://github.com/msarahan)
13+
14+
## 📖 Documentation
15+
16+
- add docs on CI workflow inputs ([#897](https://github.com/rapidsai/cucim/pull/897)) [@jameslamb](https://github.com/jameslamb)
17+
18+
## 🛠️ Improvements
19+
20+
- Drop CUDA 11 references from docs ([#914](https://github.com/rapidsai/cucim/pull/914)) [@jakirkham](https://github.com/jakirkham)
21+
- fix(docker): use versioned `-latest` tag for all `rapidsai` images ([#908](https://github.com/rapidsai/cucim/pull/908)) [@gforsyth](https://github.com/gforsyth)
22+
- remove cuspatial references ([#906](https://github.com/rapidsai/cucim/pull/906)) [@jameslamb](https://github.com/jameslamb)
23+
- Drop CUDA 11 from CI Scripts ([#903](https://github.com/rapidsai/cucim/pull/903)) [@AyodeAwe](https://github.com/AyodeAwe)
24+
- run: fix compatibility with PEP-0632 for supporting Python >=3.12 ([#902](https://github.com/rapidsai/cucim/pull/902)) [@ElieDeBrauwer](https://github.com/ElieDeBrauwer)
25+
- Enhance GPU memory leak test with unified memory check and increased thresholds ([#898](https://github.com/rapidsai/cucim/pull/898)) [@gigony](https://github.com/gigony)
26+
- Use CUDA 12.9 in Conda, Devcontainers, Spark, GHA, etc. ([#894](https://github.com/rapidsai/cucim/pull/894)) [@jakirkham](https://github.com/jakirkham)
27+
- Remove nvidia and dask channels ([#893](https://github.com/rapidsai/cucim/pull/893)) [@vyasr](https://github.com/vyasr)
28+
- refactor(shellcheck): fix all shellcheck warnings/errors ([#890](https://github.com/rapidsai/cucim/pull/890)) [@gforsyth](https://github.com/gforsyth)
29+
- refactor(conda): remove cuda11 conditionals from conda recipes ([#889](https://github.com/rapidsai/cucim/pull/889)) [@gforsyth](https://github.com/gforsyth)
30+
- Remove CUDA 11 from dependencies.yaml ([#887](https://github.com/rapidsai/cucim/pull/887)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
31+
- stop uploading packages to downloads.rapids.ai ([#883](https://github.com/rapidsai/cucim/pull/883)) [@jameslamb](https://github.com/jameslamb)
32+
- Forward-merge branch-25.06 into branch-25.08 ([#880](https://github.com/rapidsai/cucim/pull/880)) [@gforsyth](https://github.com/gforsyth)
33+
- Forward-merge branch-25.06 into branch-25.08 ([#876](https://github.com/rapidsai/cucim/pull/876)) [@gforsyth](https://github.com/gforsyth)
34+
135
# cucim 25.06.00 (5 Jun 2025)
236

337
## 🛠️ Improvements

‎CONTRIBUTING.md‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ If codespell is finding false positives in newly added code, the `ignore-words-l
9797

9898
Compiler requirements:
9999

100-
* `gcc` version 9.0+
101-
* `nvcc` version 11.0+
102-
* `cmake` version 3.18.0+
100+
* `gcc` version 13.0+
101+
* `nvcc` version 12.0+
102+
* `cmake` version 3.30.4+
103103

104104
CUDA/GPU requirements:
105105

106-
* CUDA 11.0+
107-
* NVIDIA driver 450.36+
108-
* Pascal architecture or better
106+
* CUDA 12.0+
107+
* NVIDIA driver 525.60+
108+
* Volta architecture or better
109109

110110
You can obtain CUDA from [https://developer.nvidia.com/cuda-downloads](https://developer.nvidia.com/cuda-downloads).
111111

@@ -119,21 +119,21 @@ CUCIM_HOME=$(pwd)/cucim
119119
git clone https://github.com/rapidsai/cucim.git $CUCIM_HOME
120120
cd $CUCIM_HOME
121121
```
122-
## Local Development using Conda Environment (for gcc 9.x and nvcc 11.0.x)
122+
## Local Development using Conda Environment (for gcc 13 and nvcc 12)
123123

124-
Conda can be used to setup an environment which includes all of the necessary dependencies (as shown in `./conda/environments/all_cuda-118_arch-x86_64.yaml`) for building cuCIM.
124+
Conda can be used to setup an environment which includes all of the necessary dependencies (as shown in `./conda/environments/all_cuda-129_arch-x86_64.yaml`) for building cuCIM.
125125

126126
Otherwise, you may need to install dependencies (such as yasm) through your OS's package manager (`apt`, `yum`, and so on).
127127

128128

129129
### Creating the Conda Development Environment `cucim`
130130

131-
Note that `./conda/environments/all_cuda-118_arch-x86_64.yaml` is currently set to use specific versions of gcc (gxx_linux-64) and CUDA (cudatoolkit & cudatoolkit-dev).
131+
Note that `./conda/environments/all_cuda-129_arch-x86_64.yaml` is currently set to pull in GCC and NVCC with the expected versions.
132132

133-
If you want to change the version of gcc or CUDA toolkit package, please update `./conda/environments/all_cuda-118_arch-x86_64.yaml` before executing the following commands.
133+
If you want to change the version of GCC or CUDA, please update `./conda/environments/all_cuda-129_arch-x86_64.yaml` before executing the following commands.
134134

135135
```bash
136-
conda env create -n cucim -f ./conda/environments/all_cuda-118_arch-x86_64.yaml
136+
conda env create -n cucim -f ./conda/environments/all_cuda-129_arch-x86_64.yaml
137137
# activate the environment
138138
conda activate cucim
139139
```
@@ -265,12 +265,6 @@ conda install -y -c ${CONDA_BLD_DIR} -c conda-forge \
265265

266266
**Wheel Build**
267267

268-
If you are using CUDA 12.x, please update pyproject.toml as follows before building the wheel
269-
```bash
270-
sed -i "s/cupy-cuda11x/cupy-cuda12x/g" python/cucim/pyproject.toml
271-
```
272-
This will switch the CuPy dependency to one based on CUDA 12.x instead of 11.x.
273-
274268
The wheel can then be built using:
275269

276270
```bash

‎README.md‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ cuCIM supports the following formats:
5353
conda create -n cucim -c rapidsai -c conda-forge cucim cuda-version=`<CUDA version>`
5454
```
5555

56-
`<CUDA version>` should be 11.2+ (e.g., `11.2`, `12.0`, etc.)
56+
`<CUDA version>` should be 12.0+ (e.g., `12.0`, etc.)
5757

5858
#### [Conda (nightlies)](https://anaconda.org/rapidsai-nightly/cucim)
5959

6060
```bash
6161
conda create -n cucim -c rapidsai-nightly -c conda-forge cucim cuda-version=`<CUDA version>`
6262
```
6363

64-
`<CUDA version>` should be 11.2+ (e.g., `11.2`, `12.0`, etc.)
64+
`<CUDA version>` should be 12.0+ (e.g., `12.0`, etc.)
6565

6666
### [PyPI](https://pypi.org/project/cucim/)
6767

@@ -71,12 +71,6 @@ Install for CUDA 12:
7171
pip install cucim-cu12
7272
```
7373

74-
Alternatively install for CUDA 11:
75-
76-
```bash
77-
pip install cucim-cu11
78-
```
79-
8074
### Notebooks
8175

8276
Please check out our [Welcome](notebooks/Welcome.ipynb) notebook ([NBViewer](https://nbviewer.org/github/rapidsai/cucim/blob/main/notebooks/Welcome.ipynb))

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
25.06.00
1+
25.08.00

‎benchmarks/skimage/run-all.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#!/bin/bash
12
for file in ./cu*py
23
do
3-
echo $file
4+
echo "$file"
45
time python "$file"
56
done

0 commit comments

Comments
 (0)