From 66d2f928036af0ca9111739841547d62ea4e92e8 Mon Sep 17 00:00:00 2001 From: divyegala Date: Tue, 23 Sep 2025 12:02:49 -0700 Subject: [PATCH 1/4] cleanup --- .../all_cuda-129_arch-aarch64.yaml | 1 - .../all_cuda-129_arch-x86_64.yaml | 1 - .../all_cuda-130_arch-aarch64.yaml | 1 - .../all_cuda-130_arch-x86_64.yaml | 1 - dependencies.yaml | 49 ------------------- python/cuml/pyproject.toml | 2 - python/libcuml/pyproject.toml | 2 - 7 files changed, 57 deletions(-) diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml index 8ae815aaf8..4414f630f3 100644 --- a/conda/environments/all_cuda-129_arch-aarch64.yaml +++ b/conda/environments/all_cuda-129_arch-aarch64.yaml @@ -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 diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml index e44fd5b4c8..881f6ac9e6 100644 --- a/conda/environments/all_cuda-129_arch-x86_64.yaml +++ b/conda/environments/all_cuda-129_arch-x86_64.yaml @@ -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 diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml index 8b8521543c..c169d01b15 100644 --- a/conda/environments/all_cuda-130_arch-aarch64.yaml +++ b/conda/environments/all_cuda-130_arch-aarch64.yaml @@ -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 diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml index 179dccf0bf..3a656d2335 100644 --- a/conda/environments/all_cuda-130_arch-x86_64.yaml +++ b/conda/environments/all_cuda-130_arch-x86_64.yaml @@ -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 diff --git a/dependencies.yaml b/dependencies.yaml index 40c834a77f..c403c92141 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/python/cuml/pyproject.toml b/python/cuml/pyproject.toml index 6de17d6cc5..81b2fafd7d 100644 --- a/python/cuml/pyproject.toml +++ b/python/cuml/pyproject.toml @@ -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", @@ -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", diff --git a/python/libcuml/pyproject.toml b/python/libcuml/pyproject.toml index 303075b979..c6aff9fb40 100644 --- a/python/libcuml/pyproject.toml +++ b/python/libcuml/pyproject.toml @@ -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`. @@ -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", From bf31891011b7d3ecf41b17343f7edccb6fa84556 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 23 Sep 2025 17:27:44 -0400 Subject: [PATCH 2/4] Don't export cuvs --- cpp/cmake/thirdparty/get_cuvs.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/cpp/cmake/thirdparty/get_cuvs.cmake b/cpp/cmake/thirdparty/get_cuvs.cmake index d22a93eed9..a0fb9fe10e 100644 --- a/cpp/cmake/thirdparty/get_cuvs.cmake +++ b/cpp/cmake/thirdparty/get_cuvs.cmake @@ -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} From 8cf91f457e97e9ff9664be7cee1a0407a8f57269 Mon Sep 17 00:00:00 2001 From: divyegala Date: Wed, 24 Sep 2025 11:54:48 -0700 Subject: [PATCH 3/4] bump From 3511ad9e86b9ea1e3dd3977e1229e8f61e92dfc2 Mon Sep 17 00:00:00 2001 From: divyegala Date: Wed, 24 Sep 2025 12:53:06 -0700 Subject: [PATCH 4/4] do not load libcuvs wheel --- python/libcuml/libcuml/load.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/libcuml/libcuml/load.py b/python/libcuml/libcuml/load.py index 185b7784eb..d8a8951484 100644 --- a/python/libcuml/libcuml/load.py +++ b/python/libcuml/libcuml/load.py @@ -48,7 +48,6 @@ 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 @@ -56,7 +55,6 @@ def load_library(): 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