Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add cmake command-line setting for spdlog logging level #6215

Merged
merged 5 commits into from
Sep 15, 2020
Merged

Add cmake command-line setting for spdlog logging level #6215

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecc9b4b
Add cmake command-line setting for spdlog logging level
jlowe Sep 11, 2020
210cb31
changelog
jlowe Sep 11, 2020
cec9653
Change cmake logging option to LOGGING_LEVEL
jlowe Sep 12, 2020
b34f7bd
Merge branch 'branch-0.16' into spdlog-level-flag
jlowe Sep 15, 2020
8c9877a
Change default RMM logging level to INFO
jlowe Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
- PR #6195 Update JNI to use parquet options builder
- PR #6190 Avoid reading full csv files for metadata in dask_cudf
- PR #6197 Remove librmm dependency for libcudf
- PR #6215 Add cmake command-line setting for spdlog logging level

## Bug Fixes

Expand Down
6 changes: 6 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@ endif(Boost_FOUND)
###################################################################################################
# - RMM -------------------------------------------------------------------------------------------

if(NOT SPDLOG_ACTIVE_LEVEL)
jlowe marked this conversation as resolved.
Show resolved Hide resolved
set(SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_OFF)
endif(NOT SPDLOG_ACTIVE_LEVEL)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPDLOG_ACTIVE_LEVEL=${SPDLOG_ACTIVE_LEVEL}")
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -DSPDLOG_ACTIVE_LEVEL=${SPDLOG_ACTIVE_LEVEL}")

find_path(RMM_INCLUDE "rmm"
HINTS "$ENV{RMM_ROOT}/include")

Expand Down
6 changes: 6 additions & 0 deletions java/src/main/native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ endif (CUDF_INCLUDE AND CUDF_LIBRARY)
###################################################################################################
# - RMM -------------------------------------------------------------------------------------------

if(NOT SPDLOG_ACTIVE_LEVEL)
set(SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_OFF)
endif(NOT SPDLOG_ACTIVE_LEVEL)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPDLOG_ACTIVE_LEVEL=${SPDLOG_ACTIVE_LEVEL}")
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -DSPDLOG_ACTIVE_LEVEL=${SPDLOG_ACTIVE_LEVEL}")

find_path(RMM_INCLUDE "rmm"
HINTS "$ENV{RMM_ROOT}/include"
"$ENV{RMM_HOME}/include"
Expand Down