From 2a993632cc6e0e1380e163188b5c9c3bd08844e1 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 23 Jan 2024 20:20:30 -0800 Subject: [PATCH 1/5] Add `RAPIDS_VERSION_NUMBER` to Python tests --- ci/release/update-version.sh | 1 + ci/test_python.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 3ccc1b71d..d16562bf7 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -48,3 +48,4 @@ for FILE in .github/workflows/*.yaml; do sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" done sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh +sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/test_python.sh diff --git a/ci/test_python.sh b/ci/test_python.sh index 476671b19..9bbd79ce9 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -7,6 +7,8 @@ set -euo pipefail . /opt/conda/etc/profile.d/conda.sh +export RAPIDS_VERSION_NUMBER="24.02" + rapids-logger "Generate Python testing dependencies" rapids-dependency-file-generator \ --output conda \ From cb1b2b912536a2a893eb5c35f5a8e14108dd263b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 23 Jan 2024 20:21:46 -0800 Subject: [PATCH 2/5] Pin RAPIDS version during cuCIM Conda testing --- ci/test_python.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/test_python.sh b/ci/test_python.sh index 9bbd79ce9..3739acf2e 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -35,7 +35,8 @@ rapids-print-env rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ --channel "${PYTHON_CHANNEL}" \ - libcucim cucim + "libcucim=${RAPIDS_VERSION_NUMBER}" \ + "cucim=${RAPIDS_VERSION_NUMBER}" rapids-logger "Check GPU usage" nvidia-smi From fd254ba28c52f18dea5858186a6dcb8ed09901ba Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 23 Jan 2024 21:49:57 -0800 Subject: [PATCH 3/5] Pin to `openslide` version `3` --- conda/recipes/libcucim/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/libcucim/meta.yaml b/conda/recipes/libcucim/meta.yaml index bd591c9e2..348cbfc5c 100644 --- a/conda/recipes/libcucim/meta.yaml +++ b/conda/recipes/libcucim/meta.yaml @@ -71,7 +71,7 @@ requirements: - jbig - libwebp-base - nvtx-c >=3.1.0 - - openslide + - openslide 3 - xz - zlib - zstd From 31ab83d97ad5e87da8ad676411119877aa6d64b2 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jan 2024 02:15:59 -0800 Subject: [PATCH 4/5] Validate wheel names --- ci/build_wheel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index a39ebf502..8d3fcf941 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -47,5 +47,6 @@ python -m pip wheel . -w dist -vvv --no-deps --disable-pip-version-check mkdir -p final_dist python -m auditwheel repair -w final_dist dist/* +ls -1 final_dist | grep -vqz 'none' RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 final_dist From fa99dc1acd91feeda3d06ce933052949608381be Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jan 2024 10:26:40 -0800 Subject: [PATCH 5/5] Relax `openslide` pin again Now that `openslide-python` has been rebuilt with `openslide` `4`, this pin is no longer needed. --- conda/recipes/libcucim/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/libcucim/meta.yaml b/conda/recipes/libcucim/meta.yaml index 348cbfc5c..bd591c9e2 100644 --- a/conda/recipes/libcucim/meta.yaml +++ b/conda/recipes/libcucim/meta.yaml @@ -71,7 +71,7 @@ requirements: - jbig - libwebp-base - nvtx-c >=3.1.0 - - openslide 3 + - openslide - xz - zlib - zstd