Skip to content

Commit 171e486

Browse files
raydouglassraydouglass
committed
Merge pull request #569 from rapidsai/branch-23.06
2 parents 8373398 + cef0c2a commit 171e486

File tree

33 files changed

+191
-102
lines changed

33 files changed

+191
-102
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,30 @@ concurrency:
2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.04
31+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.06
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
3535
date: ${{ inputs.date }}
3636
sha: ${{ inputs.sha }}
3737
docs-build:
38-
if: github.ref_type == 'branch' && github.event_name == 'push'
38+
if: github.ref_type == 'branch'
3939
needs: [python-build]
4040
secrets: inherit
41-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04
41+
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
4242
with:
43-
build_type: branch
44-
node_type: "gpu-latest-1"
4543
arch: "amd64"
44+
branch: ${{ inputs.branch }}
45+
build_type: ${{ inputs.build_type || 'branch' }}
4646
container_image: "rapidsai/ci:latest"
47+
date: ${{ inputs.date }}
48+
node_type: "gpu-v100-latest-1"
4749
run_script: "ci/build_docs.sh"
50+
sha: ${{ inputs.sha }}
4851
python-build:
4952
needs: [cpp-build]
5053
secrets: inherit
51-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.04
54+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.06
5255
with:
5356
build_type: ${{ inputs.build_type || 'branch' }}
5457
branch: ${{ inputs.branch }}
@@ -57,7 +60,7 @@ jobs:
5760
upload-conda:
5861
needs: [cpp-build, python-build]
5962
secrets: inherit
60-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.04
63+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.06
6164
with:
6265
build_type: ${{ inputs.build_type || 'branch' }}
6366
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,35 @@ jobs:
1818
- conda-python-tests
1919
- docs-build
2020
secrets: inherit
21-
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.04
21+
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.06
2222
checks:
2323
secrets: inherit
24-
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.04
24+
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.06
2525
conda-cpp-build:
2626
needs: checks
2727
secrets: inherit
28-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.04
28+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.06
2929
with:
3030
build_type: pull-request
3131
conda-python-build:
3232
needs: conda-cpp-build
3333
secrets: inherit
34-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.04
34+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.06
3535
with:
3636
build_type: pull-request
3737
conda-python-tests:
3838
needs: conda-python-build
3939
secrets: inherit
40-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.04
40+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.06
4141
with:
4242
build_type: pull-request
4343
docs-build:
4444
needs: conda-python-build
4545
secrets: inherit
46-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04
46+
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.06
4747
with:
4848
build_type: pull-request
49-
node_type: "gpu-latest-1"
49+
node_type: "gpu-v100-latest-1"
5050
arch: "amd64"
5151
container_image: "rapidsai/ci:latest"
5252
run_script: "ci/build_docs.sh"

‎.github/workflows/test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
jobs:
1717
conda-python-tests:
1818
secrets: inherit
19-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.04
19+
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.06
2020
with:
2121
build_type: nightly
2222
branch: ${{ inputs.branch }}

