From f20c2a5ba666267e70467c1a331eb8488c52d5ce Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Sun, 17 Nov 2024 18:09:48 +0000 Subject: [PATCH 1/4] Adapt to rmm logger changes --- cpp/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 09f3b37875..e86d032370 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -626,9 +626,10 @@ if(BUILD_CUML_CPP_LIBRARY) ) target_link_libraries(${CUML_CPP_TARGET} - PUBLIC rmm::rmm ${CUVS_LIB} + PUBLIC rmm::rmm rmm::rmm_logger ${CUVS_LIB} ${_cuml_cpp_public_libs} PRIVATE ${_cuml_cpp_private_libs} + $ ) # If we export the libdmlc symbols, they can lead to weird crashes with other From aeef5cd8bf569ca743afa09955b035ea09b785e5 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 29 Nov 2024 17:49:56 -0800 Subject: [PATCH 2/4] Update cpp/CMakeLists.txt --- cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index e86d032370..e176f802bf 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -629,7 +629,7 @@ if(BUILD_CUML_CPP_LIBRARY) PUBLIC rmm::rmm rmm::rmm_logger ${CUVS_LIB} ${_cuml_cpp_public_libs} PRIVATE ${_cuml_cpp_private_libs} - $ + rmm::rmm_logger_impl ) # If we export the libdmlc symbols, they can lead to weird crashes with other From c0426e1bd1b63ff52b0cef055927e10e60a27e20 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Sat, 30 Nov 2024 08:56:52 -0800 Subject: [PATCH 3/4] Make sure tests are linked to logger --- cpp/test/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt index 46bd275fcc..e61a32cc3b 100644 --- a/cpp/test/CMakeLists.txt +++ b/cpp/test/CMakeLists.txt @@ -56,6 +56,8 @@ function(ConfigureTest) CUDA::cusparse${_ctk_static_suffix} $<$:CUDA::cufft${_ctk_static_suffix_cufft}> rmm::rmm + rmm::rmm_logger + rmm::rmm_logger_impl raft::raft GTest::gtest GTest::gtest_main From 244ae83ae7cafe8a7b7b744f80fb3ab4284f8cf8 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Sat, 30 Nov 2024 08:57:29 -0800 Subject: [PATCH 4/4] Make sure benchmarks are linked to the logger impl --- cpp/bench/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/bench/CMakeLists.txt b/cpp/bench/CMakeLists.txt index 237d8e0c6e..f449421ccb 100644 --- a/cpp/bench/CMakeLists.txt +++ b/cpp/bench/CMakeLists.txt @@ -50,6 +50,7 @@ if(BUILD_CUML_BENCH) benchmark::benchmark ${TREELITE_LIBS} raft::raft + rmm::rmm_logger_impl ) target_include_directories(${CUML_CPP_BENCH_TARGET}