Skip to content

Commit

Permalink
Change rmm to librmm dependency, remove unnecessary rmm dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bdice
bdice committed Sep 10, 2024
1 parent ac43a84 commit e4b5ebe
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 21 deletions.
1 change: 1 addition & 0 deletions ci/release/update-version.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ DEPENDENCIES=(
dask-cuda
cuvs
pylibraft
librmm
rmm
rapids-dask-dependency
)
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-aarch64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies:
- libcusolver=11.4.1.48
- libcusparse-dev=11.7.5.86
- libcusparse=11.7.5.86
- librmm==24.10.*,>=0.0.0a0
- make
- nccl>=2.9.9
- ninja
Expand All @@ -49,7 +50,6 @@ dependencies:
- pytest==7.*
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- recommonmark
- rmm==24.10.*,>=0.0.0a0
- rust
- scikit-build-core>=0.10.0
- scikit-learn
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies:
- libcusolver=11.4.1.48
- libcusparse-dev=11.7.5.86
- libcusparse=11.7.5.86
- librmm==24.10.*,>=0.0.0a0
- make
- nccl>=2.9.9
- ninja
Expand All @@ -49,7 +50,6 @@ dependencies:
- pytest==7.*
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- recommonmark
- rmm==24.10.*,>=0.0.0a0
- rust
- scikit-build-core>=0.10.0
- scikit-learn
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-aarch64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies:
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
- librmm==24.10.*,>=0.0.0a0
- make
- nccl>=2.9.9
- ninja
Expand All @@ -45,7 +46,6 @@ dependencies:
- pytest==7.*
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- recommonmark
- rmm==24.10.*,>=0.0.0a0
- rust
- scikit-build-core>=0.10.0
- scikit-learn
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies:
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
- librmm==24.10.*,>=0.0.0a0
- make
- nccl>=2.9.9
- ninja
Expand All @@ -45,7 +46,6 @@ dependencies:
- pytest==7.*
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- recommonmark
- rmm==24.10.*,>=0.0.0a0
- rust
- scikit-build-core>=0.10.0
- scikit-learn
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-118_arch-aarch64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies:
- libcusolver=11.4.1.48
- libcusparse-dev=11.7.5.86
- libcusparse=11.7.5.86
- librmm==24.10.*,>=0.0.0a0
- matplotlib
- nccl>=2.9.9
- ninja
Expand All @@ -42,6 +43,5 @@ dependencies:
- pandas
- pylibraft==24.10.*,>=0.0.0a0
- pyyaml
- rmm==24.10.*,>=0.0.0a0
- sysroot_linux-aarch64==2.17
name: bench_ann_cuda-118_arch-aarch64
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-118_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies:
- libcusolver=11.4.1.48
- libcusparse-dev=11.7.5.86
- libcusparse=11.7.5.86
- librmm==24.10.*,>=0.0.0a0
- matplotlib
- nccl>=2.9.9
- ninja
Expand All @@ -42,6 +43,5 @@ dependencies:
- pandas
- pylibraft==24.10.*,>=0.0.0a0
- pyyaml
- rmm==24.10.*,>=0.0.0a0
- sysroot_linux-64==2.17
name: bench_ann_cuda-118_arch-x86_64
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-125_arch-aarch64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies:
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
- librmm==24.10.*,>=0.0.0a0
- matplotlib
- nccl>=2.9.9
- ninja
Expand All @@ -38,6 +39,5 @@ dependencies:
- pandas
- pylibraft==24.10.*,>=0.0.0a0
- pyyaml
- rmm==24.10.*,>=0.0.0a0
- sysroot_linux-aarch64==2.17
name: bench_ann_cuda-125_arch-aarch64
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-125_arch-x86_64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies:
- libcurand-dev
- libcusolver-dev
- libcusparse-dev
- librmm==24.10.*,>=0.0.0a0
- matplotlib
- nccl>=2.9.9
- ninja
Expand All @@ -38,6 +39,5 @@ dependencies:
- pandas
- pylibraft==24.10.*,>=0.0.0a0
- pyyaml
- rmm==24.10.*,>=0.0.0a0
- sysroot_linux-64==2.17
name: bench_ann_cuda-125_arch-x86_64
17 changes: 7 additions & 10 deletions dependencies.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ files:
- cuda
- cuda_version
- depends_on_pylibraft
- depends_on_rmm
- depends_on_librmm
- develop
- checks
- build_wheels
Expand All @@ -34,7 +34,7 @@ files:
- cuda
- cuda_version
- depends_on_pylibraft
- depends_on_rmm
- depends_on_librmm
- develop
- bench
- bench_python
Expand Down Expand Up @@ -89,8 +89,6 @@ files:
includes:
- rapids_build
- build_py_cuvs
- depends_on_pylibraft
- depends_on_rmm
py_run_py_cuvs:
output: pyproject
pyproject_dir: python/cuvs
Expand All @@ -100,7 +98,6 @@ files:
- cuda_wheels
- run_py_cuvs
- depends_on_pylibraft
- depends_on_rmm
py_test_py_cuvs:
output: pyproject
pyproject_dir: python/cuvs
Expand Down Expand Up @@ -480,11 +477,11 @@ dependencies:
- pyyaml
- pandas
- click
depends_on_rmm:
depends_on_librmm:
common:
- output_types: conda
packages:
- &rmm_unsuffixed rmm==24.10.*,>=0.0.0a0
- &librmm_unsuffixed librmm==24.10.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
Expand All @@ -497,13 +494,13 @@ dependencies:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- rmm-cu12==24.10.*,>=0.0.0a0
- librmm-cu12==24.10.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- rmm-cu11==24.10.*,>=0.0.0a0
- {matrix: null, packages: [*rmm_unsuffixed]}
- librmm-cu11==24.10.*,>=0.0.0a0
- {matrix: null, packages: [*librmm_unsuffixed]}
depends_on_pylibraft:
common:
- output_types: conda
Expand Down
3 changes: 0 additions & 3 deletions python/cuvs/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ dependencies = [
"nvidia-cusolver",
"nvidia-cusparse",
"pylibraft==24.10.*,>=0.0.0a0",
"rmm==24.10.*,>=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 Expand Up @@ -129,8 +128,6 @@ requires = [
"cuda-python",
"cython>=3.0.0",
"ninja",
"pylibraft==24.10.*,>=0.0.0a0",
"rmm==24.10.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
build-backend = "scikit_build_core.build"
dependencies-file = "../../dependencies.yaml"
Expand Down

0 comments on commit e4b5ebe

Please sign in to comment.