Update to spdlog>=1.11.0, fmt>=9.1.0.

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -8,6 +8,7 @@ dependencies:
 - cuda-python>=11.7.1,<12.0
 - cudatoolkit=11.8
 - cython>=0.29,<0.30
+- fmt>=9.1.0,<10
 - gcovr>=5.0
 - ninja
 - numba>=0.49
@@ -17,5 +18,5 @@ dependencies:
 - pytest-cov
 - python>=3.8,<3.11
 - scikit-build>=0.13.1
-- spdlog>=1.8.5,<1.9
+- spdlog>=1.11.0,<1.12
 name: all_cuda-118_arch-x86_64

conda/recipes/librmm/conda_build_config.yaml

@@ -10,11 +10,14 @@ cuda_compiler:
 cmake_version:
   - ">=3.23.1,!=3.25.0"
 
+fmt_version:
+  - ">=9.1.0,<10"
+
 gtest_version:
   - "=1.10.0"
 
 spdlog_version:
-  - ">=1.8.5,<1.9"
+  - ">=1.11.0,<1.12"
 
 sysroot_version:
   - "2.17"

conda/recipes/librmm/meta.yaml

@@ -20,7 +20,14 @@ requirements:
     - {{ compiler('cuda') }} {{ cuda_version }}
     - sysroot_{{ target_platform }} {{ sysroot_version }}
   host:
-    - cudatoolkit {{ cuda_version }}.*
+    - cudatoolkit ={{ cuda_version }}
+    # We require spdlog and fmt (which was devendored from spdlog
+    # conda-forge packages in 1.11.0) so that the spdlog headers are not
+    # pulled by CPM and installed as a part of the rmm packages. However,
+    # building against librmm still requires these headers. They are also
+    # added as a run requirement via the packages' run_exports.
+    - fmt {{ fmt_version }}
+    - spdlog {{ spdlog_version }}
 
 build:
   script_env:
@@ -53,6 +60,7 @@ outputs:
         - cmake {{ cmake_version }}
       run:
         - cudatoolkit {{ cuda_spec }}
+        - fmt {{ fmt_version }}
         - spdlog {{ spdlog_version }}
     test:
       commands:

dependencies.yaml

@@ -49,7 +49,8 @@ dependencies:
           - scikit-build>=0.13.1
       - output_types: conda
         packages:
-          - spdlog>=1.8.5,<1.9
+          - fmt>=9.1.0,<10
+          - spdlog>=1.11.0,<1.12
   checks:
     common:
       - output_types: [conda, requirements]

include/rmm/logger.hpp

@@ -16,12 +16,7 @@
 
 #pragma once
 
-// If using GCC, temporary workaround for older libcudacxx defining _LIBCPP_VERSION
-// undefine it before including spdlog, due to fmtlib checking if it is defined
-// TODO: remove once libcudacxx is on Github and RAPIDS depends on it
-#ifdef __GNUG__
-#undef _LIBCPP_VERSION
-#endif
+#include <spdlog/fmt/ostr.h>
 #include <spdlog/sinks/basic_file_sink.h>
 #include <spdlog/spdlog.h>
 
@@ -115,3 +110,7 @@ inline spdlog::logger& logger()
 #define RMM_LOG_CRITICAL(...) SPDLOG_LOGGER_CRITICAL(&rmm::logger(), __VA_ARGS__)
 
 }  // namespace rmm
+
+template <>
+struct fmt::formatter<rmm::detail::bytes> : fmt::ostream_formatter {
+};