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

[REVIEW] Unpin dask & distributed #10182

Merged
merged 38 commits into from
Mar 14, 2022
Merged

[REVIEW] Unpin dask & distributed #10182

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
50149d0
unpin dask
galipremsagar Feb 1, 2022
abf829c
use nightly packages
galipremsagar Feb 1, 2022
0efc560
modify comments
galipremsagar Feb 1, 2022
7a41764
Merge remote-tracking branch 'upstream/branch-22.04' into unpin
galipremsagar Feb 1, 2022
8b717f9
remove dask nightly channel
galipremsagar Feb 1, 2022
3ea2f52
Apply suggestions from code review
galipremsagar Feb 1, 2022
5c417c6
Apply suggestions from code review
galipremsagar Feb 2, 2022
363716e
Merge remote-tracking branch 'upstream/branch-22.04' into unpin
galipremsagar Feb 10, 2022
8dfe18a
copyright
galipremsagar Feb 10, 2022
9ac4afe
Merge branch 'unpin' of https://github.com/galipremsagar/cudf into unpin
galipremsagar Feb 10, 2022
32b8597
Merge branch 'rapidsai:branch-22.04' into unpin
galipremsagar Feb 11, 2022
ad8a8e9
Update ci/gpu/build.sh
galipremsagar Feb 14, 2022
8293d80
Update ci/gpu/build.sh
galipremsagar Feb 15, 2022
9d69c86
Update build.sh
galipremsagar Feb 23, 2022
8de573f
Update build.sh
galipremsagar Feb 23, 2022
3d3032a
testing
galipremsagar Feb 23, 2022
919a5b0
Apply suggestions from code review
galipremsagar Feb 23, 2022
d9ad859
Apply suggestions from code review
galipremsagar Feb 23, 2022
779d808
Update ci/gpu/build.sh
galipremsagar Feb 25, 2022
c87978b
Merge branch 'rapidsai:branch-22.04' into unpin
galipremsagar Feb 25, 2022
8bde2ff
Update build.sh
galipremsagar Mar 10, 2022
d8aa8a9
Update build.sh
galipremsagar Mar 11, 2022
50ca04a
Update build.sh
galipremsagar Mar 11, 2022
9b63371
Update build.sh
galipremsagar Mar 11, 2022
7d9673e
Update build.sh
galipremsagar Mar 11, 2022
3fdb8c9
Update ci/benchmark/build.sh
galipremsagar Mar 11, 2022
72263af
Merge branch 'rapidsai:branch-22.04' into unpin
galipremsagar Mar 11, 2022
b1282c9
Apply suggestions from code review
galipremsagar Mar 11, 2022
e8a2e30
Merge branch 'rapidsai:branch-22.04' into unpin
galipremsagar Mar 11, 2022
ca8a1d9
Merge remote-tracking branch 'upstream/branch-22.04' into unpin
galipremsagar Mar 11, 2022
04b94cf
Merge branch 'unpin' of https://github.com/galipremsagar/cudf into unpin
galipremsagar Mar 11, 2022
f05490c
test
galipremsagar Mar 11, 2022
e877b11
Merge branch 'rapidsai:branch-22.04' into unpin
galipremsagar Mar 11, 2022
72960bd
tmp
galipremsagar Mar 11, 2022
d60d2c9
Merge branch 'unpin' of https://github.com/galipremsagar/cudf into unpin
galipremsagar Mar 11, 2022
9b1aeb6
Merge branch 'rapidsai:branch-22.04' into unpin
galipremsagar Mar 14, 2022
7981462
Update build.sh
galipremsagar Mar 14, 2022
75c5ba3
Apply suggestions from code review
galipremsagar Mar 14, 2022
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
2 changes: 1 addition & 1 deletion ci/benchmark/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved

function remove_libcudf_kernel_cache_dir {
EXITCODE=$?
Expand Down
2 changes: 1 addition & 1 deletion ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
export DASK_DISTRIBUTED_GIT_TAG='2022.01.0'
export DASK_DISTRIBUTED_GIT_TAG='main'

# ucx-py version
export UCX_PY_VERSION='0.25.*'
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cudf_dev_cuda11.5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
- streamz
- arrow-cpp=5.0.0
- dlpack>=0.5,<0.6.0a0
Expand Down
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 @@ -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
charlesbluca marked this conversation as resolved.
Show resolved Hide resolved
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
- python-confluent-kafka >=1.7.0,<1.8.0a0
- 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 @@ -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
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
- 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
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
- {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}

test: # [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.11.1,<=2022.01.0
distributed>=2021.11.1,<=2022.01.0
dask>=2021.11.1
distributed>=2021.11.1
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
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.11.1,<=2022.01.0
distributed>=2021.11.1,<=2022.01.0
dask>=2021.11.1
distributed>=2021.11.1
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
fsspec>=0.6.0
numba>=0.53.1
numpy
Expand Down
4 changes: 2 additions & 2 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.11.1,<=2022.01.0",
"distributed>=2021.11.1,<=2022.01.0",
"dask>=2021.11.1",
"distributed>=2021.11.1",
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved
"fsspec>=0.6.0",
"numpy",
"pandas>=1.0,<1.4.0dev0",
Expand Down