Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into fea/streams
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt711 authored Jan 8, 2025
2 parents 74cad19 + d70bd4b commit 205ff92
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 942 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ concurrency:
jobs:
pr-builder:
needs:
- check-nightly-ci
- changed-files
- checks
- conda-cpp-build
Expand Down Expand Up @@ -40,6 +41,18 @@ jobs:
# since other jobs depend on it.
if: ${{ vars.TELEMETRY_ENABLED == 'true' }}
uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main
check-nightly-ci:
# Switch to ubuntu-latest once it defaults to a version of Ubuntu that
# provides at least Python 3.11 (see
# https://docs.python.org/3/library/datetime.html#datetime.date.fromisoformat)
runs-on: ubuntu-24.04
env:
RAPIDS_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Check if nightly CI is passing
uses: rapidsai/shared-actions/check_nightly_success/dispatch@main
with:
repo: rmm
changed-files:
needs:
- telemetry-setup
Expand Down
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
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.2
rev: v0.8.6
hooks:
- id: ruff
args: ["--fix"]
Expand Down Expand Up @@ -82,7 +82,7 @@ repos:
- id: verify-copyright
- id: verify-alpha-spec
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.16.0
rev: v1.17.0
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
Expand Down
7 changes: 3 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,9 @@ rapids_find_package(
# add third party dependencies using CPM
rapids_cpm_init()

add_subdirectory(rapids_logger)
include(${rapids-cmake-dir}/cpm/rapids_logger.cmake)
rapids_cpm_rapids_logger()
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 205ff92

Please sign in to comment.