Skip to content

Enforce correct dependencies on cuVS #7261

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

Merged
rapids-bot merged 8 commits into from
Sep 25, 2025
Merged

Enforce correct dependencies on cuVS #7261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66d2f92
cleanup
divyegala Sep 23, 2025
bf31891
Don't export cuvs
KyleFromNVIDIA Sep 23, 2025
f8f97fb
Merge branch 'branch-25.10' into cleanup-cuvs-dependency
divyegala Sep 23, 2025
8cf91f4
bump
divyegala Sep 24, 2025
020c11c
Merge remote-tracking branch 'upstream/branch-25.10' into cleanup-cuv…
divyegala Sep 24, 2025
b31b615
Merge remote-tracking branch 'origin/cleanup-cuvs-dependency' into cl…
divyegala Sep 24, 2025
3511ad9
do not load libcuvs wheel
divyegala Sep 24, 2025
112f5c5
Merge branch 'branch-25.10' into cleanup-cuvs-dependency
divyegala Sep 24, 2025
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: 0 additions & 1 deletion conda/environments/all_cuda-129_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ dependencies:
- cuda-version=12.9
- cudf==25.10.*,>=0.0.0a0
- cupy>=13.6.0
- cuvs==25.10.*,>=0.0.0a0
Copy link
Copy Markdown
Member

@quasiben quasiben Sep 24, 2025

Choose a reason for hiding this comment

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

If you remove this will setting up dev environments be impacted ?

Copy link
Copy Markdown
Member Author

@divyegala divyegala Sep 24, 2025

Choose a reason for hiding this comment

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

No, this is intentional. We have never had a dependency on cuvs python package, so this dependency was wrongly expressed. There should be no side-effects to removing this.

- cxx-compiler
- cython>=3.0.0
- dask-cuda==25.10.*,>=0.0.0a0
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-129_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ dependencies:
- cuda-version=12.9
- cudf==25.10.*,>=0.0.0a0
- cupy>=13.6.0
- cuvs==25.10.*,>=0.0.0a0
- cxx-compiler
- cython>=3.0.0
- dask-cuda==25.10.*,>=0.0.0a0
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-130_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ dependencies:
- cuda-version=13.0
- cudf==25.10.*,>=0.0.0a0
- cupy>=13.6.0
- cuvs==25.10.*,>=0.0.0a0
- cxx-compiler
- cython>=3.0.0
- dask-cuda==25.10.*,>=0.0.0a0
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-130_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ dependencies:
- cuda-version=13.0
- cudf==25.10.*,>=0.0.0a0
- cupy>=13.6.0
- cuvs==25.10.*,>=0.0.0a0
- cxx-compiler
- cython>=3.0.0
- dask-cuda==25.10.*,>=0.0.0a0
Expand Down
2 changes: 0 additions & 2 deletions cpp/cmake/thirdparty/get_cuvs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ function(find_and_configure_cuvs)

