Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[REVIEW] Pin max dask and distributed versions to 2021.09.1 #9286

Merged
merged 5 commits into from
Sep 23, 2021
Merged

[REVIEW] Pin max dask and distributed versions to 2021.09.1 #9286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
279d855
pin max dask & distributed versions
galipremsagar Sep 23, 2021
96d81ae
Apply suggestions from code review
galipremsagar Sep 23, 2021
a4434ab
Apply suggestions from code review
galipremsagar Sep 23, 2021
2325d19
make an env var
galipremsagar Sep 23, 2021
9c3ac38
Merge branch 'dask_upgrade' of https://github.com/galipremsagar/cudf …
galipremsagar Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ci/benchmark/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ 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='2021.09.1'

function remove_libcudf_kernel_cache_dir {
EXITCODE=$?
logger "removing kernel cache dir: $LIBCUDF_KERNEL_CACHE_PATH"
Expand Down Expand Up @@ -75,10 +78,10 @@ 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@main --upgrade --no-deps"
pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps
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
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
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

Expand Down
7 changes: 5 additions & 2 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ 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
export DASK_DISTRIBUTED_GIT_TAG='2021.09.1'

################################################################################
# TRAP - Setup trap for removing jitify cache
################################################################################
Expand Down Expand Up @@ -101,8 +104,8 @@ 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@2021.07.1" --upgrade --no-deps
pip install "git+https://github.com/dask/dask.git@2021.07.1" --upgrade --no-deps
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
# 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
Expand Down
8 changes: 4 additions & 4 deletions conda/environments/cudf_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ dependencies:
- mypy=0.782
- typing_extensions
- pre_commit
- dask>=2021.6.0
- distributed>=2021.6.0
- dask=2021.09.1
- distributed=2021.09.1
- streamz
- arrow-cpp=5.0.0
- dlpack>=0.5,<0.6.0a0
Expand All @@ -58,7 +58,7 @@ dependencies:
- transformers
- pydata-sphinx-theme
- pip:
- git+https://github.com/dask/dask.git@2021.07.1
- git+https://github.com/dask/distributed.git@2021.07.1
- git+https://github.com/dask/dask.git@2021.09.1
- git+https://github.com/dask/distributed.git@2021.09.1
- git+https://github.com/python-streamz/streamz.git@master
- pyorc
8 changes: 4 additions & 4 deletions conda/environments/cudf_dev_cuda11.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ dependencies:
- mypy=0.782
- typing_extensions
- pre_commit
- dask>=2021.6.0
- distributed>=2021.6.0
- dask=2021.09.1
- distributed=2021.09.1
- streamz
- arrow-cpp=5.0.0
- dlpack>=0.5,<0.6.0a0
Expand All @@ -58,7 +58,7 @@ dependencies:
- transformers
- pydata-sphinx-theme
- pip:
- git+https://github.com/dask/dask.git@2021.07.1
- git+https://github.com/dask/distributed.git@2021.07.1
- git+https://github.com/dask/dask.git@2021.09.1
- git+https://github.com/dask/distributed.git@2021.09.1
- git+https://github.com/python-streamz/streamz.git@master
- pyorc
4 changes: 2 additions & 2 deletions conda/recipes/custreamz/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ requirements:
- python
- streamz
- cudf {{ version }}
- dask>=2021.6.0
- distributed>=2021.6.0
- dask=2021.09.1
- distributed=2021.09.1
- python-confluent-kafka
- cudf_kafka {{ version }}

Expand Down
8 changes: 4 additions & 4 deletions conda/recipes/dask-cudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ requirements:
host:
- python
- cudf {{ version }}
- dask>=2021.6.0
- distributed>=2021.6.0
- dask=2021.09.1
- distributed=2021.09.1
run:
- python
- cudf {{ version }}
- dask>=2021.6.0
- distributed>=2021.6.0
- dask=2021.09.1
- distributed=2021.09.1

test: # [linux64]
requires: # [linux64]
Expand Down
4 changes: 2 additions & 2 deletions python/custreamz/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
flake8==3.8.3
black==19.10b0
isort==5.6.4
dask>=2021.6.0
distributed>=2021.6.0
dask==2021.09.1
distributed==2021.09.1
streamz
python-confluent-kafka
pytest
Expand Down
4 changes: 2 additions & 2 deletions python/dask_cudf/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) 2021, NVIDIA CORPORATION.

dask>=2021.6.0
distributed>=2021.6.0
dask==2021.09.1
distributed==2021.09.1
fsspec>=0.6.0
numba>=0.53.1
numpy
Expand Down
8 changes: 4 additions & 4 deletions python/dask_cudf/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

install_requires = [
"cudf",
"dask>=2021.6.0",
"distributed>=2021.6.0",
"dask==2021.09.1",
"distributed==2021.09.1",
"fsspec>=0.6.0",
"numpy",
"pandas>=1.0,<1.4.0dev0",
Expand All @@ -23,8 +23,8 @@
"pandas>=1.0,<1.4.0dev0",
"pytest",
"numba>=0.53.1",
"dask>=2021.6.0",
"distributed>=2021.6.0",
"dask==2021.09.1",
"distributed==2021.09.1",
]
}

Expand Down