diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 6ce6c2898b..03b66debb8 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@main git+https://github.com/dask/distributed.git@main 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@main git+https://github.com/dask/distributed.git@main 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.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-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 56441f681d..739f50861e 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@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.02" - test-before-arm64: "pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main 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.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-unittest: "python -m pytest -v ./python/raft-dask/raft_dask/test" diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 1808480d37..154edbc7f2 100644 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -41,10 +41,10 @@ unset GIT_DESCRIBE_TAG export UCX_PY_VERSION='0.30.*' # Whether to install dask nightly or stable packages. -export INSTALL_DASK_MAIN=1 +export INSTALL_DASK_MAIN=0 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2022.12.0" +export DASK_STABLE_VERSION="2023.1.1" ################################################################################ # SETUP - Check environment diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 87b7075935..7dc305bf97 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -19,8 +19,8 @@ dependencies: - cxx-compiler - cython>=0.29,<0.30 - dask-cuda=23.02 -- dask>=2022.12.0 -- distributed>=2022.12.0 +- dask==2023.1.1 +- distributed==2023.1.1 - doxygen>=1.8.20 - faiss-proc=*=cuda - gcc_linux-64=9 diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index 3e41e0df17..a8bc626eaa 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -45,9 +45,9 @@ requirements: run: - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} - cuda-python >=11.7.1,<12.0 - - dask >=2022.12.0 + - dask ==2023.1.1 - dask-cuda ={{ minor_version }} - - distributed >=2022.12.0 + - distributed ==2023.1.1 - joblib >=0.11 - nccl >=2.9.9 - pylibraft {{ version }} diff --git a/dependencies.yaml b/dependencies.yaml index ae900542c0..921e1ca46e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -167,8 +167,8 @@ dependencies: - output_types: [conda] packages: - rmm=23.02 - - dask>=2022.12.0 - - distributed>=2022.12.0 + - dask==2023.1.1 + - distributed==2023.1.1 - ucx>=1.13.0 - ucx-py=0.30 - ucx-proc=*=gpu diff --git a/python/raft-dask/setup.py b/python/raft-dask/setup.py index 3299ea9bc5..5feddb626e 100644 --- a/python/raft-dask/setup.py +++ b/python/raft-dask/setup.py @@ -27,9 +27,9 @@ "numba>=0.49", "joblib>=0.11", "dask-cuda==23.2.*", - "dask>=2022.12.0", + "dask==2023.1.1", f"ucx-py{cuda_suffix}==0.30.*", - "distributed>=2022.12.0", + "distributed==2023.1.1", f"pylibraft{cuda_suffix}==23.2.*", ]