Skip to content

Commit

Permalink
[REVIEW] Adjust UCX dependencies (#2304)
Browse files Browse the repository at this point in the history
Add `distributed-ucxx` as a required dependency to `raft-dask` and remove direct dependencies to `ucx`/`ucx-proc` in favor of transitive installation from `ucx-py`/`distributed-ucxx`.

Authors:
  - Peter Andreas Entschev (https://github.com/pentschev)

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Ray Douglass (https://github.com/raydouglass)

URL: #2304
  • Loading branch information
pentschev authored May 13, 2024
1 parent 7d80f04 commit 6cd51b2
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 17 deletions.
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-118_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,5 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sysroot_linux-aarch64==2.17
- ucx-proc=*=gpu
- ucx-py==0.38.*
- ucx>=1.15.0,<1.16.0
name: all_cuda-118_arch-aarch64
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,5 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sysroot_linux-64==2.17
- ucx-proc=*=gpu
- ucx-py==0.38.*
- ucx>=1.15.0,<1.16.0
name: all_cuda-118_arch-x86_64
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-122_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,5 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sysroot_linux-aarch64==2.17
- ucx-proc=*=gpu
- ucx-py==0.38.*
- ucx>=1.15.0,<1.16.0
name: all_cuda-122_arch-aarch64
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-122_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,5 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sysroot_linux-64==2.17
- ucx-proc=*=gpu
- ucx-py==0.38.*
- ucx>=1.15.0,<1.16.0
name: all_cuda-122_arch-x86_64
3 changes: 1 addition & 2 deletions conda/recipes/raft-dask/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ requirements:
- scikit-build-core >=0.7.0
- setuptools
- ucx-py {{ ucx_py_version }}
- libucxx {{ ucxx_version }}
- ucxx {{ ucxx_version }}
run:
{% if cuda_major == "11" %}
Expand All @@ -74,7 +73,7 @@ requirements:
- python x.x
- rmm ={{ minor_version }}
- ucx-py {{ ucx_py_version }}
- ucxx {{ ucxx_version }}
- distributed-ucxx {{ ucxx_version }}

tests:
requirements:
Expand Down
6 changes: 1 addition & 5 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ files:
- test_python_common
- test_pylibraft
- depends_on_cupy
- depends_on_distributed_ucxx
checks:
output: none
includes:
Expand Down Expand Up @@ -100,7 +99,7 @@ files:
table: project
includes:
- run_raft_dask
- depends_on_ucx_run
- depends_on_distributed_ucxx
py_test_raft_dask:
output: pyproject
pyproject_dir: python/raft-dask
Expand All @@ -109,7 +108,6 @@ files:
key: test
includes:
- test_python_common
- depends_on_distributed_ucxx
py_build_raft_ann_bench:
output: pyproject
pyproject_dir: python/raft-ann-bench
Expand Down Expand Up @@ -447,8 +445,6 @@ dependencies:
- ucx-py==0.38.*
- output_types: conda
packages:
- ucx>=1.15.0,<1.16.0
- ucx-proc=*=gpu
- &ucx_py_conda ucx-py==0.38.*
- output_types: pyproject
packages:
Expand Down
3 changes: 1 addition & 2 deletions python/raft-dask/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ license = { text = "Apache 2.0" }
requires-python = ">=3.9"
dependencies = [
"dask-cuda==24.6.*",
"distributed-ucxx==0.38.*",
"joblib>=0.11",
"libucx>=1.15.0",
"numba>=0.57",
"numpy>=1.23,<2.0a0",
"pylibraft==24.6.*",
Expand All @@ -53,7 +53,6 @@ classifiers = [

[project.optional-dependencies]
test = [
"distributed-ucxx==0.38.*",
"pytest-cov",
"pytest==7.*",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down

0 comments on commit 6cd51b2

Please sign in to comment.