Merge branch 'branch-25.02' into try-gcc-13

rapidsai · Jan 13, 2025 · 0a1355d · 0a1355d
2 parents a6bd58b + c1ccdad
commit 0a1355d
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 949 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -12,6 +12,7 @@ concurrency:
 jobs:
   pr-builder:
     needs:
+      - check-nightly-ci
       - changed-files
       - checks
       - conda-cpp-build
@@ -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

diff --git a/.gitignore b/.gitignore
@@ -155,9 +155,6 @@ ENV/
 # mypy
 .mypy_cache/
 
-# RMM log files
-rmm_log.txt
-
 # cibuildwheel
 /wheelhouse
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -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"]
@@ -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"]

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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
@@ -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)

diff --git a/README.md b/README.md
@@ -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`,

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -35,6 +35,7 @@ dependencies:
 - python>=3.10,<3.13
 - rapids-build-backend>=0.3.0,<0.4.0.dev0
 - scikit-build-core >=0.10.0
+- spdlog>=1.14.1,<1.15
 - sphinx
 - sphinx-copybutton
 - sphinx-markdown-tables

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -34,6 +34,7 @@ dependencies:
 - python>=3.10,<3.13
 - rapids-build-backend>=0.3.0,<0.4.0.dev0
 - scikit-build-core >=0.10.0
+- spdlog>=1.14.1,<1.15
 - sphinx
 - sphinx-copybutton
 - sphinx-markdown-tables

diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml
@@ -26,13 +26,8 @@ requirements:
     - {{ stdlib("c") }}
   host:
     - cuda-version ={{ cuda_version }}
-    # We need fmt here for now because the conda spdlog package is hard-coded
-    # to use fmt as a compiled library, not header-only, so we must ensure that
-    # the library is present for now so that if a downstream library tries to
-    # build against rmm and some other package in its build environment uses
-    # fmt (or spdlog) that the default rmm build is consistent with such
-    # environments.
     - fmt {{ fmt_version }}
+    - spdlog {{ spdlog_version }}
 
 build:
   script_env:
@@ -73,8 +68,8 @@ outputs:
         {% if cuda_major == "11" %}
         - cudatoolkit
         {% endif %}
-        # See comment about fmt in the build section above.
         - fmt {{ fmt_version }}
+        - spdlog {{ spdlog_version }}
     test:
       commands:
         - test -d "${PREFIX}/include/rmm"

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -112,6 +112,7 @@ dependencies:
           - c-compiler
           - cxx-compiler
           - fmt>=11.0.2,<12
+          - spdlog>=1.14.1,<1.15
     specific:
       - output_types: conda
         matrices:

diff --git a/rapids_logger/CMakeLists.txt b/rapids_logger/CMakeLists.txt
diff --git a/rapids_logger/README.md b/rapids_logger/README.md
diff --git a/rapids_logger/logger.cpp.in b/rapids_logger/logger.cpp.in