‎CHANGELOG.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
# cuCIM 23.06.00 (7 Jun 2023)
2+
3+
## 🚨 Breaking Changes
4+
5+
- Support Python 3.9 build/tests ([#547](https://github.com/rapidsai/cucim/pull/547)) [@shwina](https://github.com/shwina)
6+
7+
## 🐛 Bug Fixes
8+
9+
- Fix SHA256 check failure in test suite ([#564](https://github.com/rapidsai/cucim/pull/564)) [@grlee77](https://github.com/grlee77)
10+
- Handle space character in ./run download_testdata ([#556](https://github.com/rapidsai/cucim/pull/556)) [@gigony](https://github.com/gigony)
11+
- Fix `return_error='always'` behavior in phase_cross_correlation ([#549](https://github.com/rapidsai/cucim/pull/549)) [@grlee77](https://github.com/grlee77)
12+
- Only load versioned `libcufile` ([#548](https://github.com/rapidsai/cucim/pull/548)) [@jakirkham](https://github.com/jakirkham)
13+
- add a 20 minute timeout for pytest runs on CI ([#545](https://github.com/rapidsai/cucim/pull/545)) [@grlee77](https://github.com/grlee77)
14+
- protect against possible out of bounds memory access in 2D distance transform ([#540](https://github.com/rapidsai/cucim/pull/540)) [@grlee77](https://github.com/grlee77)
15+
16+
## 📖 Documentation
17+
18+
- Fix doc building via `run build_package` ([#553](https://github.com/rapidsai/cucim/pull/553)) [@grlee77](https://github.com/grlee77)
19+
- update changelog for release 23.04.00 and 23.04.01 ([#552](https://github.com/rapidsai/cucim/pull/552)) [@grlee77](https://github.com/grlee77)
20+
21+
## 🛠️ Improvements
22+
23+
- Allow numpy 1.24. ([#563](https://github.com/rapidsai/cucim/pull/563)) [@bdice](https://github.com/bdice)
24+
- run docs nightly too ([#560](https://github.com/rapidsai/cucim/pull/560)) [@AyodeAwe](https://github.com/AyodeAwe)
25+
- Update cupy dependency ([#558](https://github.com/rapidsai/cucim/pull/558)) [@vyasr](https://github.com/vyasr)
26+
- Remove libjpeg dependency ([#557](https://github.com/rapidsai/cucim/pull/557)) [@gigony](https://github.com/gigony)
27+
- Enable sccache hits from local builds ([#551](https://github.com/rapidsai/cucim/pull/551)) [@AyodeAwe](https://github.com/AyodeAwe)
28+
- Revert shared workflows branch ([#550](https://github.com/rapidsai/cucim/pull/550)) [@ajschmidt8](https://github.com/ajschmidt8)
29+
- Support Python 3.9 build/tests ([#547](https://github.com/rapidsai/cucim/pull/547)) [@shwina](https://github.com/shwina)
30+
- Remove usage of rapids-get-rapids-version-from-git ([#546](https://github.com/rapidsai/cucim/pull/546)) [@jjacobelli](https://github.com/jjacobelli)
31+
- Use ARC V2 self-hosted runners for GPU jobs ([#538](https://github.com/rapidsai/cucim/pull/538)) [@jjacobelli](https://github.com/jjacobelli)
32+
- Remove underscore in build string. ([#528](https://github.com/rapidsai/cucim/pull/528)) [@bdice](https://github.com/bdice)
33+
34+
# cuCIM 23.04.01 (14 Apr 2023)
35+
36+
## 🛠️ Improvements
37+
38+
- Pin libwebp-base ([#541](https://github.com/rapidsai/cucim/pull/541)) [@ajschmidt8](https://github.com/ajschmidt8)
39+
140
# cuCIM 23.04.00 (6 Apr 2023)
241

342
## 🚨 Breaking Changes

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pip install scipy scikit-image cupy-cuda110
7070

7171
### Notebooks
7272

73-
Please check out our [Welcome](notebooks/Welcome.ipynb) notebook ([NBViewer](https://nbviewer.jupyter.org/github/rapidsai/cucim/blob/branch-23.04/notebooks/Welcome.ipynb))
73+
Please check out our [Welcome](notebooks/Welcome.ipynb) notebook ([NBViewer](https://nbviewer.jupyter.org/github/rapidsai/cucim/blob/branch-23.06/notebooks/Welcome.ipynb))
7474

7575
#### Downloading sample images
7676

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
23.04.01
1+
23.06.00

‎ci/build_docs.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rapids-print-env
1818
rapids-logger "Downloading artifacts from previous jobs"
1919
CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
2020
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
21-
VERSION_NUMBER=$(rapids-get-rapids-version-from-git)
21+
VERSION_NUMBER="23.06"
2222

2323
rapids-mamba-retry install \
2424
--channel "${CPP_CHANNEL}" \
@@ -32,7 +32,7 @@ sphinx-build -b dirhtml ./source _html
3232
sphinx-build -b text ./source _text
3333
popd
3434

35-
if [[ "${RAPIDS_BUILD_TYPE}" == "branch" ]]; then
35+
if [[ "${RAPIDS_BUILD_TYPE}" != "pull-request" ]]; then
3636
rapids-logger "Upload Docs to S3"
3737
aws s3 sync --no-progress --delete docs/_html "s3://rapidsai-docs/cucim/${VERSION_NUMBER}/html"
3838
aws s3 sync --no-progress --delete docs/_text "s3://rapidsai-docs/cucim/${VERSION_NUMBER}/txt"

‎ci/release/update-version.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,4 @@ sed_runner "s#branch-${CURRENT_MAJOR}.${CURRENT_MINOR}#branch-${NEXT_MAJOR}.${NE
4848
for FILE in .github/workflows/*.yaml; do
4949
sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
5050
done
51+
sed_runner "s/VERSION_NUMBER=\".*/VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh

‎ci/test_python.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ set +e
4444

4545
rapids-logger "pytest cucim"
4646
pushd python/cucim
47-
pytest \
47+
timeout 20m pytest \
4848
--cache-clear \
4949
--junitxml="${RAPIDS_TESTS_DIR}/junit-cucim.xml" \
5050
--numprocesses=8 \
@@ -53,6 +53,7 @@ pytest \
5353
--cov=cucim \
5454
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cucim-coverage.xml" \
5555
--cov-report=term \
56+
-v \
5657
src \
5758
tests/unit \
5859
tests/performance

‎conda/environments/all_cuda-118_arch-x86_64.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@ dependencies:
1111
- click
1212
- cmake>=3.23.1,!=3.25.0
1313
- cudatoolkit=11.8
14-
- cupy >=10,<12.0.0a0
14+
- cupy >=12.0.0
1515
- cxx-compiler
1616
- gcc_linux-64=11.*
1717
- imagecodecs>=2021.6.8
1818
- ipython
1919
- jbig
20-
- jpeg
2120
- libwebp-base
2221
- nbsphinx
2322
- ninja

0 commit comments

Comments
 (0)