Skip to content

Commit 84eb021

Browse files
raydouglassraydouglass
committed
Merge pull request #886 from rapidsai/branch-25.06
2 parents 847dd99 + becb456 commit 84eb021

34 files changed

+7310
-332
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,57 +28,61 @@ concurrency:
2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.04
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 }}
3535
date: ${{ inputs.date }}
36+
script: ci/build_cpp.sh
3637
sha: ${{ inputs.sha }}
3738
docs-build:
3839
if: github.ref_type == 'branch'
3940
needs: [python-build]
4041
secrets: inherit
41-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04
42+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
4243
with:
4344
arch: "amd64"
4445
branch: ${{ inputs.branch }}
4546
build_type: ${{ inputs.build_type || 'branch' }}
4647
container_image: "rapidsai/ci-conda:latest"
4748
date: ${{ inputs.date }}
4849
node_type: "gpu-l4-latest-1"
49-
run_script: "ci/build_docs.sh"
50+
script: "ci/build_docs.sh"
5051
sha: ${{ inputs.sha }}
5152
python-build:
5253
needs: [cpp-build]
5354
secrets: inherit
54-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04
55+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
5556
with:
5657
build_type: ${{ inputs.build_type || 'branch' }}
5758
branch: ${{ inputs.branch }}
5859
date: ${{ inputs.date }}
60+
script: ci/build_python.sh
5961
sha: ${{ inputs.sha }}
6062
upload-conda:
6163
needs: [cpp-build, python-build]
6264
secrets: inherit
63-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.04
65+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.06
6466
with:
6567
build_type: ${{ inputs.build_type || 'branch' }}
6668
branch: ${{ inputs.branch }}
6769
date: ${{ inputs.date }}
6870
sha: ${{ inputs.sha }}
6971
wheel-build:
7072
secrets: inherit
71-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
73+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
7274
with:
7375
build_type: ${{ inputs.build_type || 'branch' }}
7476
branch: ${{ inputs.branch }}
7577
sha: ${{ inputs.sha }}
7678
date: ${{ inputs.date }}
7779
script: ci/build_wheel.sh
80+
package-name: cucim
81+
package-type: python
7882
wheel-publish:
7983
needs: wheel-build
8084
secrets: inherit
81-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04
85+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
8286
with:
8387
build_type: ${{ inputs.build_type || 'branch' }}
8488
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 14 additions & 9 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@branch-25.04
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,48 +36,53 @@ jobs:
3636
checks:
3737
secrets: inherit
3838
needs: telemetry-setup
39-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.04
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@branch-25.04
45+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.06
4646
with:
4747
build_type: pull-request
48+
script: ci/build_cpp.sh
4849
conda-python-build:
4950
needs: conda-cpp-build
5051
secrets: inherit
51-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04
52+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
5253
with:
5354
build_type: pull-request
55+
script: ci/build_python.sh
5456
conda-python-tests:
5557
needs: conda-python-build
5658
secrets: inherit
57-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.04
59+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
5860
with:
5961
build_type: pull-request
62+
script: ci/test_python.sh
6063
docs-build:
6164
needs: conda-python-build
6265
secrets: inherit
63-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04
66+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
6467
with:
6568
build_type: pull-request
6669
node_type: "gpu-l4-latest-1"
6770
arch: "amd64"
6871
container_image: "rapidsai/ci-conda:latest"
69-
run_script: "ci/build_docs.sh"
72+
script: "ci/build_docs.sh"
7073
wheel-build:
7174
needs: checks
7275
secrets: inherit
73-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04
76+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
7477
with:
7578
build_type: pull-request
7679
script: ci/build_wheel.sh
80+
package-name: cucim
81+
package-type: python
7782
wheel-tests:
7883
needs: wheel-build
7984
secrets: inherit
80-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04
85+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
8186
with:
8287
build_type: pull-request
8388
script: ci/test_wheel.sh

