From 89074d704c25de96d81dc038b5c61cf9b8c785dc Mon Sep 17 00:00:00 2001 From: Sevag Hanssian Date: Tue, 31 Jan 2023 11:24:18 -0500 Subject: [PATCH 1/3] Pin wheel dependencies to same RAPIDS release --- ci/release/update-version.sh | 6 ++++++ python/setup.py | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 2a71708a0c..8de965720a 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -67,3 +67,9 @@ sed_runner "s/extra-repo-sha: branch-.*/extra-repo-sha: branch-${NEXT_SHORT_TAG} # Wheel builds install dask-cuda from source, update its branch sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" .github/workflows/*.yaml + +# Need to distutils-normalize the original version +NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))") + +# Wheel builds install intra-RAPIDS dependencies from same release +sed_runner "s/{cuda_suffix}==.*\",/{cuda_suffix}==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/setup.py diff --git a/python/setup.py b/python/setup.py index f7fa997bd6..d204f9e46c 100644 --- a/python/setup.py +++ b/python/setup.py @@ -147,10 +147,10 @@ def get_versions(): "seaborn", "treelite==3.1.0", "treelite_runtime==3.1.0", - f"cudf{cuda_suffix}", - f"dask-cudf{cuda_suffix}", - f"pylibraft{cuda_suffix}", - f"raft-dask{cuda_suffix}", + f"cudf{cuda_suffix}==23.2.*", + f"dask-cudf{cuda_suffix}==23.2.*", + f"pylibraft{cuda_suffix}==23.2.*", + f"raft-dask{cuda_suffix}==23.2.*", ], extras_require={ "test": [ From acaf1caa70be4fd8b71bb046ad69b3c5fd9939e3 Mon Sep 17 00:00:00 2001 From: Sevag Hanssian Date: Tue, 31 Jan 2023 14:09:29 -0500 Subject: [PATCH 2/3] Also modify _custom_build/backend.py --- ci/release/update-version.sh | 1 + python/_custom_build/backend.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 8de965720a..d6c31bbddc 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -73,3 +73,4 @@ NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; prin # Wheel builds install intra-RAPIDS dependencies from same release sed_runner "s/{cuda_suffix}==.*\",/{cuda_suffix}==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/setup.py +sed_runner "s/{cuda_suffix}==.*\",/{cuda_suffix}==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/_custom_build/backend.py diff --git a/python/_custom_build/backend.py b/python/_custom_build/backend.py index 46a7d79855..01745fcfa8 100644 --- a/python/_custom_build/backend.py +++ b/python/_custom_build/backend.py @@ -19,10 +19,10 @@ def replace_requirements(func): @wraps(func) def wrapper(config_settings=None): orig_list = getattr(_orig, func.__name__)(config_settings) - suffix = os.getenv('RAPIDS_PY_WHEEL_CUDA_SUFFIX', default='') + cuda_suffix = os.getenv('RAPIDS_PY_WHEEL_CUDA_SUFFIX', default='') append_list = [ - f"rmm{suffix}", - f"pylibraft{suffix}", + f"rmm{cuda_suffix}==23.2.*", + f"pylibraft{cuda_suffix}==23.2.*", ] return orig_list + append_list From ea88081d62b712f1268d497cbf7c06468b5c997c Mon Sep 17 00:00:00 2001 From: Sevag Hanssian Date: Wed, 1 Feb 2023 09:12:48 -0500 Subject: [PATCH 3/3] Update copyright year in update-version.sh --- ci/release/update-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index d6c31bbddc..ec1d70e93c 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2019-2022, NVIDIA CORPORATION. +# Copyright (c) 2019-2023, NVIDIA CORPORATION. ######################## # cuML Version Updater # ########################