Skip to content

Commit

Permalink
Bump pinned deps to 23.4 (#1266)
Browse files Browse the repository at this point in the history
Some dependencies were not fully updated, probably because update-version.sh was run before the most recent updates to the script.

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

Approvers:
  - Corey J. Nolet (https://github.com/cjnolet)
  - Joseph (https://github.com/jolorunyomi)

URL: #1266
  • Loading branch information
vyasr authored Feb 10, 2023
1 parent d1e0d6c commit 611bda2
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
build_type: pull-request
package-name: raft_dask
# Always want to test against latest dask/distributed.
test-before-amd64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/dask-cuda.git@branch-23.02"
test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/dask-cuda.git@branch-23.02"
test-before-amd64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/dask-cuda.git@branch-23.04"
test-before-arm64: "RAPIDS_PY_WHEEL_NAME=pylibraft_cu11 rapids-download-wheels-from-s3 ./local-pylibraft-dep && pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl && pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/dask-cuda.git@branch-23.04"
test-unittest: "python -m pytest -v ./python/raft-dask/raft_dask/test"
test-smoketest: "python ./ci/wheel_smoke_test_raft_dask.py"
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ jobs:
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
package-name: raft_dask
test-before-amd64: "pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/dask-cuda.git@branch-23.02"
test-before-arm64: "pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/dask-cuda.git@branch-23.02"
test-before-amd64: "pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/dask-cuda.git@branch-23.04"
test-before-arm64: "pip install git+https://github.com/dask/[email protected] git+https://github.com/dask/[email protected] git+https://github.com/rapidsai/dask-cuda.git@branch-23.04"
test-unittest: "python -m pytest -v ./python/raft-dask/raft_dask/test"
4 changes: 3 additions & 1 deletion ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ sed_runner "s/export UCX_PY_VERSION=.*/export UCX_PY_VERSION='${NEXT_UCX_PY_VERS
sed_runner "/^ucx_py_version:$/ {n;s/.*/ - \"${NEXT_UCX_PY_VERSION}\"/}" conda/recipes/raft-dask/conda_build_config.yaml

# 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
for FILE in .github/workflows/*.yaml; do
sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" ${FILE};
done

# 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}'))")
Expand Down
2 changes: 1 addition & 1 deletion python/pylibraft/_custom_build/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def replace_requirements(func):
def wrapper(config_settings=None):
orig_list = getattr(_orig, func.__name__)(config_settings)
cuda_suffix = os.getenv("RAPIDS_PY_WHEEL_CUDA_SUFFIX", default="")
append_list = [f"rmm{cuda_suffix}==23.2.*"]
append_list = [f"rmm{cuda_suffix}==23.4.*"]
return orig_list + append_list

return wrapper
Expand Down
2 changes: 1 addition & 1 deletion python/pylibraft/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
install_requires = [
"numpy",
"cuda-python>=11.7.1,<12.0",
f"rmm{cuda_suffix}==23.2.*",
f"rmm{cuda_suffix}==23.4.*",
]

extras_require = {
Expand Down
6 changes: 3 additions & 3 deletions python/raft-dask/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"numpy",
"numba>=0.49",
"joblib>=0.11",
"dask-cuda==23.2.*",
"dask-cuda==23.4.*",
"dask==2023.1.1",
f"ucx-py{cuda_suffix}==0.30.*",
f"ucx-py{cuda_suffix}==0.31.*",
"distributed==2023.1.1",
f"pylibraft{cuda_suffix}==23.2.*",
f"pylibraft{cuda_suffix}==23.4.*",
]

extras_require = {
Expand Down

0 comments on commit 611bda2

Please sign in to comment.