diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 93e5c680d0..9dedafcd8f 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -15,7 +15,11 @@ rapids-print-env rapids-logger "Begin cpp build" -RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libcugraph +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 sccache --show-adv-stats diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 8ecab358dd..ad30b3769d 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -488,6 +488,7 @@ target_link_libraries(cugraph ${COMPILED_RAFT_LIB} cuco::cuco rmm::rmm_logger_impl + raft::raft_logger_impl ) ################################################################################ diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 8f56372c81..daded2779b 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 rapidsai - PINNED_TAG branch-${CUGRAPH_BRANCH_VERSION_raft} + FORK vyasr + PINNED_TAG feat/logger # When PINNED_TAG above doesn't match cugraph, # force local raft clone in build directory # even if it's already installed. - CLONE_ON_PIN ON + CLONE_ON_PIN OFF USE_RAFT_STATIC ${USE_RAFT_STATIC} COMPILE_RAFT_LIB ${CUGRAPH_COMPILE_RAFT_LIB} ) diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt index 44963f9151..4cc9f2d94b 100644 --- a/cpp/tests/CMakeLists.txt +++ b/cpp/tests/CMakeLists.txt @@ -169,6 +169,7 @@ function(ConfigureTest CMAKE_TEST_NAME) cugraphtestutil GTest::gtest GTest::gtest_main + test_logger_impls ) set_target_properties( ${CMAKE_TEST_NAME} @@ -199,6 +200,7 @@ function(ConfigureTestMG CMAKE_TEST_NAME) GTest::gtest_main NCCL::NCCL MPI::MPI_CXX + test_logger_impls ) set_target_properties( ${CMAKE_TEST_NAME} @@ -250,6 +252,7 @@ function(ConfigureCTest CMAKE_TEST_NAME) cugraph_c_testutil GTest::gtest GTest::gtest_main + test_logger_impls ) set_target_properties( ${CMAKE_TEST_NAME} @@ -282,6 +285,7 @@ function(ConfigureCTestMG CMAKE_TEST_NAME) GTest::gtest_main NCCL::NCCL MPI::MPI_CXX + test_logger_impls ) set_target_properties( ${CMAKE_TEST_NAME} @@ -310,6 +314,10 @@ function(ConfigureCTestMG CMAKE_TEST_NAME) endfunction() +add_library(test_logger_impls OBJECT) +target_link_libraries(test_logger_impls PRIVATE raft::raft_logger_impl) + + ################################################################################################### ### test sources ################################################################################## ###################################################################################################