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

ensure raft-dask wheel tests install pylibraft wheel from the same CI run, fix wheel dependencies #2349

Merged
merged 4 commits into from
Jun 3, 2024
Merged

ensure raft-dask wheel tests install pylibraft wheel from the same CI run, fix wheel dependencies #2349

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d84ff5d
ensure raft-dask wheel tests install pylibraft wheel from the same CI…
jameslamb May 31, 2024
5611234
add alpha specs, remove duplicate dependencies, re-enable conda tests
jameslamb May 31, 2024
587476c
ucx-py needs an alpha spec, alpha spec needs to be '>='
jameslamb May 31, 2024
de12892
Update dependencies.yaml
jameslamb May 31, 2024
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
3 changes: 2 additions & 1 deletion ci/test_wheel_raft_dask.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ 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

python -m pip install "raft_dask-${RAPIDS_PY_CUDA_SUFFIX}[test]>=0.0.0a0" --find-links dist/
# echo to expand wildcard before adding `[extra]` requires for pip
python -m pip install -v "$(echo ./dist/raft_dask_${RAPIDS_PY_CUDA_SUFFIX}*.whl)[test]"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copied this commend and pattern from

raft/ci/test_wheel_pylibraft.sh

Lines 10 to 11 in 8ef71de

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


test_dir="python/raft-dask/raft_dask/test"

