From ec547749d4f06d74a12fd8ee4526c6f35b1558cd Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 15 Jun 2022 18:34:28 -0500 Subject: [PATCH] Unpin `dask` & `distributed` for development (#704) Changes to be in line with: https://github.com/rapidsai/cudf/pull/11058 Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) URL: https://github.com/rapidsai/raft/pull/704 --- ci/gpu/build.sh | 4 ++-- conda/environments/raft_dev_cuda11.0.yml | 4 ++-- conda/environments/raft_dev_cuda11.2.yml | 4 ++-- conda/environments/raft_dev_cuda11.4.yml | 4 ++-- conda/environments/raft_dev_cuda11.5.yml | 4 ++-- conda/recipes/pyraft/meta.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 6c5ffb51f6..44708f590c 100644 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -95,8 +95,8 @@ fi # Install the master version of dask, distributed, and dask-ml gpuci_logger "Install the master version of dask and distributed" set -x -pip install "git+https://github.com/dask/distributed.git@2022.05.2" --upgrade --no-deps -pip install "git+https://github.com/dask/dask.git@2022.05.2" --upgrade --no-deps +pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps +pip install "git+https://github.com/dask/dask.git@main" --upgrade --no-deps set +x gpuci_logger "Check GPU usage" diff --git a/conda/environments/raft_dev_cuda11.0.yml b/conda/environments/raft_dev_cuda11.0.yml index cda02f9559..b7fb86811c 100644 --- a/conda/environments/raft_dev_cuda11.0.yml +++ b/conda/environments/raft_dev_cuda11.0.yml @@ -26,8 +26,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@2022.05.2 - - git+https://github.com/dask/distributed.git@2022.05.2 + - git+https://github.com/dask/dask.git@main + - git+https://github.com/dask/distributed.git@main # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/environments/raft_dev_cuda11.2.yml b/conda/environments/raft_dev_cuda11.2.yml index a14a81fab2..5ceb0ed645 100644 --- a/conda/environments/raft_dev_cuda11.2.yml +++ b/conda/environments/raft_dev_cuda11.2.yml @@ -26,8 +26,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@2022.05.2 - - git+https://github.com/dask/distributed.git@2022.05.2 + - git+https://github.com/dask/dask.git@main + - git+https://github.com/dask/distributed.git@main # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/environments/raft_dev_cuda11.4.yml b/conda/environments/raft_dev_cuda11.4.yml index 2efa2e5cc3..9f07c07f9f 100644 --- a/conda/environments/raft_dev_cuda11.4.yml +++ b/conda/environments/raft_dev_cuda11.4.yml @@ -26,8 +26,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@2022.05.2 - - git+https://github.com/dask/distributed.git@2022.05.2 + - git+https://github.com/dask/dask.git@main + - git+https://github.com/dask/distributed.git@main # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/environments/raft_dev_cuda11.5.yml b/conda/environments/raft_dev_cuda11.5.yml index c510d10911..8f02e688c9 100644 --- a/conda/environments/raft_dev_cuda11.5.yml +++ b/conda/environments/raft_dev_cuda11.5.yml @@ -27,8 +27,8 @@ dependencies: - pip: - sphinx_markdown_tables - breathe - - git+https://github.com/dask/dask.git@2022.05.2 - - git+https://github.com/dask/distributed.git@2022.05.2 + - git+https://github.com/dask/dask.git@main + - git+https://github.com/dask/distributed.git@main # rapids-build-env, notebook-env and doc-env are defined in # https://docs.rapids.ai/maintainers/depmgmt/ diff --git a/conda/recipes/pyraft/meta.yaml b/conda/recipes/pyraft/meta.yaml index f3ed6b2f18..a44808bb98 100644 --- a/conda/recipes/pyraft/meta.yaml +++ b/conda/recipes/pyraft/meta.yaml @@ -51,8 +51,8 @@ requirements: - ucx >={{ ucx_version }} - ucx-py {{ ucx_py_version }} - ucx-proc=*=gpu - - dask==2022.05.2 - - distributed==2022.05.2 + - dask>=2022.05.2 + - distributed>=2022.05.2 - cuda-python >=11.5,<12.0 - joblib >=0.11 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}