Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into feat/check_nightly_ci
Browse files Browse the repository at this point in the history
  • Loading branch information
bdice authored Jan 2, 2025
2 parents 7260f63 + 8275ba8 commit 22b8b33
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 940 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,6 @@ ENV/
# mypy
.mypy_cache/

# RMM log files
rmm_log.txt

# cibuildwheel
/wheelhouse

Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# =============================================================================
# Copyright (c) 2018-2024, NVIDIA CORPORATION.
# Copyright (c) 2018-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. You may obtain a copy of the License at
Expand Down Expand Up @@ -73,10 +73,10 @@ rapids_find_package(
# add third party dependencies using CPM
rapids_cpm_init()

add_subdirectory(rapids_logger)
CPMAddPackage(
NAME rapids_logger GITHUB_REPOSITORY rapidsai/rapids-logger GIT_SHALLOW FALSE GIT_TAG
1043e0f3989d75ad52f5212544b8154777e86fc9 VERSION 1043e0f3989d75ad52f5212544b8154777e86fc9)
rapids_make_logger(rmm EXPORT_SET rmm-exports)
add_library(rmm::rmm_logger ALIAS rmm_logger)
add_library(rmm::rmm_logger_impl ALIAS rmm_logger_impl)

include(cmake/thirdparty/get_cccl.cmake)
include(cmake/thirdparty/get_nvtx.cmake)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -647,8 +647,8 @@ set to `True`. The log file name can be set using the `log_file_name` parameter.
RMM includes a debug logger which can be enabled to log trace and debug information to a file. This
information can show when errors occur, when additional memory is allocated from upstream resources,
etc. The default log file is `rmm_log.txt` in the current working directory, but the environment
variable `RMM_DEBUG_LOG_FILE` can be set to specify the path and file name.
etc. By default output is logged to stderr, but the environment variable
`RMM_DEBUG_LOG_FILE` can be set to specify a path and file name to dump the logs to instead.
There is a CMake configuration variable `RMM_LOGGING_LEVEL`, which can be set to enable compilation
of more detailed logging. The default is `INFO`. Available levels are `TRACE`, `DEBUG`, `INFO`,
Expand Down
177 changes: 0 additions & 177 deletions rapids_logger/CMakeLists.txt

This file was deleted.

22 changes: 0 additions & 22 deletions rapids_logger/README.md

This file was deleted.

17 changes: 0 additions & 17 deletions rapids_logger/logger.cpp.in

This file was deleted.

Loading

0 comments on commit 22b8b33

Please sign in to comment.