Skip to content

Commit

Permalink
Use new rapids-logger library (#1538)
Browse files Browse the repository at this point in the history
Contributes to rapidsai/build-planning#104.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

URL: #1538
  • Loading branch information
vyasr authored Feb 11, 2025
1 parent 2e7f4fd commit bdd480f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 2 additions & 0 deletions ci/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions cpp/cuproj/benchmarks/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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}>"
Expand Down

0 comments on commit bdd480f

Please sign in to comment.