Skip to content

Commit

Permalink
Remove remaining references to spdlog
Browse files Browse the repository at this point in the history
  • Loading branch information
vyasr committed Dec 3, 2024
1 parent 2951502 commit 6a5e418
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 46 deletions.
1 change: 0 additions & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ dependencies:
- s3fs>=2022.3.0
- scikit-build-core>=0.10.0
- scipy
- spdlog>=1.14.1,<1.15
- sphinx
- sphinx-autobuild
- sphinx-copybutton
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ dependencies:
- s3fs>=2022.3.0
- scikit-build-core>=0.10.0
- scipy
- spdlog>=1.14.1,<1.15
- sphinx
- sphinx-autobuild
- sphinx-copybutton
Expand Down
8 changes: 1 addition & 7 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,6 @@ include(cmake/Modules/JitifyPreprocessKernels.cmake)
include(cmake/thirdparty/get_kvikio.cmake)
# find fmt
include(cmake/thirdparty/get_fmt.cmake)
# find spdlog
include(cmake/thirdparty/get_spdlog.cmake)
# find nanoarrow
include(cmake/thirdparty/get_nanoarrow.cmake)
# find thread_pool
Expand Down Expand Up @@ -920,9 +918,6 @@ endif()
# Define RMM logging level
target_compile_definitions(cudf PRIVATE "RMM_LOGGING_LEVEL=LIBCUDF_LOGGING_LEVEL")

# Define spdlog level
target_compile_definitions(cudf PUBLIC "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${LIBCUDF_LOGGING_LEVEL}")

# Enable remote IO through KvikIO
target_compile_definitions(cudf PRIVATE $<$<BOOL:${CUDF_KVIKIO_REMOTE_IO}>:CUDF_KVIKIO_REMOTE_IO>)

Expand All @@ -941,8 +936,7 @@ add_dependencies(cudf jitify_preprocess_run)
# Specify the target module library dependencies
target_link_libraries(
cudf
PUBLIC CCCL::CCCL rmm::rmm rmm::rmm_logger $<BUILD_LOCAL_INTERFACE:BS::thread_pool>
spdlog::spdlog_header_only cudf_logger
PUBLIC CCCL::CCCL rmm::rmm rmm::rmm_logger $<BUILD_LOCAL_INTERFACE:BS::thread_pool> cudf_logger
PRIVATE $<BUILD_LOCAL_INTERFACE:nvtx3::nvtx3-cpp>
cuco::cuco
ZLIB::ZLIB
Expand Down
27 changes: 0 additions & 27 deletions cpp/cmake/thirdparty/get_spdlog.cmake

This file was deleted.

6 changes: 3 additions & 3 deletions cpp/doxygen/developer_guide/DEVELOPER_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -1082,15 +1082,15 @@ initialization. If this setting is higher than the compile-time CMake variable,
in between the two settings will be excluded from the written log. The available levels are the same
as for the CMake variable.
* Global logger object exposed via `cudf::logger()` - sets the minimum logging level at runtime.
For example, calling `cudf::logger().set_level(spdlog::level::err)`, will exclude any messages that
For example, calling `cudf::default_logger().set_level(level_enum::err)`, will exclude any messages that
are not errors or critical errors. This API should not be used within libcudf to manipulate logging,
its purpose is to allow upstream users to configure libcudf logging to fit their application.

By default, logging messages are output to stderr.
Setting the environment variable `LIBCUDF_DEBUG_LOG_FILE` redirects the log to a file with the
specified path (can be relative to the current directory).
Upstream users can also manipulate `cudf::logger().sinks()` to add sinks or divert the log to
standard output or even a custom spdlog sink.
Upstream users can also manipulate `cudf::default_logger().sinks()` to add sinks or divert the log to
standard output.

# Data Types

Expand Down
7 changes: 1 addition & 6 deletions cpp/tests/utilities_tests/logger_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,14 @@

#include <cudf/logger.hpp>

#include <spdlog/sinks/ostream_sink.h>

#include <string>

class LoggerTest : public cudf::test::BaseFixture {
std::ostringstream oss;
cudf::level_enum prev_level;
spdlog::sink_ptr new_sink;

public:
LoggerTest()
: prev_level{cudf::default_logger().level()},
new_sink{std::make_shared<spdlog::sinks::ostream_sink_mt>(oss)}
LoggerTest() : prev_level{cudf::default_logger().level()}
{
cudf::default_logger().sinks().push_back(std::make_shared<cudf::ostream_sink_mt>(oss));
cudf::default_logger().set_pattern("%v");
Expand Down
1 change: 0 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,6 @@ dependencies:
- fmt>=11.0.2,<12
- flatbuffers==24.3.25
- librdkafka>=2.5.0,<2.6.0a0
- spdlog>=1.14.1,<1.15
depends_on_nvcomp:
common:
- output_types: conda
Expand Down

0 comments on commit 6a5e418

Please sign in to comment.