From 162a5c0a5ca5a0e26e1aa8923dd94ba9e4d93ea7 Mon Sep 17 00:00:00 2001 From: akifcorduk Date: Mon, 14 Jul 2025 03:54:30 -0700 Subject: [PATCH 1/2] fix logging --- cpp/CMakeLists.txt | 5 +---- cpp/src/linear_programming/utilities/logger_init.hpp | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index fe80843d0d..78255c45ff 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -96,13 +96,10 @@ set(LIBCUOPT_LOGGING_LEVEL CACHE STRING "Choose the logging level." ) set_property( - CACHE LIBCUOPT_LOGGING_LEVEL PROPERTY STRINGS "TRACE" "DEBUG" "INFO" "WARN" "ERROR" "CRITICAL" - "OFF" + CACHE LIBCUOPT_LOGGING_LEVEL PROPERTY STRINGS "OFF" "CRITICAL" "ERROR" "WARN" "INFO" "DEBUG" "TRACE" ) message(VERBOSE "CUOPT: LIBCUOPT_LOGGING_LEVEL = '${LIBCUOPT_LOGGING_LEVEL}'.") -#add_compile_definitions(CUOPT_LOG_ACTIVE_LEVEL=CUOPT_LOG_LEVEL_${LIBCUOPT_LOGGING_LEVEL}) - message("-- Building with logging level = ${LIBCUOPT_LOGGING_LEVEL}") message("-- Building for GPU_ARCHS = ${CMAKE_CUDA_ARCHITECTURES}") diff --git a/cpp/src/linear_programming/utilities/logger_init.hpp b/cpp/src/linear_programming/utilities/logger_init.hpp index 4d93f8cb66..2448373915 100644 --- a/cpp/src/linear_programming/utilities/logger_init.hpp +++ b/cpp/src/linear_programming/utilities/logger_init.hpp @@ -37,7 +37,11 @@ class init_logger_t { // TODO save the defaul sink and restore it cuopt::default_logger().sinks().push_back( std::make_shared(log_file, true)); +#if CUOPT_LOG_ACTIVE_LEVEL >= RAPIDS_LOGGER_LOG_LEVEL_INFO cuopt::default_logger().set_pattern("%v"); +#else + cuopt::default_logger().set_pattern(cuopt::default_pattern()); +#endif cuopt::default_logger().flush_on(rapids_logger::level_enum::info); } } From fed55c1fbbcfced99823188a09f6353b65aca4ed Mon Sep 17 00:00:00 2001 From: akifcorduk Date: Mon, 14 Jul 2025 05:26:27 -0700 Subject: [PATCH 2/2] revert logging order --- cpp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 78255c45ff..df4d9b526e 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -96,8 +96,8 @@ set(LIBCUOPT_LOGGING_LEVEL CACHE STRING "Choose the logging level." ) set_property( - CACHE LIBCUOPT_LOGGING_LEVEL PROPERTY STRINGS "OFF" "CRITICAL" "ERROR" "WARN" "INFO" "DEBUG" "TRACE" -) + CACHE LIBCUOPT_LOGGING_LEVEL PROPERTY STRINGS "TRACE" "DEBUG" "INFO" "WARN" "ERROR" "CRITICAL" + "OFF") message(VERBOSE "CUOPT: LIBCUOPT_LOGGING_LEVEL = '${LIBCUOPT_LOGGING_LEVEL}'.") message("-- Building with logging level = ${LIBCUOPT_LOGGING_LEVEL}")