From ead22e0b011bff34143b6ff602704985ed940d9e Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Thu, 13 Jan 2022 08:14:41 -0600 Subject: [PATCH] Unpin `dask` and `distributed` (#4482) Changes to be inline with: https://github.com/rapidsai/cudf/pull/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: https://github.com/rapidsai/cuml/pull/4482 --- ci/gpu/build.sh | 10 +++++----- conda/environments/cuml_dev_cuda11.0.yml | 4 ++-- conda/environments/cuml_dev_cuda11.2.yml | 4 ++-- conda/environments/cuml_dev_cuda11.4.yml | 4 ++-- conda/environments/cuml_dev_cuda11.5.yml | 4 ++-- conda/recipes/cuml/meta.yaml | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 5d682a66d1..5433540c8f 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -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 # ############################################## @@ -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" @@ -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" diff --git a/conda/environments/cuml_dev_cuda11.0.yml b/conda/environments/cuml_dev_cuda11.0.yml index 8a948ee92e..4d95fc19b7 100644 --- a/conda/environments/cuml_dev_cuda11.0.yml +++ b/conda/environments/cuml_dev_cuda11.0.yml @@ -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/ diff --git a/conda/environments/cuml_dev_cuda11.2.yml b/conda/environments/cuml_dev_cuda11.2.yml index 5013d083b7..e4eb35c3e9 100644 --- a/conda/environments/cuml_dev_cuda11.2.yml +++ b/conda/environments/cuml_dev_cuda11.2.yml @@ -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/ diff --git a/conda/environments/cuml_dev_cuda11.4.yml b/conda/environments/cuml_dev_cuda11.4.yml index d455b15f5c..ca3d583333 100644 --- a/conda/environments/cuml_dev_cuda11.4.yml +++ b/conda/environments/cuml_dev_cuda11.4.yml @@ -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/ diff --git a/conda/environments/cuml_dev_cuda11.5.yml b/conda/environments/cuml_dev_cuda11.5.yml index b2b4e257d1..b9d5e9481f 100644 --- a/conda/environments/cuml_dev_cuda11.5.yml +++ b/conda/environments/cuml_dev_cuda11.5.yml @@ -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/ diff --git a/conda/recipes/cuml/meta.yaml b/conda/recipes/cuml/meta.yaml index 6d2a4eb2b3..3d10993733 100644 --- a/conda/recipes/cuml/meta.yaml +++ b/conda/recipes/cuml/meta.yaml @@ -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 @@ -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') }}