Skip to content

Make cuVS optional if CUML_ALGORITHMS is set #6125

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 3 commits into from
Nov 4, 2024
Merged

Make cuVS optional if CUML_ALGORITHMS is set #6125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d7fe0c
Make cuVS optional if CUML_ALGORITHMS is set
hcho3 Oct 28, 2024
150d209
Merge branch 'branch-24.12' into optional_cuvs
hcho3 Oct 31, 2024
6ccb27b
Fix build
hcho3 Oct 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
4 changes: 3 additions & 1 deletion cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,9 @@ endif()
include(cmake/thirdparty/get_cccl.cmake)
include(cmake/thirdparty/get_rmm.cmake)
include(cmake/thirdparty/get_raft.cmake)
include(cmake/thirdparty/get_cuvs.cmake)
if(LINK_CUVS)
include(cmake/thirdparty/get_cuvs.cmake)
endif()

if(LINK_TREELITE)
include(cmake/thirdparty/get_treelite.cmake)
Expand Down
8 changes: 7 additions & 1 deletion cpp/cmake/modules/ConfigureAlgorithms.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -20,6 +20,7 @@ if(CUML_ALGORITHMS STREQUAL "ALL")
set(CUML_RAFT_COMPILED ON)
set(LINK_TREELITE ON)
set(LINK_CUFFT ON)
set(LINK_CUVS ON)
set(all_algo ON)
# setting treeshap to ON to get the gputreeshap include in the cuml_cpp_target
set(treeshap_algo ON)
Expand Down Expand Up @@ -122,5 +123,10 @@ else()
if(metrics_algo)
set(CUML_RAFT_COMPILED ON)
endif()

if(dbscan_algo OR hdbscan_algo OR kmeans_algo OR knn_algo
OR metrics_algo OR tsne_algo OR umap_algo)
set(LINK_CUVS ON)
endif()
endif()