Merge branch 'branch-0.42' into enable-build-warnings-errors

rapidsai · Dec 18, 2024 · 9d1e5bf · 9d1e5bf
2 parents 7b8c0db + ec860d9
commit 9d1e5bf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -188,8 +188,7 @@ target_compile_definitions(
 # Enable RMM if necessary
 if(UCXX_ENABLE_RMM)
     target_link_libraries(ucxx
-      PUBLIC rmm::rmm rmm::rmm_logger
-      PRIVATE rmm::rmm_logger_impl
+      PUBLIC rmm::rmm
     )
 
     # Define spdlog level

diff --git a/cpp/include/ucxx/buffer.h b/cpp/include/ucxx/buffer.h
@@ -9,9 +9,10 @@
 
 #include <ucxx/log.h>
 
-#if UCXX_ENABLE_RMM
-#include <rmm/device_buffer.hpp>
-#endif
+namespace rmm {
+// Forward declaration to prevent symbols from being added to symbol table unnecessarily.
+class device_buffer;
+}  // namespace rmm
 
 namespace ucxx {
 

diff --git a/cpp/tests/buffer.cpp b/cpp/tests/buffer.cpp
@@ -11,6 +11,10 @@
 
 #include <ucxx/api.h>
 
+#if UCXX_ENABLE_RMM
+#include <rmm/device_buffer.hpp>
+#endif
+
 namespace {
 
 class BufferAllocator : public ::testing::Test,

diff --git a/cpp/tests/request.cpp b/cpp/tests/request.cpp
@@ -20,6 +20,10 @@
 #include "ucxx/constructors.h"
 #include "ucxx/utils/ucx.h"
 
+#if UCXX_ENABLE_RMM
+#include <rmm/device_buffer.hpp>
+#endif
+
 namespace {
 
 using ::testing::Combine;