rapids_cpm_find(cuvs ${PKG_VERSION}
GLOBAL_TARGETS cuvs::cuvs
BUILD_EXPORT_SET cuml-exports
INSTALL_EXPORT_SET cuml-exports
CPM_ARGS
GIT_REPOSITORY https://github.com/${PKG_FORK}/cuvs.git
GIT_TAG ${PKG_PINNED_TAG}
Expand Down
49 changes: 0 additions & 49 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ files:
- depends_on_cudf
- depends_on_cuda_python
- depends_on_cupy
- depends_on_cuvs
- depends_on_dask_cuda
- depends_on_dask_cudf
- depends_on_libcumlprims
Expand Down Expand Up @@ -42,7 +41,6 @@ files:
- depends_on_cudf
- depends_on_cuda_python
- depends_on_cupy
- depends_on_cuvs
- depends_on_dask_cuda
- depends_on_dask_cudf
- depends_on_libcumlprims
Expand Down Expand Up @@ -122,7 +120,6 @@ files:
- cuda_version
- depends_on_cuml
- depends_on_cupy
- depends_on_cuvs
- depends_on_dask_cuda
- depends_on_dask_cudf
- depends_on_numba_cuda
Expand Down Expand Up @@ -166,7 +163,6 @@ files:
- depends_on_cuda_python
- depends_on_cudf
- depends_on_cupy
- depends_on_cuvs
- depends_on_dask_cuda
- depends_on_dask_cudf
- depends_on_libcuml
Expand Down Expand Up @@ -549,32 +545,6 @@ dependencies:
- matrix:
packages:
- cupy-cuda13x>=13.6.0
depends_on_cuvs:
common:
- output_types: conda
packages:
- &cuvs_unsuffixed cuvs==25.10.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
- --extra-index-url=https://pypi.nvidia.com
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- cuvs-cu12==25.10.*,>=0.0.0a0
- matrix:
cuda: "13.*"
cuda_suffixed: "true"
packages:
- cuvs-cu13==25.10.*,>=0.0.0a0
- matrix:
packages:
- *cuvs_unsuffixed
depends_on_dask_cuda:
common:
- output_types: conda
Expand Down Expand Up @@ -661,25 +631,6 @@ dependencies:
- output_types: conda
packages:
- &libcuvs_unsuffixed libcuvs==25.10.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
- --extra-index-url=https://pypi.nvidia.com
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- libcuvs-cu12==25.10.*,>=0.0.0a0
- matrix:
cuda: "13.*"
cuda_suffixed: "true"
packages:
- libcuvs-cu13==25.10.*,>=0.0.0a0
- {matrix: null, packages: [*libcuvs_unsuffixed]}
depends_on_libraft:
common:
- output_types: conda
Expand Down
2 changes: 0 additions & 2 deletions python/cuml/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ dependencies = [
"cuda-toolkit[cublas,cufft,curand,cusolver,cusparse]>=12,<14",
"cudf==25.10.*,>=0.0.0a0",
"cupy-cuda13x>=13.6.0",
"cuvs==25.10.*,>=0.0.0a0",
"dask-cuda==25.10.*,>=0.0.0a0",
"dask-cudf==25.10.*,>=0.0.0a0",
"joblib>=0.11",
Expand Down Expand Up @@ -187,7 +186,6 @@ requires = [
"cuda-python>=13.0.1,<14.0a0",
"cython>=3.0.0",
"libcuml==25.10.*,>=0.0.0a0",
"libcuvs==25.10.*,>=0.0.0a0",
"libraft==25.10.*,>=0.0.0a0",
"librmm==25.10.*,>=0.0.0a0",
"ninja",
Expand Down
2 changes: 0 additions & 2 deletions python/libcuml/libcuml/load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,13 @@ def load_library():
"""Dynamically load libcuml++.so and its dependencies"""
try:
# These libraries must all be loaded before libcuml
import libcuvs
import libraft
import librmm
import rapids_logger

rapids_logger.load_library()
librmm.load_library()
libraft.load_library()
libcuvs.load_library()
except ModuleNotFoundError:
# These runtime dependencies might be satisfied by conda packages (which do not
# have any Python modules) instead of wheels. In that situation, assume that
Expand Down
2 changes: 0 additions & 2 deletions python/libcuml/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ classifiers = [
]
dependencies = [
"cuda-toolkit[cublas,cufft,curand,cusolver,cusparse]>=12,<14",
"libcuvs==25.10.*,>=0.0.0a0",
"libraft==25.10.*,>=0.0.0a0",
"rapids-logger==0.1.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down Expand Up @@ -79,7 +78,6 @@ dependencies-file = "../../dependencies.yaml"
matrix-entry = "cuda_suffixed=true;use_cuda_wheels=true"
requires = [
"cmake>=3.30.4",
"libcuvs==25.10.*,>=0.0.0a0",
"libraft==25.10.*,>=0.0.0a0",
"librmm==25.10.*,>=0.0.0a0",
"ninja",
Expand Down
Loading