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.

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

Use new rapids-dask-dependency metapackage for managing dask versions #14364

Merged
merged 13 commits into from
Nov 13, 2023
Merged
2 changes: 2 additions & 0 deletions ci/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ fi

if [[ ${package_name} == "dask_cudf" ]]; then
sed -r -i "s/cudf==(.*)\"/cudf${PACKAGE_CUDA_SUFFIX}==\1${alpha_spec}\"/g" ${pyproject_file}
sed -r -i "s/dask-cuda==(.*)\"/dask-cuda==\1${alpha_spec}\"/g" ${pyproject_file}
sed -r -i "s/rapids-dask-dependency==(.*)\"/rapids-dask-dependency==\1${alpha_spec}\"/g" ${pyproject_file}
else
sed -r -i "s/rmm(.*)\"/rmm${PACKAGE_CUDA_SUFFIX}\1${alpha_spec}\"/g" ${pyproject_file}
# ptxcompiler and cubinlinker aren't version constrained
Expand Down
1 change: 1 addition & 0 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ DEPENDENCIES=(
kvikio
libkvikio
librmm
rapids-dask-dependency
rmm
)
for DEP in "${DEPENDENCIES[@]}"; do
Expand Down
3 changes: 0 additions & 3 deletions ci/test_wheel_dask_cudf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ manylinux="manylinux_${manylinux_version}"
RAPIDS_PY_WHEEL_NAME="cudf_${manylinux}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-cudf-dep
python -m pip install --no-deps ./local-cudf-dep/cudf*.whl

# Always install latest dask for testing
python -m pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/[email protected]
galipremsagar marked this conversation as resolved.
Show resolved Hide resolved

# echo to expand wildcard before adding `[extra]` requires for pip
python -m pip install $(echo ./dist/dask_cudf*.whl)[test]

Expand Down
4 changes: 1 addition & 3 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ dependencies:
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.3
- dask-core>=2023.9.2
- dask-cuda==23.12.*
- dask>=2023.9.2
- distributed>=2023.9.2
- dlpack>=0.5,<0.6.0a0
- doxygen=1.9.1
- fastavro>=0.22.9
Expand Down Expand Up @@ -80,6 +77,7 @@ dependencies:
- python-snappy>=0.6.0
- python>=3.9,<3.11
- pytorch<1.12.0
- rapids-dask-dependency==23.12.*
- rich
- rmm==23.12.*
- s3fs>=2022.3.0
Expand Down
4 changes: 1 addition & 3 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ dependencies:
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.3
- dask-core>=2023.9.2
- dask-cuda==23.12.*
- dask>=2023.9.2
- distributed>=2023.9.2
- dlpack>=0.5,<0.6.0a0
- doxygen=1.9.1
- fastavro>=0.22.9
Expand Down Expand Up @@ -78,6 +75,7 @@ dependencies:
- python-snappy>=0.6.0
- python>=3.9,<3.11
- pytorch<1.12.0
- rapids-dask-dependency==23.12.*
- rich
- rmm==23.12.*
- s3fs>=2022.3.0
Expand Down
8 changes: 1 addition & 7 deletions conda/recipes/dask-cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,11 @@ build:
requirements:
host:
- python
- cudf ={{ version }}
- dask >=2023.9.2
- dask-core >=2023.9.2
- distributed >=2023.9.2
- cuda-version ={{ cuda_version }}
run:
- python
- cudf ={{ version }}
- dask >=2023.9.2
- dask-core >=2023.9.2
- distributed >=2023.9.2
- rapids-dask-dependency ={{ minor_version }}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}

test:
Expand Down
4 changes: 1 addition & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -500,12 +500,10 @@ dependencies:
common:
- output_types: [conda, requirements, pyproject]
packages:
- dask>=2023.9.2
- distributed>=2023.9.2
- rapids-dask-dependency==23.12.*
- output_types: conda
packages:
- cupy>=12.0.0
- dask-core>=2023.9.2 # dask-core in conda is the actual package & dask is the meta package
- output_types: pyproject
packages:
- &cudf cudf==23.12.*
Expand Down
3 changes: 1 addition & 2 deletions python/dask_cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ requires-python = ">=3.9"
dependencies = [
"cudf==23.12.*",
"cupy-cuda11x>=12.0.0",
"dask>=2023.9.2",
"distributed>=2023.9.2",
"fsspec>=0.6.0",
"numpy>=1.21,<1.25",
"pandas>=1.3,<1.6.0dev0",
"rapids-dask-dependency==23.12.*",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
"Intended Audience :: Developers",
Expand Down
Loading