Expand Down
5 changes: 3 additions & 2 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 @@ -21,7 +21,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- dask-cuda==24.8.*,>=0.0.0a0
- distributed-ucxx==0.39.*
- distributed-ucxx==0.39.*,>=0.0.0a0
- doxygen>=1.8.20
- gcc_linux-aarch64=11.*
- graphviz
Expand All @@ -44,6 +44,7 @@ dependencies:
- nvcc_linux-aarch64=11.8
- pre-commit
- pydata-sphinx-theme
- pylibraft==24.8.*,>=0.0.0a0
- pytest-cov
- pytest==7.*
- rapids-build-backend>=0.3.0,<0.4.0.dev0
Expand All @@ -56,5 +57,5 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sysroot_linux-aarch64==2.17
- ucx-py==0.39.*
- ucx-py==0.39.*,>=0.0.0a0
name: all_cuda-118_arch-aarch64
5 changes: 3 additions & 2 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 @@ -21,7 +21,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- dask-cuda==24.8.*,>=0.0.0a0
- distributed-ucxx==0.39.*
- distributed-ucxx==0.39.*,>=0.0.0a0
- doxygen>=1.8.20
- gcc_linux-64=11.*
- graphviz
Expand All @@ -44,6 +44,7 @@ dependencies:
- nvcc_linux-64=11.8
- pre-commit
- pydata-sphinx-theme
- pylibraft==24.8.*,>=0.0.0a0
- pytest-cov
- pytest==7.*
- rapids-build-backend>=0.3.0,<0.4.0.dev0
Expand All @@ -56,5 +57,5 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sysroot_linux-64==2.17
- ucx-py==0.39.*
- ucx-py==0.39.*,>=0.0.0a0
name: all_cuda-118_arch-x86_64
5 changes: 3 additions & 2 deletions conda/environments/all_cuda-122_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- dask-cuda==24.8.*,>=0.0.0a0
- distributed-ucxx==0.39.*
- distributed-ucxx==0.39.*,>=0.0.0a0
- doxygen>=1.8.20
- gcc_linux-aarch64=11.*
- graphviz
Expand All @@ -40,6 +40,7 @@ dependencies:
- numpydoc
- pre-commit
- pydata-sphinx-theme
- pylibraft==24.8.*,>=0.0.0a0
- pytest-cov
- pytest==7.*
- rapids-build-backend>=0.3.0,<0.4.0.dev0
Expand All @@ -52,5 +53,5 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sysroot_linux-aarch64==2.17
- ucx-py==0.39.*
- ucx-py==0.39.*,>=0.0.0a0
name: all_cuda-122_arch-aarch64
5 changes: 3 additions & 2 deletions conda/environments/all_cuda-122_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
- cxx-compiler
- cython>=3.0.0
- dask-cuda==24.8.*,>=0.0.0a0
- distributed-ucxx==0.39.*
- distributed-ucxx==0.39.*,>=0.0.0a0
- doxygen>=1.8.20
- gcc_linux-64=11.*
- graphviz
Expand All @@ -40,6 +40,7 @@ dependencies:
- numpydoc
- pre-commit
- pydata-sphinx-theme
- pylibraft==24.8.*,>=0.0.0a0
- pytest-cov
- pytest==7.*
- rapids-build-backend>=0.3.0,<0.4.0.dev0
Expand All @@ -52,5 +53,5 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sysroot_linux-64==2.17
- ucx-py==0.39.*
- ucx-py==0.39.*,>=0.0.0a0
name: all_cuda-122_arch-x86_64
15 changes: 6 additions & 9 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,12 +475,9 @@ dependencies:
- numba>=0.57
- *numpy
- rapids-dask-dependency==24.8.*,>=0.0.0a0
- ucx-py==0.39.*
- output_types: conda
packages:
- &ucx_py_conda ucx-py==0.39.*
- output_types: pyproject
packages:
- &ucx_py_conda ucx-py==0.39.*,>=0.0.0a0
- &pylibraft_conda pylibraft==24.8.*,>=0.0.0a0
jameslamb marked this conversation as resolved.
Show resolved Hide resolved
- output_types: requirements
packages:
Expand All @@ -494,11 +491,11 @@ dependencies:
- matrix: {cuda: "12.*"}
packages:
- &pylibraft_cu12 pylibraft-cu12==24.8.*,>=0.0.0a0
- &ucx_py_cu12 ucx-py-cu12==0.39.*
- &ucx_py_cu12 ucx-py-cu12==0.39.*,>=0.0.0a0
- matrix: {cuda: "11.*"}
packages:
- &pylibraft_cu11 pylibraft-cu11==24.8.*,>=0.0.0a0
- &ucx_py_cu11 ucx-py-cu11==0.39.*
- &ucx_py_cu11 ucx-py-cu11==0.39.*,>=0.0.0a0
- {matrix: null, packages: [*pylibraft_conda, *ucx_py_conda]}
test_python_common:
common:
Expand All @@ -518,7 +515,7 @@ dependencies:
packages:
# UCXX is not currently a hard-dependency thus only installed during tests,
# this will change in the future.
- &distributed_ucxx_conda distributed-ucxx==0.39.*
- &distributed_ucxx_conda distributed-ucxx==0.39.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
Expand All @@ -529,10 +526,10 @@ dependencies:
matrices:
- matrix: {cuda: "12.*"}
packages:
- distributed-ucxx-cu12==0.39.*
- distributed-ucxx-cu12==0.39.*,>=0.0.0a0
- matrix: {cuda: "11.*"}
packages:
- distributed-ucxx-cu11==0.39.*
- distributed-ucxx-cu11==0.39.*,>=0.0.0a0
- {matrix: null, packages: [*distributed_ucxx_conda]}
depends_on_ucx_build:
common:
Expand Down
4 changes: 2 additions & 2 deletions python/raft-dask/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ license = { text = "Apache 2.0" }
requires-python = ">=3.9"
dependencies = [
"dask-cuda==24.8.*,>=0.0.0a0",
"distributed-ucxx==0.39.*",
"distributed-ucxx==0.39.*,>=0.0.0a0",
"joblib>=0.11",
"numba>=0.57",
"numpy>=1.23,<2.0a0",
"pylibraft==24.8.*,>=0.0.0a0",
"rapids-dask-dependency==24.8.*,>=0.0.0a0",
"ucx-py==0.39.*",
"ucx-py==0.39.*,>=0.0.0a0",
] # 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