From 50149d05c8cb656c8e3addec80e9516a05801ce3 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 1 Feb 2022 08:56:13 -0800 Subject: [PATCH 01/26] unpin dask --- ci/benchmark/build.sh | 2 +- ci/gpu/build.sh | 2 +- conda/environments/cudf_dev_cuda11.5.yml | 4 ++-- conda/recipes/custreamz/meta.yaml | 4 ++-- conda/recipes/dask-cudf/meta.yaml | 8 ++++---- python/custreamz/dev_requirements.txt | 4 ++-- python/dask_cudf/dev_requirements.txt | 4 ++-- python/dask_cudf/setup.py | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 178bdab0154..534ac19ee98 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -37,7 +37,7 @@ export GBENCH_BENCHMARKS_DIR="$WORKSPACE/cpp/build/gbenchmarks/" export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache" # Dask & Distributed git tag -export DASK_DISTRIBUTED_GIT_TAG='2022.01.0' +export DASK_DISTRIBUTED_GIT_TAG='main' function remove_libcudf_kernel_cache_dir { EXITCODE=$? diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index d5fb7451769..901a67286b8 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -31,7 +31,7 @@ export GIT_DESCRIBE_TAG=`git describe --tags` export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'` # Dask & Distributed git tag -export DASK_DISTRIBUTED_GIT_TAG='2022.01.0' +export DASK_DISTRIBUTED_GIT_TAG='main' # ucx-py version export UCX_PY_VERSION='0.25.*' diff --git a/conda/environments/cudf_dev_cuda11.5.yml b/conda/environments/cudf_dev_cuda11.5.yml index b9577d937d9..f0d11e961cc 100644 --- a/conda/environments/cudf_dev_cuda11.5.yml +++ b/conda/environments/cudf_dev_cuda11.5.yml @@ -42,8 +42,8 @@ dependencies: - pydocstyle=6.1.1 - typing_extensions - pre-commit - - dask>=2021.11.1,<=2022.01.0 - - distributed>=2021.11.1,<=2022.01.0 + - dask>=2021.11.1 + - distributed>=2021.11.1 - streamz - arrow-cpp=5.0.0 - dlpack>=0.5,<0.6.0a0 diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index 2e8badc3a54..c1bab5c9ff3 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -32,8 +32,8 @@ requirements: - python - streamz - cudf {{ version }} - - dask>=2021.11.1,<=2022.01.0 - - distributed>=2021.11.1,<=2022.01.0 + - dask>=2021.11.1 + - distributed>=2021.11.1 - python-confluent-kafka >=1.7.0,<1.8.0a0 - cudf_kafka {{ version }} diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index 225d77729df..fd34ff4112d 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -27,14 +27,14 @@ requirements: host: - python - cudf {{ version }} - - dask>=2021.11.1,<=2022.01.0 - - distributed>=2021.11.1,<=2022.01.0 + - dask>=2021.11.1 + - distributed>=2021.11.1 - cudatoolkit {{ cuda_version }} run: - python - cudf {{ version }} - - dask>=2021.11.1,<=2022.01.0 - - distributed>=2021.11.1,<=2022.01.0 + - dask>=2021.11.1 + - distributed>=2021.11.1 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} test: # [linux64] diff --git a/python/custreamz/dev_requirements.txt b/python/custreamz/dev_requirements.txt index b4cd7a649ee..d1f783cc672 100644 --- a/python/custreamz/dev_requirements.txt +++ b/python/custreamz/dev_requirements.txt @@ -3,8 +3,8 @@ flake8==3.8.3 black==19.10b0 isort==5.6.4 -dask>=2021.11.1,<=2022.01.0 -distributed>=2021.11.1,<=2022.01.0 +dask>=2021.11.1 +distributed>=2021.11.1 streamz python-confluent-kafka pytest diff --git a/python/dask_cudf/dev_requirements.txt b/python/dask_cudf/dev_requirements.txt index d5ba79d4987..d8b0745be79 100644 --- a/python/dask_cudf/dev_requirements.txt +++ b/python/dask_cudf/dev_requirements.txt @@ -1,7 +1,7 @@ # Copyright (c) 2021, NVIDIA CORPORATION. -dask>=2021.11.1,<=2022.01.0 -distributed>=2021.11.1,<=2022.01.0 +dask>=2021.11.1 +distributed>=2021.11.1 fsspec>=0.6.0 numba>=0.53.1 numpy diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py index 39491a45e7e..425839772eb 100644 --- a/python/dask_cudf/setup.py +++ b/python/dask_cudf/setup.py @@ -10,8 +10,8 @@ install_requires = [ "cudf", - "dask>=2021.11.1,<=2022.01.0", - "distributed>=2021.11.1,<=2022.01.0", + "dask>=2021.11.1", + "distributed>=2021.11.1", "fsspec>=0.6.0", "numpy", "pandas>=1.0,<1.4.0dev0", From abf829ce514dd256678aaa9ece37d5a4e55b31db Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 1 Feb 2022 12:33:51 -0800 Subject: [PATCH 02/26] use nightly packages --- ci/benchmark/build.sh | 17 +++++++++++------ ci/gpu/build.sh | 11 ++++++++--- conda/environments/cudf_dev_cuda11.5.yml | 3 +-- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 534ac19ee98..3095695c01d 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -36,8 +36,8 @@ export GBENCH_BENCHMARKS_DIR="$WORKSPACE/cpp/build/gbenchmarks/" # like `/tmp` is. export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache" -# Dask & Distributed git tag -export DASK_DISTRIBUTED_GIT_TAG='main' +# Dask & Distributed option to install main +export INSTALL_DASK_MAIN=1 function remove_libcudf_kernel_cache_dir { EXITCODE=$? @@ -78,10 +78,15 @@ conda install "rmm=$MINOR_VERSION.*" "cudatoolkit=$CUDA_REL" \ # conda install "your-pkg=1.0.0" # Install the master version of dask, distributed, and streamz -logger "pip install git+https://github.com/dask/distributed.git@$DASK_DISTRIBUTED_GIT_TAG --upgrade --no-deps" -pip install "git+https://github.com/dask/distributed.git@$DASK_DISTRIBUTED_GIT_TAG" --upgrade --no-deps -logger "pip install git+https://github.com/dask/dask.git@$DASK_DISTRIBUTED_GIT_TAG --upgrade --no-deps" -pip install "git+https://github.com/dask/dask.git@$DASK_DISTRIBUTED_GIT_TAG" --upgrade --no-deps +# Install the main version of dask and distributed +if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then + gpuci_logger "conda install -c dask/label/dev dask" + conda install -c dask/label/dev dask +else + gpuci_logger "conda install -c conda-forge dask" + conda install -c conda-forge dask +fi + logger "pip install git+https://github.com/python-streamz/streamz.git@master --upgrade --no-deps" pip install "git+https://github.com/python-streamz/streamz.git@master" --upgrade --no-deps diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 901a67286b8..a5fa9e03b1f 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -31,7 +31,7 @@ export GIT_DESCRIBE_TAG=`git describe --tags` export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'` # Dask & Distributed git tag -export DASK_DISTRIBUTED_GIT_TAG='main' +export INSTALL_DASK_MAIN=1 # ucx-py version export UCX_PY_VERSION='0.25.*' @@ -107,8 +107,13 @@ function install_dask { # Install the main version of dask, distributed, and streamz gpuci_logger "Install the main version of dask, distributed, and streamz" set -x - pip install "git+https://github.com/dask/distributed.git@$DASK_DISTRIBUTED_GIT_TAG" --upgrade --no-deps - pip install "git+https://github.com/dask/dask.git@$DASK_DISTRIBUTED_GIT_TAG" --upgrade --no-deps + if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then + gpuci_logger "conda install -c dask/label/dev dask" + conda install -c dask/label/dev dask + else + gpuci_logger "conda install -c conda-forge dask" + conda install -c conda-forge dask + fi # Need to uninstall streamz that is already in the env. pip uninstall -y streamz pip install "git+https://github.com/python-streamz/streamz.git@master" --upgrade --no-deps diff --git a/conda/environments/cudf_dev_cuda11.5.yml b/conda/environments/cudf_dev_cuda11.5.yml index f0d11e961cc..842aeaccd2a 100644 --- a/conda/environments/cudf_dev_cuda11.5.yml +++ b/conda/environments/cudf_dev_cuda11.5.yml @@ -5,6 +5,7 @@ channels: - rapidsai - nvidia - rapidsai-nightly + - dask/label/dev - conda-forge dependencies: - clang=11.1.0 @@ -63,8 +64,6 @@ dependencies: - librdkafka=1.7.0 - python-confluent-kafka=1.7.0 - pip: - - git+https://github.com/dask/dask.git@main - - git+https://github.com/dask/distributed.git@main - git+https://github.com/python-streamz/streamz.git@master - pyorc - ptxcompiler # [linux64] From 0efc560e75273892c891f96740a4e752b4c50918 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 1 Feb 2022 12:42:28 -0800 Subject: [PATCH 03/26] modify comments --- ci/benchmark/build.sh | 8 ++++---- ci/gpu/build.sh | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 3095695c01d..c7e15d9c5f6 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -36,7 +36,7 @@ export GBENCH_BENCHMARKS_DIR="$WORKSPACE/cpp/build/gbenchmarks/" # like `/tmp` is. export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache" -# Dask & Distributed option to install main +# Dask & Distributed option to install main(nightly) or `conda-forge` packages. export INSTALL_DASK_MAIN=1 function remove_libcudf_kernel_cache_dir { @@ -77,16 +77,16 @@ conda install "rmm=$MINOR_VERSION.*" "cudatoolkit=$CUDA_REL" \ # conda remove -f rapids-build-env rapids-notebook-env # conda install "your-pkg=1.0.0" -# Install the master version of dask, distributed, and streamz -# Install the main version of dask and distributed +# Install the conda-forge or nightly version of dask and distributed if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then gpuci_logger "conda install -c dask/label/dev dask" conda install -c dask/label/dev dask else - gpuci_logger "conda install -c conda-forge dask" + gpuci_logger "conda install -c conda-forge dask>=2021.11.1" conda install -c conda-forge dask fi +# Install the master version of streamz logger "pip install git+https://github.com/python-streamz/streamz.git@master --upgrade --no-deps" pip install "git+https://github.com/python-streamz/streamz.git@master" --upgrade --no-deps diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index a5fa9e03b1f..4fb90cca6f7 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -30,7 +30,7 @@ export CONDA_ARTIFACT_PATH="$WORKSPACE/ci/artifacts/cudf/cpu/.conda-bld/" export GIT_DESCRIBE_TAG=`git describe --tags` export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'` -# Dask & Distributed git tag +# Dask & Distributed option to install main(nightly) or `conda-forge` packages. export INSTALL_DASK_MAIN=1 # ucx-py version @@ -104,8 +104,8 @@ conda config --show-sources conda list --show-channel-urls function install_dask { - # Install the main version of dask, distributed, and streamz - gpuci_logger "Install the main version of dask, distributed, and streamz" + # Install the conda-forge or nightly version of dask and distributed + gpuci_logger "Install the conda-forge or nightly version of dask and distributed" set -x if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then gpuci_logger "conda install -c dask/label/dev dask" @@ -114,6 +114,8 @@ function install_dask { gpuci_logger "conda install -c conda-forge dask" conda install -c conda-forge dask fi + # Install the main version of streamz + gpuci_logger "Install the main version of streamz" # Need to uninstall streamz that is already in the env. pip uninstall -y streamz pip install "git+https://github.com/python-streamz/streamz.git@master" --upgrade --no-deps From 8b717f95c80e5a7bb6a6190c2a060fb60617bb27 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 1 Feb 2022 13:02:53 -0800 Subject: [PATCH 04/26] remove dask nightly channel --- ci/cpu/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 6f19f174da0..1ebb7b0f23e 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -42,9 +42,10 @@ gpuci_logger "Activate conda env" . /opt/conda/etc/profile.d/conda.sh conda activate rapids -# Remove rapidsai-nightly channel if we are building main branch +# Remove `rapidsai-nightly` & `dask/label/dev` channel if we are building main branch if [ "$SOURCE_BRANCH" = "main" ]; then conda config --system --remove channels rapidsai-nightly + conda config --system --remove channels dask/label/dev fi gpuci_logger "Check compiler versions" From 3ea2f52911537bcbb16f0ae7dbc8801dc90ee407 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Tue, 1 Feb 2022 17:32:40 -0600 Subject: [PATCH 05/26] Apply suggestions from code review --- ci/benchmark/build.sh | 4 ++-- ci/gpu/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index c7e15d9c5f6..be54941dd1d 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -79,8 +79,8 @@ conda install "rmm=$MINOR_VERSION.*" "cudatoolkit=$CUDA_REL" \ # Install the conda-forge or nightly version of dask and distributed if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then - gpuci_logger "conda install -c dask/label/dev dask" - conda install -c dask/label/dev dask + gpuci_logger "conda install dask/label/dev::dask --force-reinstall" + conda install dask/label/dev::dask --force-reinstall else gpuci_logger "conda install -c conda-forge dask>=2021.11.1" conda install -c conda-forge dask diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 4fb90cca6f7..cc144e06c13 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -108,8 +108,8 @@ function install_dask { gpuci_logger "Install the conda-forge or nightly version of dask and distributed" set -x if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then - gpuci_logger "conda install -c dask/label/dev dask" - conda install -c dask/label/dev dask + gpuci_logger "conda install dask/label/dev::dask --force-reinstall" + conda install dask/label/dev::dask --force-reinstall else gpuci_logger "conda install -c conda-forge dask" conda install -c conda-forge dask From 5c417c6c4b70fab6bc4a1c8d6b3482fa8ad2bbce Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Tue, 1 Feb 2022 18:33:32 -0600 Subject: [PATCH 06/26] Apply suggestions from code review --- ci/benchmark/build.sh | 8 ++++---- ci/gpu/build.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index be54941dd1d..9a5f3a8f08f 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -79,11 +79,11 @@ conda install "rmm=$MINOR_VERSION.*" "cudatoolkit=$CUDA_REL" \ # Install the conda-forge or nightly version of dask and distributed if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then - gpuci_logger "conda install dask/label/dev::dask --force-reinstall" - conda install dask/label/dev::dask --force-reinstall + gpuci_logger "gpuci_mamba_retry install dask/label/dev::dask --force-reinstall" + gpuci_mamba_retry install dask/label/dev::dask --force-reinstall else - gpuci_logger "conda install -c conda-forge dask>=2021.11.1" - conda install -c conda-forge dask + gpuci_logger "gpuci_mamba_retry install -c conda-forge dask>=2021.11.1" + gpuci_mamba_retry install -c conda-forge dask fi # Install the master version of streamz diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index cc144e06c13..9cae0f94f88 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -108,11 +108,11 @@ function install_dask { gpuci_logger "Install the conda-forge or nightly version of dask and distributed" set -x if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then - gpuci_logger "conda install dask/label/dev::dask --force-reinstall" - conda install dask/label/dev::dask --force-reinstall + gpuci_logger "gpuci_mamba_retry install dask/label/dev::dask --force-reinstall" + gpuci_mamba_retry install dask/label/dev::dask --force-reinstall else - gpuci_logger "conda install -c conda-forge dask" - conda install -c conda-forge dask + gpuci_logger "gpuci_mamba_retry install -c conda-forge dask" + gpuci_mamba_retry install -c conda-forge dask fi # Install the main version of streamz gpuci_logger "Install the main version of streamz" From 8dfe18a80ef51200d7df1fd5030374bfa427c60d Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Thu, 10 Feb 2022 07:47:04 -0800 Subject: [PATCH 07/26] copyright --- ci/benchmark/build.sh | 2 +- ci/cpu/build.sh | 2 +- ci/gpu/build.sh | 2 +- conda/recipes/dask-cudf/meta.yaml | 2 +- python/dask_cudf/setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index c7e15d9c5f6..dacf032f898 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2022, NVIDIA CORPORATION. ######################################### # cuDF GPU build and test script for CI # ######################################### diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 8ae30a57929..465a6eae7e4 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2018-2021, NVIDIA CORPORATION. +# Copyright (c) 2018-2022, NVIDIA CORPORATION. ############################################## # cuDF CPU conda build script for CI # ############################################## diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 3d66e51299b..5f5a06f3322 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. ############################################## # cuDF GPU build and test script for CI # ############################################## diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index fd34ff4112d..3e3fc4dd749 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2019, NVIDIA CORPORATION. +# Copyright (c) 2018-2022, NVIDIA CORPORATION. {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py index 4f63cdec59a..abd51251951 100644 --- a/python/dask_cudf/setup.py +++ b/python/dask_cudf/setup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2021, NVIDIA CORPORATION. +# Copyright (c) 2019-2022, NVIDIA CORPORATION. import os import re From ad8a8e9ee467090a6c678674d9cb1d8145ce92df Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Mon, 14 Feb 2022 17:36:31 -0600 Subject: [PATCH 08/26] Update ci/gpu/build.sh Co-authored-by: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> --- ci/gpu/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 76a6a2312d9..d1696964502 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -112,8 +112,8 @@ function install_dask { gpuci_logger "Install the conda-forge or nightly version of dask and distributed" set -x if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then - gpuci_logger "gpuci_mamba_retry install dask/label/dev::dask --force-reinstall" - gpuci_mamba_retry install dask/label/dev::dask --force-reinstall + gpuci_logger "gpuci_mamba_retry install -c dask/label/dev dask --force-reinstall" + gpuci_mamba_retry install -c dask/label/dev dask --force-reinstall else gpuci_logger "gpuci_mamba_retry install -c conda-forge dask" gpuci_mamba_retry install -c conda-forge dask From 8293d80aef34680f3b4c01c8bed5c899fc9db27f Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Mon, 14 Feb 2022 19:09:57 -0600 Subject: [PATCH 09/26] Update ci/gpu/build.sh --- ci/gpu/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index d1696964502..76a6a2312d9 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -112,8 +112,8 @@ function install_dask { gpuci_logger "Install the conda-forge or nightly version of dask and distributed" set -x if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then - gpuci_logger "gpuci_mamba_retry install -c dask/label/dev dask --force-reinstall" - gpuci_mamba_retry install -c dask/label/dev dask --force-reinstall + gpuci_logger "gpuci_mamba_retry install dask/label/dev::dask --force-reinstall" + gpuci_mamba_retry install dask/label/dev::dask --force-reinstall else gpuci_logger "gpuci_mamba_retry install -c conda-forge dask" gpuci_mamba_retry install -c conda-forge dask From 9d69c86753bfc2ba62e8a0bb9628c1342cfc0a4e Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 23 Feb 2022 09:22:50 -0600 Subject: [PATCH 10/26] Update build.sh --- ci/gpu/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 76a6a2312d9..e1da0788e98 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -112,8 +112,8 @@ function install_dask { gpuci_logger "Install the conda-forge or nightly version of dask and distributed" set -x if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then - gpuci_logger "gpuci_mamba_retry install dask/label/dev::dask --force-reinstall" - gpuci_mamba_retry install dask/label/dev::dask --force-reinstall + gpuci_logger "gpuci_mamba_retry update dask" + gpuci_mamba_retry update dask else gpuci_logger "gpuci_mamba_retry install -c conda-forge dask" gpuci_mamba_retry install -c conda-forge dask From 8de573f6d7c752bed1a2c22e5b784719f38977b1 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 23 Feb 2022 10:46:29 -0600 Subject: [PATCH 11/26] Update build.sh --- ci/benchmark/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 30681fc12dd..84a04d90278 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -79,8 +79,8 @@ conda install "rmm=$MINOR_VERSION.*" "cudatoolkit=$CUDA_REL" \ # Install the conda-forge or nightly version of dask and distributed if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then - gpuci_logger "gpuci_mamba_retry install dask/label/dev::dask --force-reinstall" - gpuci_mamba_retry install dask/label/dev::dask --force-reinstall + gpuci_logger "gpuci_mamba_retry update dask" + gpuci_mamba_retry update dask else gpuci_logger "gpuci_mamba_retry install -c conda-forge dask>=2021.11.1" gpuci_mamba_retry install -c conda-forge dask From 3d3032a9048e923fc8fe3fb7a5f8de0b8b3da473 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 23 Feb 2022 10:55:19 -0600 Subject: [PATCH 12/26] testing --- ci/gpu/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index e1da0788e98..c0c3dc34778 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -114,6 +114,8 @@ function install_dask { if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask + gpuci_logger "gpuci_mamba_retry install -c conda-forge dask" + gpuci_mamba_retry install -c conda-forge dask else gpuci_logger "gpuci_mamba_retry install -c conda-forge dask" gpuci_mamba_retry install -c conda-forge dask From 919a5b0c58fad58b8ce0bc7ef55c5c1bb002def3 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 23 Feb 2022 14:21:19 -0600 Subject: [PATCH 13/26] Apply suggestions from code review Co-authored-by: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> --- ci/benchmark/build.sh | 4 ++-- ci/gpu/build.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 84a04d90278..9ffb62a3ab2 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -82,8 +82,8 @@ if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask else - gpuci_logger "gpuci_mamba_retry install -c conda-forge dask>=2021.11.1" - gpuci_mamba_retry install -c conda-forge dask + gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" + gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall fi # Install the master version of streamz diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index c0c3dc34778..9d8739e9760 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -114,11 +114,11 @@ function install_dask { if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask - gpuci_logger "gpuci_mamba_retry install -c conda-forge dask" - gpuci_mamba_retry install -c conda-forge dask + gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" + gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall else - gpuci_logger "gpuci_mamba_retry install -c conda-forge dask" - gpuci_mamba_retry install -c conda-forge dask + gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" + gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall fi # Install the main version of streamz gpuci_logger "Install the main version of streamz" From d9ad8593abae32ae904d5dc4fd9424b017b873f6 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Wed, 23 Feb 2022 15:58:51 -0600 Subject: [PATCH 14/26] Apply suggestions from code review Co-authored-by: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> --- ci/benchmark/build.sh | 2 +- ci/gpu/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 9ffb62a3ab2..1cd49913959 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -83,7 +83,7 @@ if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then gpuci_mamba_retry update dask else gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall + gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" --force-reinstall fi # Install the master version of streamz diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 9d8739e9760..9763e427f02 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -115,10 +115,10 @@ function install_dask { gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall + gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" --force-reinstall else gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall + gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" --force-reinstall fi # Install the main version of streamz gpuci_logger "Install the main version of streamz" From 779d808f686706aaba0a9d509bc64348b9428eb0 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 25 Feb 2022 13:24:31 -0600 Subject: [PATCH 15/26] Update ci/gpu/build.sh --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 9763e427f02..c95b0359801 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -115,7 +115,7 @@ function install_dask { gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" --force-reinstall + gpuci_mamba_retry install -c conda-forge dask>=2021.11.1 distributed>=2021.11.1 --force-reinstall else gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" --force-reinstall From 8bde2ff5b5def4b553d9f7e9aec8b2f0387e999e Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Thu, 10 Mar 2022 15:30:34 -0600 Subject: [PATCH 16/26] Update build.sh --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 28ee7ab63af..71bc908703d 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -115,7 +115,7 @@ function install_dask { gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install -c conda-forge dask>=2021.11.1 distributed>=2021.11.1 --force-reinstall + gpuci_mamba_retry install -c conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall else gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" --force-reinstall From d8aa8a990d08f327dfd609b0ab5bf899f1e8982d Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Thu, 10 Mar 2022 19:03:03 -0600 Subject: [PATCH 17/26] Update build.sh --- ci/gpu/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 71bc908703d..6e1244ff836 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -117,8 +117,8 @@ function install_dask { gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" gpuci_mamba_retry install -c conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall else - gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" --force-reinstall + gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1" + gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" fi # Install the main version of streamz gpuci_logger "Install the main version of streamz" From 50ca04a1e00cfaf95e6ceefb35dffb4b462122f4 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Thu, 10 Mar 2022 21:05:11 -0600 Subject: [PATCH 18/26] Update build.sh --- ci/gpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 6e1244ff836..4952ffa8fa5 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -115,7 +115,7 @@ function install_dask { gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install -c conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall + gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall else gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1" gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" From 9b633713b3eab3ce36067f2bc373a515c06e0f22 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Thu, 10 Mar 2022 22:43:47 -0600 Subject: [PATCH 19/26] Update build.sh --- ci/gpu/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 4952ffa8fa5..1d7b000f330 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -116,6 +116,7 @@ function install_dask { gpuci_mamba_retry update dask gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall + conda list else gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1" gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" From 7d9673edfe0134a22bd5d03030e6759560bc85a2 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 11 Mar 2022 09:14:32 -0600 Subject: [PATCH 20/26] Update build.sh --- ci/gpu/build.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 1d7b000f330..f32874d2634 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -114,12 +114,10 @@ function install_dask { if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask - gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall conda list else - gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1" - gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" + gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall" + gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall fi # Install the main version of streamz gpuci_logger "Install the main version of streamz" From 3fdb8c9eb554f86b7e0f6247c90d06957bb31a52 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 11 Mar 2022 09:15:22 -0600 Subject: [PATCH 21/26] Update ci/benchmark/build.sh --- ci/benchmark/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index dc650a52d3e..8ab680cc43a 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -82,8 +82,8 @@ if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask else - gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install "conda-forge::dask>=2021.11.1" --force-reinstall + gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall" + gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall fi # Install the master version of streamz From b1282c9d749d9e091459926259cf3e6e7db8ad9b Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Fri, 11 Mar 2022 11:52:24 -0600 Subject: [PATCH 22/26] Apply suggestions from code review --- ci/benchmark/build.sh | 4 ++-- ci/gpu/build.sh | 4 ++-- conda/environments/cudf_dev_cuda11.5.yml | 4 ++-- conda/recipes/custreamz/meta.yaml | 4 ++-- conda/recipes/dask-cudf/meta.yaml | 8 ++++---- python/custreamz/dev_requirements.txt | 4 ++-- python/dask_cudf/dev_requirements.txt | 4 ++-- python/dask_cudf/setup.py | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 8ab680cc43a..87241864f5d 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -82,8 +82,8 @@ if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask else - gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall + gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 --force-reinstall" + gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 --force-reinstall fi # Install the master version of streamz diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 7b998a2c75a..e060724bd4f 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -116,8 +116,8 @@ function install_dask { gpuci_mamba_retry update dask conda list else - gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall" - gpuci_mamba_retry install conda-forge::dask>=2021.11.1 conda-forge::distributed>=2021.11.1 --force-reinstall + gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 --force-reinstall" + gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 --force-reinstall fi # Install the main version of streamz gpuci_logger "Install the main version of streamz" diff --git a/conda/environments/cudf_dev_cuda11.5.yml b/conda/environments/cudf_dev_cuda11.5.yml index f9abd078f5f..097ca2089a5 100644 --- a/conda/environments/cudf_dev_cuda11.5.yml +++ b/conda/environments/cudf_dev_cuda11.5.yml @@ -43,8 +43,8 @@ dependencies: - pydocstyle=6.1.1 - typing_extensions - pre-commit - - dask>=2021.11.1 - - distributed>=2021.11.1 + - dask>=2022.02.1 + - distributed>=2022.02.1 - streamz - arrow-cpp=6.0.1 - dlpack>=0.5,<0.6.0a0 diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index c1bab5c9ff3..de51e8a205c 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -32,8 +32,8 @@ requirements: - python - streamz - cudf {{ version }} - - dask>=2021.11.1 - - distributed>=2021.11.1 + - dask>=2022.02.1 + - distributed>=2022.02.1 - python-confluent-kafka >=1.7.0,<1.8.0a0 - cudf_kafka {{ version }} diff --git a/conda/recipes/dask-cudf/meta.yaml b/conda/recipes/dask-cudf/meta.yaml index 3e3fc4dd749..fe565cf8848 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -27,14 +27,14 @@ requirements: host: - python - cudf {{ version }} - - dask>=2021.11.1 - - distributed>=2021.11.1 + - dask>=2022.02.1 + - distributed>=2022.02.1 - cudatoolkit {{ cuda_version }} run: - python - cudf {{ version }} - - dask>=2021.11.1 - - distributed>=2021.11.1 + - dask>=2022.02.1 + - distributed>=2022.02.1 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} test: # [linux64] diff --git a/python/custreamz/dev_requirements.txt b/python/custreamz/dev_requirements.txt index d1f783cc672..18a16e15248 100644 --- a/python/custreamz/dev_requirements.txt +++ b/python/custreamz/dev_requirements.txt @@ -3,8 +3,8 @@ flake8==3.8.3 black==19.10b0 isort==5.6.4 -dask>=2021.11.1 -distributed>=2021.11.1 +dask>=2022.02.1 +distributed>=2022.02.1 streamz python-confluent-kafka pytest diff --git a/python/dask_cudf/dev_requirements.txt b/python/dask_cudf/dev_requirements.txt index d8b0745be79..88d535cb906 100644 --- a/python/dask_cudf/dev_requirements.txt +++ b/python/dask_cudf/dev_requirements.txt @@ -1,7 +1,7 @@ # Copyright (c) 2021, NVIDIA CORPORATION. -dask>=2021.11.1 -distributed>=2021.11.1 +dask>=2022.02.1 +distributed>=2022.02.1 fsspec>=0.6.0 numba>=0.53.1 numpy diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py index abd51251951..412321e2281 100644 --- a/python/dask_cudf/setup.py +++ b/python/dask_cudf/setup.py @@ -10,8 +10,8 @@ install_requires = [ "cudf", - "dask>=2021.11.1", - "distributed>=2021.11.1", + "dask>=2022.02.1", + "distributed>=2022.02.1", "fsspec>=0.6.0", "numpy", "pandas>=1.0,<1.4.0dev0", From f05490cace5da8a1745e132f7b848cd56ec94ecd Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Fri, 11 Mar 2022 12:26:56 -0800 Subject: [PATCH 23/26] test --- ci/cpu/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 465a6eae7e4..8e8ac60ce40 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -110,6 +110,8 @@ if [ "$BUILD_CUDF" == '1' ]; then gpuci_logger "Build conda pkg for cudf" gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/cudf --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL + gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 --force-reinstall + conda list gpuci_logger "Build conda pkg for dask-cudf" gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/dask-cudf --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL From 72960bd6b2c3afb8f27a389e7e16f459df9535a5 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Fri, 11 Mar 2022 13:59:53 -0800 Subject: [PATCH 24/26] tmp --- ci/cpu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 8e8ac60ce40..014bdb59144 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -110,7 +110,7 @@ if [ "$BUILD_CUDF" == '1' ]; then gpuci_logger "Build conda pkg for cudf" gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/cudf --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL - gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 --force-reinstall + gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 conda-forge::dask-core>=2022.02.1 --force-reinstall conda list gpuci_logger "Build conda pkg for dask-cudf" gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/dask-cudf --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL From 798146269d9f2e1c7dcc3491a93b3cc4e3ece7d7 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Mon, 14 Mar 2022 10:19:12 -0500 Subject: [PATCH 25/26] Update build.sh --- ci/cpu/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 014bdb59144..465a6eae7e4 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -110,8 +110,6 @@ if [ "$BUILD_CUDF" == '1' ]; then gpuci_logger "Build conda pkg for cudf" gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/cudf --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL - gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 conda-forge::dask-core>=2022.02.1 --force-reinstall - conda list gpuci_logger "Build conda pkg for dask-cudf" gpuci_conda_retry build --croot ${CONDA_BLD_DIR} conda/recipes/dask-cudf --python=$PYTHON $CONDA_BUILD_ARGS $CONDA_CHANNEL From 75c5ba3f7998ebb9a8e82f1afad5071c53d970c0 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Mon, 14 Mar 2022 12:03:45 -0500 Subject: [PATCH 26/26] Apply suggestions from code review Co-authored-by: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> --- ci/benchmark/build.sh | 4 ++-- ci/gpu/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 87241864f5d..f307b7e0451 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -82,8 +82,8 @@ if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then gpuci_logger "gpuci_mamba_retry update dask" gpuci_mamba_retry update dask else - gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 --force-reinstall" - gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 --force-reinstall + gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 conda-forge::dask-core>=2022.02.1 --force-reinstall" + gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 conda-forge::dask-core>=2022.02.1 --force-reinstall fi # Install the master version of streamz diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index e060724bd4f..4492ee1d443 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -116,8 +116,8 @@ function install_dask { gpuci_mamba_retry update dask conda list else - gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 --force-reinstall" - gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 --force-reinstall + gpuci_logger "gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 conda-forge::dask-core>=2022.02.1 --force-reinstall" + gpuci_mamba_retry install conda-forge::dask>=2022.02.1 conda-forge::distributed>=2022.02.1 conda-forge::dask-core>=2022.02.1 --force-reinstall fi # Install the main version of streamz gpuci_logger "Install the main version of streamz"