Skip to content

Commit

Permalink
[REVIEW] Pin dask and distributed for release (#12695)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
galipremsagar authored Feb 6, 2023
1 parent 58e0fde commit 519e118
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 27 deletions.
6 changes: 3 additions & 3 deletions ci/benchmark/build.sh
Original file line number Diff line number Diff line change
@@ -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 #
#########################################
Expand Down Expand Up @@ -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=$?
Expand Down
4 changes: 2 additions & 2 deletions ci/cpu/build.sh
Original file line number Diff line number Diff line change
@@ -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 #
##############################################
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.*'
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions conda/recipes/custreamz/meta.yaml
Original file line number Diff line number Diff line change
@@ -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] %}
Expand Down Expand Up @@ -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 }}

Expand Down
10 changes: 5 additions & 5 deletions conda/recipes/dask-cudf/meta.yaml
Original file line number Diff line number Diff line change
@@ -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] %}
Expand Down Expand Up @@ -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:
Expand Down
20 changes: 14 additions & 6 deletions conda/recipes/dask-cudf/run_test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2020, NVIDIA CORPORATION.
# Copyright (c) 2020-2023, NVIDIA CORPORATION.

set -e

Expand All @@ -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"
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions python/dask_cudf/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 519e118

Please sign in to comment.