From 99e237ef6a42321a6bbd28b7aab9e4cc4105e6a3 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Mon, 23 Sep 2024 15:11:29 -0500
Subject: [PATCH] Update fmt (to 11.0.2) and spdlog (to 1.14.1). (#1678)

* Update fmt (to 11.0.2) and spdlog (to 1.14.1).

* simplify get_spdlog

* copyright

* Apply suggestions from code review

Co-authored-by: Bradley Dice <bdice@bradleydice.com>

* Apply suggestions from code review

* test with changes from https://github.com/rapidsai/rapids-cmake/pull/689/commits/d7671a30f99bc2b239653b5c1089ff51bcc37dc4

* Update cmake/thirdparty/get_spdlog.cmake

* move rapids-cmake overrides [skip ci]

* try reverting get_spdlog export changes [skip ci]

* more fiddling with export sets [skip ci]

* more exporting [skip ci]

* more export set fiddling [skip ci]

* more [skip ci]

* exports [skip ci]

* run a build

* restore tests

* branch references

* remove testing-only changes [skip ci]

---------

Co-authored-by: Bradley Dice <bdice@bradleydice.com>
---
 cmake/thirdparty/get_spdlog.cmake              | 18 +++++-------------
 .../environments/all_cuda-118_arch-x86_64.yaml |  4 ++--
 .../environments/all_cuda-125_arch-x86_64.yaml |  4 ++--
 conda/recipes/librmm/conda_build_config.yaml   |  4 ++--
 dependencies.yaml                              |  4 ++--
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake
index 296370469..7f80b3726 100644
--- a/cmake/thirdparty/get_spdlog.cmake
+++ b/cmake/thirdparty/get_spdlog.cmake
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2021-2023, NVIDIA CORPORATION.
+# Copyright (c) 2021-2024, 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
@@ -16,19 +16,11 @@
 function(find_and_configure_spdlog)
 
   include(${rapids-cmake-dir}/cpm/spdlog.cmake)
-  rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports)
-  rapids_export_package(BUILD spdlog rmm-exports)
+  rapids_cpm_spdlog(
+    FMT_OPTION "EXTERNAL_FMT_HO"
+    INSTALL_EXPORT_SET rmm-exports
+    BUILD_EXPORT_SET rmm-exports)
 
-  if(spdlog_ADDED)
-    rapids_export(
-      BUILD spdlog
-      EXPORT_SET spdlog
-      GLOBAL_TARGETS spdlog spdlog_header_only
-      NAMESPACE spdlog::)
-    include("${rapids-cmake-dir}/export/find_package_root.cmake")
-    rapids_export_find_package_root(BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=]
-                                    EXPORT_SET rmm-exports)
-  endif()
 endfunction()
 
 find_and_configure_spdlog()
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 33b54b3f9..bf64d4d55 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -16,7 +16,7 @@ dependencies:
 - cxx-compiler
 - cython>=3.0.0
 - doxygen=1.9.1
-- fmt>=10.1.1,<11
+- fmt>=11.0.2,<12
 - gcc_linux-64=11.*
 - gcovr>=5.0
 - graphviz
@@ -35,7 +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.12.0,<1.13
+- 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
index 5946a9786..112c635a8 100644
--- a/conda/environments/all_cuda-125_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -16,7 +16,7 @@ dependencies:
 - cxx-compiler
 - cython>=3.0.0
 - doxygen=1.9.1
-- fmt>=10.1.1,<11
+- fmt>=11.0.2,<12
 - gcc_linux-64=11.*
 - gcovr>=5.0
 - graphviz
@@ -34,7 +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.12.0,<1.13
+- spdlog>=1.14.1,<1.15
 - sphinx
 - sphinx-copybutton
 - sphinx-markdown-tables
diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml
index 6afd32c32..b4791745f 100644
--- a/conda/recipes/librmm/conda_build_config.yaml
+++ b/conda/recipes/librmm/conda_build_config.yaml
@@ -14,10 +14,10 @@ cmake_version:
   - ">=3.26.4,!=3.30.0"
 
 fmt_version:
-  - ">=10.1.1,<11"
+  - ">=11.0.2,<12"
 
 spdlog_version:
-  - ">=1.12.0,<1.13"
+  - ">=1.14.1,<1.15"
 
 c_stdlib:
   - sysroot
diff --git a/dependencies.yaml b/dependencies.yaml
index eff3560e7..483c21e61 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -111,8 +111,8 @@ dependencies:
         packages:
           - c-compiler
           - cxx-compiler
-          - fmt>=10.1.1,<11
-          - spdlog>=1.12.0,<1.13
+          - fmt>=11.0.2,<12
+          - spdlog>=1.14.1,<1.15
     specific:
       - output_types: conda
         matrices: