Skip to content

Commit

Permalink
Unpin dask and distributed (#4482)
Browse files Browse the repository at this point in the history
Changes to be inline with: rapidsai/cudf#10028

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - Dante Gama Dessavre (https://github.com/dantegd)
  - AJ Schmidt (https://github.com/ajschmidt8)
  - https://github.com/jakirkham

URL: #4482
  • Loading branch information
galipremsagar authored Jan 13, 2022
1 parent f5556ba commit ead22e0
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions ci/gpu/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2018-2021, NVIDIA CORPORATION.
# Copyright (c) 2018-2022, NVIDIA CORPORATION.
##############################################
# cuML GPU build and test script for CI #
##############################################
Expand Down Expand Up @@ -125,8 +125,8 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then

gpuci_logger "Install the main version of dask and distributed"
set -x
pip install "git+https://github.com/dask/distributed.git@2021.11.2" --upgrade --no-deps
pip install "git+https://github.com/dask/dask.git@2021.11.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 "Python pytest for cuml"
Expand Down Expand Up @@ -217,8 +217,8 @@ else

gpuci_logger "Install the main version of dask and distributed"
set -x
pip install "git+https://github.com/dask/distributed.git@2021.11.2" --upgrade --no-deps
pip install "git+https://github.com/dask/dask.git@2021.11.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 "Python pytest for cuml"
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cuml_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies:
- pip
- pip:
- sphinx_markdown_tables
- git+https://github.com/dask/dask.git@2021.11.2
- git+https://github.com/dask/distributed.git@2021.11.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/
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cuml_dev_cuda11.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies:
- pip
- pip:
- sphinx_markdown_tables
- git+https://github.com/dask/dask.git@2021.11.2
- git+https://github.com/dask/distributed.git@2021.11.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/
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cuml_dev_cuda11.4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies:
- pip
- pip:
- sphinx_markdown_tables
- git+https://github.com/dask/dask.git@2021.11.2
- git+https://github.com/dask/distributed.git@2021.11.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/
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cuml_dev_cuda11.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies:
- pip
- pip:
- sphinx_markdown_tables
- git+https://github.com/dask/dask.git@2021.11.2
- git+https://github.com/dask/distributed.git@2021.11.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/
Expand Down
6 changes: 3 additions & 3 deletions conda/recipes/cuml/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2018-2021, NVIDIA CORPORATION.
# Copyright (c) 2018-2022, NVIDIA CORPORATION.

# Usage:
# conda build . -c conda-forge -c numba -c rapidsai -c pytorch
Expand Down Expand Up @@ -48,8 +48,8 @@ requirements:
- nccl>=2.9.9
- ucx-py {{ ucx_py_version }}
- ucx-proc=*=gpu
- dask>=2021.11.1,<=2021.11.2
- distributed>=2021.11.1,<=2021.11.2
- dask>=2021.11.1
- distributed>=2021.11.1
- joblib >=0.11
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}

Expand Down

0 comments on commit ead22e0

Please sign in to comment.