From c2d544b706b24ec4ef7ff7195dd25a80745428a9 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Tue, 15 Sep 2020 10:02:09 -0500 Subject: [PATCH] Add cmake command-line setting for spdlog logging level (#6215) * Add cmake command-line setting for spdlog logging level * changelog * Change cmake logging option to LOGGING_LEVEL * Change default RMM logging level to INFO --- CHANGELOG.md | 1 + cpp/CMakeLists.txt | 16 ++++++++++++++++ java/pom.xml | 2 ++ java/src/main/native/CMakeLists.txt | 16 ++++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11c2259c22f..2274651ef5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ - PR #6214 Small clean up to use more algorithms - PR #6209 Remove CXX11 ABI handling from CMake - PR #6223 Remove CXX11 ABI flag from JNI build +- PR #6215 Add cmake command-line setting for spdlog logging level ## Bug Fixes diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 0694f9c487f..977ab3b9c82 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -763,6 +763,22 @@ if(HT_DEFAULT_ALLOCATOR) set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -DHT_DEFAULT_ALLOCATOR") endif(HT_DEFAULT_ALLOCATOR) +# Set a default logging level if none was specified +set(DEFAULT_LOGGING_LEVEL INFO) + +if(NOT LOGGING_LEVEL) + message(STATUS "Setting logging level to '${DEFAULT_LOGGING_LEVEL}' since none specified.") + set(LOGGING_LEVEL "${DEFAULT_LOGGING_LEVEL}" CACHE + STRING "Choose the logging level." FORCE) + # Set the possible values of build type for cmake-gui + set_property(CACHE LOGGING_LEVEL PROPERTY STRINGS + "TRACE" "DEBUG" "INFO" "WARN" "ERROR" "CRITICAL" "OFF") +else() + message(STATUS "Setting logging level to '${LOGGING_LEVEL}'") +endif(NOT LOGGING_LEVEL) + +target_compile_definitions(cudf PUBLIC SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${LOGGING_LEVEL}) + ################################################################################################### # - link libraries -------------------------------------------------------------------------------- diff --git a/java/pom.xml b/java/pom.xml index 110f2818d28..5e08e86d66c 100755 --- a/java/pom.xml +++ b/java/pom.xml @@ -146,6 +146,7 @@ OFF OFF OFF + INFO ${project.build.directory}/cmake-build 1.7.30 @@ -347,6 +348,7 @@ + diff --git a/java/src/main/native/CMakeLists.txt b/java/src/main/native/CMakeLists.txt index 733a8878f40..d967c16ed42 100755 --- a/java/src/main/native/CMakeLists.txt +++ b/java/src/main/native/CMakeLists.txt @@ -239,6 +239,22 @@ if(PER_THREAD_DEFAULT_STREAM) add_compile_definitions(CUDA_API_PER_THREAD_DEFAULT_STREAM) endif(PER_THREAD_DEFAULT_STREAM) +# Set a default logging level if none was specified +set(DEFAULT_LOGGING_LEVEL INFO) + +if(NOT LOGGING_LEVEL) + message(STATUS "Setting logging level to '${DEFAULT_LOGGING_LEVEL}' since none specified.") + set(LOGGING_LEVEL "${DEFAULT_LOGGING_LEVEL}" CACHE + STRING "Choose the logging level." FORCE) + # Set the possible values of build type for cmake-gui + set_property(CACHE LOGGING_LEVEL PROPERTY STRINGS + "TRACE" "DEBUG" "INFO" "WARN" "ERROR" "CRITICAL" "OFF") +else() + message(STATUS "Setting logging level to '${LOGGING_LEVEL}'") +endif(NOT LOGGING_LEVEL) + +target_compile_definitions(cudfjni PUBLIC SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${LOGGING_LEVEL}) + ################################################################################################### # - link libraries --------------------------------------------------------------------------------