From 611bda2f2948c025d4a00e6fa17b145fb4ed74bc Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 9 Feb 2023 18:26:12 -0800 Subject: [PATCH] Bump pinned deps to 23.4 (#1266) 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: https://github.com/rapidsai/raft/pull/1266 --- .github/workflows/pr.yaml | 4 ++-- .github/workflows/test.yaml | 4 ++-- ci/release/update-version.sh | 4 +++- python/pylibraft/_custom_build/backend.py | 2 +- python/pylibraft/setup.py | 2 +- python/raft-dask/setup.py | 6 +++--- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 0ca00b5e26..4e37707906 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -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/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 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/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 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/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 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/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 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" diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index aa74faded2..dddea2c49e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" - test-before-arm64: "pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" + test-before-amd64: "pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" + test-before-arm64: "pip install git+https://github.com/dask/dask.git@2023.1.1 git+https://github.com/dask/distributed.git@2023.1.1 git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" test-unittest: "python -m pytest -v ./python/raft-dask/raft_dask/test" diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index bd0ff1db7b..4bc96eebb2 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -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}'))") diff --git a/python/pylibraft/_custom_build/backend.py b/python/pylibraft/_custom_build/backend.py index 209e9e4b67..1fe82860c1 100644 --- a/python/pylibraft/_custom_build/backend.py +++ b/python/pylibraft/_custom_build/backend.py @@ -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 diff --git a/python/pylibraft/setup.py b/python/pylibraft/setup.py index 230b9127e3..cc429f87b0 100644 --- a/python/pylibraft/setup.py +++ b/python/pylibraft/setup.py @@ -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 = { diff --git a/python/raft-dask/setup.py b/python/raft-dask/setup.py index 5feddb626e..e7462c3559 100644 --- a/python/raft-dask/setup.py +++ b/python/raft-dask/setup.py @@ -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 = {