‎.github/workflows/test.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ on:
1919
jobs:
2020
conda-python-tests:
2121
secrets: inherit
22-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.04
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 }}
27+
script: ci/test_python.sh
2728
sha: ${{ inputs.sha }}
2829
wheel-tests:
2930
secrets: inherit
30-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04
31+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
3132
with:
3233
build_type: ${{ inputs.build_type }}
3334
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.04
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 }}

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
# cucim 25.06.00 (5 Jun 2025)
2+
3+
## 🛠️ Improvements
4+
5+
- use 'rapids-init-pip' in wheel CI, other CI changes ([#881](https://github.com/rapidsai/cucim/pull/881)) [@jameslamb](https://github.com/jameslamb)
6+
- Finish CUDA 12.9 migration and use branch-25.06 workflows ([#879](https://github.com/rapidsai/cucim/pull/879)) [@bdice](https://github.com/bdice)
7+
- Build and test with CUDA 12.9.0 ([#877](https://github.com/rapidsai/cucim/pull/877)) [@bdice](https://github.com/bdice)
8+
- Refactor: Enhance GPU Memory Leak Test for `read_region` ([#874](https://github.com/rapidsai/cucim/pull/874)) [@gigony](https://github.com/gigony)
9+
- Add support for Python 3.13 ([#873](https://github.com/rapidsai/cucim/pull/873)) [@gforsyth](https://github.com/gforsyth)
10+
- Download build artifacts from GitHub for CI ([#870](https://github.com/rapidsai/cucim/pull/870)) [@VenkateshJaya](https://github.com/VenkateshJaya)
11+
- Add ARM conda environments ([#867](https://github.com/rapidsai/cucim/pull/867)) [@bdice](https://github.com/bdice)
12+
- Moving wheel builds to specified location and uploading build artifacts to Github ([#854](https://github.com/rapidsai/cucim/pull/854)) [@VenkateshJaya](https://github.com/VenkateshJaya)
13+
- Region Properties Performance Overhaul - Part 6: Public API (regionprops_table) ([#848](https://github.com/rapidsai/cucim/pull/848)) [@grlee77](https://github.com/grlee77)
14+
- Region Properties Performance Overhaul - Part 5: Perimeter and Euler Characteristic ([#847](https://github.com/rapidsai/cucim/pull/847)) [@grlee77](https://github.com/grlee77)
15+
- Region Properties Performance Overhaul - Part 4: Moment-Based Properties ([#846](https://github.com/rapidsai/cucim/pull/846)) [@grlee77](https://github.com/grlee77)
16+
- Region Properties Performance Overhaul - Part 3: Convex Image Properties ([#845](https://github.com/rapidsai/cucim/pull/845)) [@grlee77](https://github.com/grlee77)
17+
- Region Properties Performance Overhaul - Part 2: Intensity Image Properties ([#844](https://github.com/rapidsai/cucim/pull/844)) [@grlee77](https://github.com/grlee77)
18+
- Region Properties Performance Overhaul - Part 1: Basic Properties ([#843](https://github.com/rapidsai/cucim/pull/843)) [@grlee77](https://github.com/grlee77)
19+
120
# cucim 25.04.00 (9 Apr 2025)
221

322
## 🐛 Bug Fixes

‎VERSION‎

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

‎ci/build_docs.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
set -euo pipefail
44

55
rapids-logger "Downloading artifacts from previous jobs"
6-
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
7-
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
6+
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
7+
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)
88

99
rapids-logger "Create test conda environment"
1010
. /opt/conda/etc/profile.d/conda.sh

‎ci/build_python.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rapids-logger "Begin py build"
2121
# ref: https://github.com/rapidsai/cucim/issues/800#issuecomment-2529593457
2222
conda config --set path_conflict warn
2323

24-
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
24+
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
2525

2626
sccache --zero-stats
2727

‎ci/build_wheel.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ CMAKE_BUILD_TYPE="release"
1010

1111
source rapids-configure-sccache
1212
source rapids-date-string
13+
source rapids-init-pip
1314

1415
rapids-generate-version > ./VERSION
1516

@@ -55,11 +56,11 @@ rapids-pip-retry wheel \
5556

5657
sccache --show-adv-stats
5758

58-
mkdir -p final_dist
59-
python -m auditwheel repair -w final_dist dist/*
59+
# repair wheels and write to the location that artifact-uploading code expects to find them
60+
python -m auditwheel repair -w "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" dist/*
6061
# shellcheck disable=SC2010
61-
ls -1 final_dist | grep -vqz 'none'
62+
ls -1 "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" | grep -vqz 'none'
6263

63-
../../ci/validate_wheel.sh final_dist
64+
../../ci/validate_wheel.sh "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"
6465

65-
RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 final_dist
66+
RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 python "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"

‎ci/test_python.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ set -euo pipefail
88
. /opt/conda/etc/profile.d/conda.sh
99

1010
rapids-logger "Downloading artifacts from previous jobs"
11-
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
12-
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
11+
CPP_CHANNEL=$(rapids-download-conda-from-github cpp)
12+
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)
1313

1414
rapids-logger "Generate Python testing dependencies"
1515
rapids-dependency-file-generator \

0 commit comments

Comments
 (0)