Skip to content

Commit

Permalink
Pin wheel dependencies to same RAPIDS release (rapidsai#5183)
Browse files Browse the repository at this point in the history
Now that wheel CI is enabled, the nightly index will contain next release wheels, so we need to ensure those don't get installed while still building this release.

Authors:
  - Sevag H (https://github.com/sevagh)
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Carl Simon Adorf (https://github.com/csadorf)
  - Dante Gama Dessavre (https://github.com/dantegd)

URL: rapidsai#5183
  • Loading branch information
sevagh authored Feb 2, 2023
1 parent 96f45f3 commit 56994ed
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
9 changes: 8 additions & 1 deletion ci/release/update-version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2019-2022, NVIDIA CORPORATION.
# Copyright (c) 2019-2023, NVIDIA CORPORATION.
########################
# cuML Version Updater #
########################
Expand Down Expand Up @@ -67,3 +67,10 @@ 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
sed_runner "s/{cuda_suffix}==.*\",/{cuda_suffix}==${NEXT_SHORT_TAG_PEP440}.*\",/g" python/_custom_build/backend.py
6 changes: 3 additions & 3 deletions python/_custom_build/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down

0 comments on commit 56994ed

Please sign in to comment.