From 91cb5372f12912eee2100265e29908ca0bb9b659 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Mon, 30 Dec 2024 20:59:26 +0000 Subject: [PATCH] Remove testing changes --- ci/build_cpp.sh | 6 +----- cpp/cmake/thirdparty/get_raft.cmake | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 9dedafcd8f0..93e5c680d07 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -15,11 +15,7 @@ rapids-print-env rapids-logger "Begin cpp build" -LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2530 cpp) - -RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \ - --channel "${LIBRAFT_CHANNEL}" \ - conda/recipes/libcugraph +RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libcugraph sccache --show-adv-stats diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index daded2779b9..8f56372c81a 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -67,13 +67,13 @@ endfunction() # To use a different RAFT locally, set the CMake variable # CPM_raft_SOURCE=/path/to/local/raft find_and_configure_raft(VERSION ${CUGRAPH_MIN_VERSION_raft} - FORK vyasr - PINNED_TAG feat/logger + FORK rapidsai + PINNED_TAG branch-${CUGRAPH_BRANCH_VERSION_raft} # When PINNED_TAG above doesn't match cugraph, # force local raft clone in build directory # even if it's already installed. - CLONE_ON_PIN OFF + CLONE_ON_PIN ON USE_RAFT_STATIC ${USE_RAFT_STATIC} COMPILE_RAFT_LIB ${CUGRAPH_COMPILE_RAFT_LIB} )