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

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

Merged
merged 5 commits into from
Nov 13, 2023
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d500828
Use rapids meta package
galipremsagar Nov 7, 2023
ff3aa2a
fix package names and update update scripts
galipremsagar Nov 8, 2023
80e53d6
Merge branch 'branch-23.12' into rapids_dask_metapackage
galipremsagar Nov 8, 2023
7d42c1a
alpha spec for dask-cuda
galipremsagar Nov 8, 2023
3cb28a2
Merge branch 'rapidsai:branch-23.12' into rapids_dask_metapackage
galipremsagar Nov 9, 2023
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
1 change: 1 addition & 0 deletions ci/build_wheel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ fi
if [[ ${package_name} == "raft-dask" ]]; then
sed -r -i "s/pylibraft==(.*)\"/pylibraft${PACKAGE_CUDA_SUFFIX}==\1${alpha_spec}\"/g" ${pyproject_file}
sed -r -i "s/ucx-py==(.*)\"/ucx-py${PACKAGE_CUDA_SUFFIX}==\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}
fi
Expand Down
3 changes: 0 additions & 3 deletions ci/test_wheel_raft_dask.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ RAPIDS_PY_WHEEL_NAME="raft_dask_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels
RAPIDS_PY_WHEEL_NAME="pylibraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./local-pylibraft-dep
python -m pip install --no-deps ./local-pylibraft-dep/pylibraft*.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]

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

Expand Down
4 changes: 1 addition & 3 deletions conda/environments/all_cuda-118_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ dependencies:
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- dask-core>=2023.9.2
- dask-cuda==23.12.*
- dask>=2023.9.2
- distributed>=2023.9.2
- doxygen>=1.8.20
- gcc_linux-aarch64=11.*
- gmock>=1.13.0
Expand All @@ -49,6 +46,7 @@ dependencies:
- pydata-sphinx-theme
- pytest
- pytest-cov
- rapids-dask-dependency==23.12.00.*
- recommonmark
- rmm==23.12.*
- scikit-build>=0.13.1
Expand Down
4 changes: 1 addition & 3 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ dependencies:
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- dask-core>=2023.9.2
- dask-cuda==23.12.*
- dask>=2023.9.2
- distributed>=2023.9.2
- doxygen>=1.8.20
- gcc_linux-64=11.*
- gmock>=1.13.0
Expand All @@ -49,6 +46,7 @@ dependencies:
- pydata-sphinx-theme
- pytest
- pytest-cov
- rapids-dask-dependency==23.12.00.*
- recommonmark
- rmm==23.12.*
- scikit-build>=0.13.1
Expand Down
4 changes: 1 addition & 3 deletions conda/environments/all_cuda-120_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ dependencies:
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- dask-core>=2023.9.2
- dask-cuda==23.12.*
- dask>=2023.9.2
- distributed>=2023.9.2
- doxygen>=1.8.20
- gcc_linux-aarch64=11.*
- gmock>=1.13.0
Expand All @@ -45,6 +42,7 @@ dependencies:
- pydata-sphinx-theme
- pytest
- pytest-cov
- rapids-dask-dependency==23.12.00.*
- recommonmark
- rmm==23.12.*
- scikit-build>=0.13.1
Expand Down
4 changes: 1 addition & 3 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ dependencies:
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- dask-core>=2023.9.2
- dask-cuda==23.12.*
- dask>=2023.9.2
- distributed>=2023.9.2
- doxygen>=1.8.20
- gcc_linux-64=11.*
- gmock>=1.13.0
Expand All @@ -45,6 +42,7 @@ dependencies:
- pydata-sphinx-theme
- pytest
- pytest-cov
- rapids-dask-dependency==23.12.00.*
- recommonmark
- rmm==23.12.*
- scikit-build>=0.13.1
Expand Down
4 changes: 1 addition & 3 deletions conda/recipes/raft-dask/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,8 @@ requirements:
- cudatoolkit
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- dask >=2023.9.2
- dask-core >=2023.9.2
- dask-cuda ={{ minor_version }}
- distributed >=2023.9.2
- rapids-dask-dependency ={{ minor_version }}
- joblib >=0.11
- nccl >=2.9.9
- pylibraft {{ version }}
Expand Down
5 changes: 2 additions & 3 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,21 +436,20 @@ dependencies:
common:
- output_types: [conda, pyproject]
packages:
- dask>=2023.9.2
- dask-cuda==23.12.*
- distributed>=2023.9.2
- joblib>=0.11
- numba>=0.57
- *numpy
- ucx-py==0.35.*
- output_types: conda
packages:
- dask-core>=2023.9.2
- rapids-dask-dependency==23.12.00.*
- ucx>=1.13.0
- ucx-proc=*=gpu
- &ucx_py_conda ucx-py==0.35.*
- output_types: pyproject
packages:
- rapids-dask-dependency==23.12.*
- &pylibraft_conda pylibraft==23.12.*
- output_types: requirements
packages:
Expand Down
3 changes: 1 addition & 2 deletions python/raft-dask/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@ license = { text = "Apache 2.0" }
requires-python = ">=3.9"
dependencies = [
"dask-cuda==23.12.*",
"dask>=2023.9.2",
"distributed>=2023.9.2",
"joblib>=0.11",
"numba>=0.57",
"numpy>=1.21",
"pylibraft==23.12.*",
"rapids-dask-dependency==23.12.*",
"ucx-py==0.35.*",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
Expand Down
Loading