From 3e1c465449d79c5eb98b3c5786f5e6bbee165b34 Mon Sep 17 00:00:00 2001 From: Ben Frederickson Date: Sun, 29 Sep 2024 17:04:15 -0700 Subject: [PATCH] cmake fixes --- cpp/bench/CMakeLists.txt | 1 - cpp/cmake/thirdparty/get_cuvs.cmake | 4 ++-- cpp/cmake/thirdparty/get_raft.cmake | 4 ++-- cpp/test/CMakeLists.txt | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cpp/bench/CMakeLists.txt b/cpp/bench/CMakeLists.txt index 6b3d4823d3..963ea307dc 100644 --- a/cpp/bench/CMakeLists.txt +++ b/cpp/bench/CMakeLists.txt @@ -51,7 +51,6 @@ if(BUILD_CUML_BENCH) ${TREELITE_LIBS} cuvs::cuvs raft::raft - raft::compiled ) target_include_directories(${CUML_CPP_BENCH_TARGET} diff --git a/cpp/cmake/thirdparty/get_cuvs.cmake b/cpp/cmake/thirdparty/get_cuvs.cmake index 94e3841a76..1298310008 100644 --- a/cpp/cmake/thirdparty/get_cuvs.cmake +++ b/cpp/cmake/thirdparty/get_cuvs.cmake @@ -54,8 +54,8 @@ endfunction() # To use a different CUVS locally, set the CMake variable # CPM_cuvs_SOURCE=/path/to/local/cuvs find_and_configure_cuvs(VERSION ${CUML_MIN_VERSION_cuvs} - FORK rapidsai - PINNED_TAG branch-${CUML_BRANCH_VERSION_cuvs} + FORK benfred + PINNED_TAG cuml_integration EXCLUDE_FROM_ALL ${CUML_EXCLUDE_CUVS_FROM_ALL} # When PINNED_TAG above doesn't match cuml, # force local cuvs clone in build directory diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 8d7ef819b1..4f260fcb93 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -72,8 +72,8 @@ endfunction() # To use a different RAFT locally, set the CMake variable # CPM_raft_SOURCE=/path/to/local/raft find_and_configure_raft(VERSION ${CUML_MIN_VERSION_raft} - FORK benfred - PINNED_TAG cuml_integration + FORK rapidsai + PINNED_TAG branch-${CUML_BRANCH_VERSION_raft} EXCLUDE_FROM_ALL ${CUML_EXCLUDE_RAFT_FROM_ALL} # When PINNED_TAG above doesn't match cuml, # force local raft clone in build directory diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt index c925eb4160..814ebff745 100644 --- a/cpp/test/CMakeLists.txt +++ b/cpp/test/CMakeLists.txt @@ -58,7 +58,6 @@ function(ConfigureTest) cuvs::cuvs rmm::rmm raft::raft - $<$:raft::compiled> GTest::gtest GTest::gtest_main GTest::gmock