diff --git a/ci/test_wheel_raft_dask.sh b/ci/test_wheel_raft_dask.sh index a9ae5dcabb..a20e950313 100755 --- a/ci/test_wheel_raft_dask.sh +++ b/ci/test_wheel_raft_dask.sh @@ -12,7 +12,7 @@ RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels python -m pip install --no-deps ./local-pylibraft-dep/pylibraft*.whl # Always install latest dask for testing -python -m pip install git+https://github.com/dask/dask.git@2023.9.2 git+https://github.com/dask/distributed.git@2023.9.2 git+https://github.com/rapidsai/dask-cuda.git@branch-23.12 +python -m 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.12 # echo to expand wildcard before adding `[extra]` requires for pip python -m pip install $(echo ./dist/raft_dask*.whl)[test] diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index 65f09f5101..27894d27e7 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -19,10 +19,10 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 -- dask-core==2023.9.2 +- dask-core>=2023.9.2 - dask-cuda==23.12.* -- dask==2023.9.2 -- distributed==2023.9.2 +- dask>=2023.9.2 +- distributed>=2023.9.2 - doxygen>=1.8.20 - gcc_linux-aarch64=11.* - gmock>=1.13.0 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index fcbf1451a8..96e5227186 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -19,10 +19,10 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 -- dask-core==2023.9.2 +- dask-core>=2023.9.2 - dask-cuda==23.12.* -- dask==2023.9.2 -- distributed==2023.9.2 +- dask>=2023.9.2 +- distributed>=2023.9.2 - doxygen>=1.8.20 - gcc_linux-64=11.* - gmock>=1.13.0 diff --git a/conda/environments/all_cuda-120_arch-aarch64.yaml b/conda/environments/all_cuda-120_arch-aarch64.yaml index 926132db63..e4ba4281c2 100644 --- a/conda/environments/all_cuda-120_arch-aarch64.yaml +++ b/conda/environments/all_cuda-120_arch-aarch64.yaml @@ -20,10 +20,10 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 -- dask-core==2023.9.2 +- dask-core>=2023.9.2 - dask-cuda==23.12.* -- dask==2023.9.2 -- distributed==2023.9.2 +- dask>=2023.9.2 +- distributed>=2023.9.2 - doxygen>=1.8.20 - gcc_linux-aarch64=11.* - gmock>=1.13.0 diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml index a1e22f50a0..d0430e10f6 100644 --- a/conda/environments/all_cuda-120_arch-x86_64.yaml +++ b/conda/environments/all_cuda-120_arch-x86_64.yaml @@ -20,10 +20,10 @@ dependencies: - cupy>=12.0.0 - cxx-compiler - cython>=3.0.0 -- dask-core==2023.9.2 +- dask-core>=2023.9.2 - dask-cuda==23.12.* -- dask==2023.9.2 -- distributed==2023.9.2 +- dask>=2023.9.2 +- distributed>=2023.9.2 - doxygen>=1.8.20 - gcc_linux-64=11.* - gmock>=1.13.0 diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index 04dfef5063..e794a1119f 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -60,10 +60,10 @@ requirements: - cudatoolkit {% endif %} - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - - dask ==2023.9.2 - - dask-core ==2023.9.2 + - dask >=2023.9.2 + - dask-core >=2023.9.2 - dask-cuda ={{ minor_version }} - - distributed ==2023.9.2 + - distributed >=2023.9.2 - joblib >=0.11 - nccl >=2.9.9 - pylibraft {{ version }} diff --git a/dependencies.yaml b/dependencies.yaml index 0c6a35f9f2..8b2526a4ff 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -431,16 +431,16 @@ dependencies: common: - output_types: [conda, pyproject] packages: - - dask==2023.9.2 + - dask>=2023.9.2 - dask-cuda==23.12.* - - distributed==2023.9.2 + - distributed>=2023.9.2 - joblib>=0.11 - numba>=0.57 - *numpy - ucx-py==0.35.* - output_types: conda packages: - - dask-core==2023.9.2 + - dask-core>=2023.9.2 - ucx>=1.13.0 - ucx-proc=*=gpu - &ucx_py_conda ucx-py==0.35.* diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index 1619edbbbf..8b0fd15261 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -35,8 +35,8 @@ license = { text = "Apache 2.0" } requires-python = ">=3.9" dependencies = [ "dask-cuda==23.12.*", - "dask==2023.9.2", - "distributed==2023.9.2", + "dask>=2023.9.2", + "distributed>=2023.9.2", "joblib>=0.11", "numba>=0.57", "numpy>=1.21",