From 74bb58bc635637e4b8384b70c6c5812c985b2314 Mon Sep 17 00:00:00 2001 From: achirkin Date: Mon, 2 May 2022 10:01:12 +0200 Subject: [PATCH 1/2] Changed the name of the NVTX flag to RAFT_NVTX --- cpp/cmake/thirdparty/get_raft.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index d63087a7fb..6061e6128d 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -62,7 +62,7 @@ function(find_and_configure_raft) "RAFT_COMPILE_NN_LIBRARY ${PKG_USE_RAFT_NN}" "RAFT_COMPILE_DIST_LIBRARY ${PKG_USE_RAFT_DIST}" "RAFT_USE_FAISS_STATIC ${PKG_USE_FAISS_STATIC}" - "NVTX ${NVTX}" + "RAFT_NVTX ${NVTX}" ) if(raft_ADDED) @@ -78,8 +78,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 rapidsai - PINNED_TAG branch-${CUML_BRANCH_VERSION_raft} + FORK achirkin + PINNED_TAG enh-allow-nvtx-after-install # When PINNED_TAG above doesn't match cuml, # force local raft clone in build directory From 892c613cd01dfb6b0bb054e7e774d589b17bc09e Mon Sep 17 00:00:00 2001 From: "Artem M. Chirkin" <9253178+achirkin@users.noreply.github.com> Date: Wed, 11 May 2022 18:42:22 +0200 Subject: [PATCH 2/2] Update get_raft.cmake --- cpp/cmake/thirdparty/get_raft.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 6061e6128d..977d2178be 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -78,8 +78,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 achirkin - PINNED_TAG enh-allow-nvtx-after-install + FORK rapidsai + PINNED_TAG branch-${CUML_BRANCH_VERSION_raft} # When PINNED_TAG above doesn't match cuml, # force local raft clone in build directory