From 519e118f12e1bdc89d26eb799687f6ace55490f2 Mon Sep 17 00:00:00 2001 From: GALI PREM SAGAR Date: Mon, 6 Feb 2023 12:45:23 -0600 Subject: [PATCH] [REVIEW] Pin `dask` and `distributed` for release (#12695) This PR pins `dask` and `distributed` to `2023.1.1` for `23.02` release. Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - Peter Andreas Entschev (https://github.com/pentschev) - Mark Sadang (https://github.com/msadang) - Bradley Dice (https://github.com/bdice) --- ci/benchmark/build.sh | 6 +++--- ci/cpu/build.sh | 4 ++-- ci/gpu/build.sh | 4 ++-- .../all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/recipes/custreamz/meta.yaml | 6 +++--- conda/recipes/dask-cudf/meta.yaml | 10 +++++----- conda/recipes/dask-cudf/run_test.sh | 20 +++++++++++++------ dependencies.yaml | 4 ++-- python/dask_cudf/setup.py | 4 ++-- 9 files changed, 35 insertions(+), 27 deletions(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index ec4f8d55372..c27fe23d078 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020-2022, NVIDIA CORPORATION. +# Copyright (c) 2020-2023, NVIDIA CORPORATION. ######################################### # cuDF GPU build and test script for CI # ######################################### @@ -37,10 +37,10 @@ export GBENCH_BENCHMARKS_DIR="$WORKSPACE/cpp/build/gbenchmarks/" export LIBCUDF_KERNEL_CACHE_PATH="$HOME/.jitify-cache" # Dask & Distributed option to install main(nightly) or `conda-forge` packages. -export INSTALL_DASK_MAIN=1 +export INSTALL_DASK_MAIN=0 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2022.12.0" +export DASK_STABLE_VERSION="2023.1.1" function remove_libcudf_kernel_cache_dir { EXITCODE=$? diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 7ffd032bce0..5b4a201e5e9 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2018-2022, NVIDIA CORPORATION. +# Copyright (c) 2018-2023, NVIDIA CORPORATION. ############################################## # cuDF CPU conda build script for CI # ############################################## @@ -35,7 +35,7 @@ export CONDA_BLD_DIR="$WORKSPACE/.conda-bld" # Whether to keep `dask/label/dev` channel in the env. If INSTALL_DASK_MAIN=0, # `dask/label/dev` channel is removed. -export INSTALL_DASK_MAIN=1 +export INSTALL_DASK_MAIN=0 # Switch to project root; also root of repo checkout cd "$WORKSPACE" diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index a33dc842a7f..68375720adf 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -39,10 +39,10 @@ export MINOR_VERSION=`echo $GIT_DESCRIBE_TAG | grep -o -E '([0-9]+\.[0-9]+)'` unset GIT_DESCRIBE_TAG # Dask & Distributed option to install main(nightly) or `conda-forge` packages. -export INSTALL_DASK_MAIN=1 +export INSTALL_DASK_MAIN=0 # Dask version to install when `INSTALL_DASK_MAIN=0` -export DASK_STABLE_VERSION="2022.12.0" +export DASK_STABLE_VERSION="2023.1.1" # ucx-py version export UCX_PY_VERSION='0.30.*' diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 1bcb1978373..cc9cd57edd5 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -21,8 +21,8 @@ dependencies: - cxx-compiler - cython>=0.29,<0.30 - dask-cuda=23.02.* -- dask>=2022.12.0 -- distributed>=2022.12.0 +- dask==2023.1.1 +- distributed==2023.1.1 - dlpack>=0.5,<0.6.0a0 - doxygen=1.8.20 - fastavro>=0.22.9 diff --git a/conda/recipes/custreamz/meta.yaml b/conda/recipes/custreamz/meta.yaml index 13d54011e02..09fa63fc1f7 100644 --- a/conda/recipes/custreamz/meta.yaml +++ b/conda/recipes/custreamz/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2022, NVIDIA CORPORATION. +# Copyright (c) 2018-2023, 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] %} @@ -38,8 +38,8 @@ requirements: - python - streamz - cudf ={{ version }} - - dask >=2022.12.0 - - distributed >=2022.12.0 + - dask ==2023.1.1 + - distributed ==2023.1.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 feb9e53e37f..991d0a9da34 100644 --- a/conda/recipes/dask-cudf/meta.yaml +++ b/conda/recipes/dask-cudf/meta.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2018-2022, NVIDIA CORPORATION. +# Copyright (c) 2018-2023, 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] %} @@ -34,14 +34,14 @@ requirements: host: - python - cudf ={{ version }} - - dask >=2022.12.0 - - distributed >=2022.12.0 + - dask ==2023.1.1 + - distributed ==2023.1.1 - cudatoolkit ={{ cuda_version }} run: - python - cudf ={{ version }} - - dask >=2022.12.0 - - distributed >=2022.12.0 + - dask ==2023.1.1 + - distributed ==2023.1.1 - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }} test: diff --git a/conda/recipes/dask-cudf/run_test.sh b/conda/recipes/dask-cudf/run_test.sh index f56610bea86..3b1fc46c4f4 100644 --- a/conda/recipes/dask-cudf/run_test.sh +++ b/conda/recipes/dask-cudf/run_test.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2023, NVIDIA CORPORATION. set -e @@ -17,12 +17,20 @@ if [ "${ARCH}" = "aarch64" ]; then exit 0 fi -# Install the latest version of dask and distributed -logger "pip install git+https://github.com/dask/distributed.git@main --upgrade --no-deps" -pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps +# Dask & Distributed option to install main(nightly) or `conda-forge` packages. +export INSTALL_DASK_MAIN=0 -logger "pip install git+https://github.com/dask/dask.git@main --upgrade --no-deps" -pip install "git+https://github.com/dask/dask.git@main" --upgrade --no-deps +# Dask version to install when `INSTALL_DASK_MAIN=0` +export DASK_STABLE_VERSION="2023.1.1" + +# Install the conda-forge or nightly version of dask and distributed +if [[ "${INSTALL_DASK_MAIN}" == 1 ]]; then + gpuci_logger "gpuci_mamba_retry install -c dask/label/dev 'dask/label/dev::dask' 'dask/label/dev::distributed'" + gpuci_mamba_retry install -c dask/label/dev "dask/label/dev::dask" "dask/label/dev::distributed" +else + gpuci_logger "gpuci_mamba_retry install conda-forge::dask=={$DASK_STABLE_VERSION} conda-forge::distributed=={$DASK_STABLE_VERSION} conda-forge::dask-core=={$DASK_STABLE_VERSION} --force-reinstall" + gpuci_mamba_retry install conda-forge::dask=={$DASK_STABLE_VERSION} conda-forge::distributed=={$DASK_STABLE_VERSION} conda-forge::dask-core=={$DASK_STABLE_VERSION} --force-reinstall +fi logger "python -c 'import dask_cudf'" python -c "import dask_cudf" diff --git a/dependencies.yaml b/dependencies.yaml index 8790853fbb3..8ee4595f8e7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -225,8 +225,8 @@ dependencies: - output_types: [conda, requirements] packages: - cachetools - - dask>=2022.12.0 - - distributed>=2022.12.0 + - dask==2023.1.1 + - distributed==2023.1.1 - fsspec>=0.6.0 - numba>=0.56.2 - numpy diff --git a/python/dask_cudf/setup.py b/python/dask_cudf/setup.py index 1108da91d03..4b420b1b97c 100644 --- a/python/dask_cudf/setup.py +++ b/python/dask_cudf/setup.py @@ -8,8 +8,8 @@ cuda_suffix = os.getenv("RAPIDS_PY_WHEEL_CUDA_SUFFIX", default="") install_requires = [ - "dask>=2022.12.0", - "distributed>=2022.12.0", + "dask==2023.1.1", + "distributed==2023.1.1", "fsspec>=0.6.0", "numpy", "pandas>=1.0,<1.6.0dev0",