Merge branch 'branch-25.04' into patch-6

rapidsai · Feb 12, 2025 · fbf7aa4 · fbf7aa4
2 parents 449d988 + bdd480f
commit fbf7aa4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
@@ -16,12 +16,14 @@ case "${package_dir}" in
   python/libcuspatial)
     EXCLUDE_ARGS=(
       --exclude "libcudf.so"
+      --exclude "librapids_logger.so"
     )
   ;;
   *)
     EXCLUDE_ARGS=(
       --exclude "libcudf.so"
       --exclude "libcuspatial.so"
+      --exclude "librapids_logger.so"
     )
   ;;
 esac

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright (c) 2019-2024, NVIDIA CORPORATION.
+# Copyright (c) 2019-2025, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -225,10 +225,6 @@ if(CUSPATIAL_BUILD_BENCHMARKS)
     include(${rapids-cmake-dir}/cpm/gbench.cmake)
     rapids_cpm_gbench(BUILD_STATIC)
 
-    # Find or install NVBench Temporarily force downloading of fmt because current versions of nvbench
-    # do not support the latest version of fmt, which is automatically pulled into our conda
-    # environments by mamba.
-    set(CPM_DOWNLOAD_fmt TRUE)
     include(${rapids-cmake-dir}/cpm/nvbench.cmake)
     rapids_cpm_nvbench()
     add_subdirectory(benchmarks)

diff --git a/cpp/cuproj/benchmarks/CMakeLists.txt b/cpp/cuproj/benchmarks/CMakeLists.txt
@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright (c) 2023-2024, NVIDIA CORPORATION.
+# Copyright (c) 2023-2025, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@ add_library(cuproj_benchmark_common OBJECT
 target_compile_features(cuproj_benchmark_common PUBLIC cxx_std_17 cuda_std_17)
 
 target_link_libraries(cuproj_benchmark_common
-  PUBLIC benchmark::benchmark rmm::rmm cuproj
-  PRIVATE rmm::rmm_logger_impl)
+  PUBLIC benchmark::benchmark rmm::rmm cuproj)
 
 target_compile_options(cuproj_benchmark_common
   PUBLIC "$<$<COMPILE_LANGUAGE:CXX>:${CUPROJ_CXX_FLAGS}>"