Merge pull request #694 from rapidsai/branch-24.10

Forward-merge branch-24.10 into branch-24.12

dependencies.yaml

@@ -173,7 +173,7 @@ dependencies:
           - zlib
       - output_types: [conda]
         packages:
-          - fmt==9.1.0
+          - fmt==11.0.2
   py_version:
     specific:
       - output_types: conda

rapids-cmake/cpm/patches/fmt/fix_11_0_2_unreachable_loop.diff

@@ -0,0 +1,24 @@
+diff --git a/include/fmt/base.h b/include/fmt/base.h
+index 62764942..60f7483b 100644
+--- a/include/fmt/base.h
++++ b/include/fmt/base.h
+@@ -464,6 +464,9 @@ template <typename Char> FMT_CONSTEXPR auto length(const Char* s) -> size_t {
+   return len;
+ }
+
++#if defined(__NVCC__)
++#pragma nv_diag_suppress 128
++#endif
+ template <typename Char>
+ FMT_CONSTEXPR auto compare(const Char* s1, const Char* s2, std::size_t n)
+     -> int {
+@@ -474,6 +477,9 @@ FMT_CONSTEXPR auto compare(const Char* s1, const Char* s2, std::size_t n)
+   }
+   return 0;
+ }
++#if defined(__NVCC__)
++#pragma nv_diag_default 128
++#endif
+
+ namespace adl {
+ using namespace std;

rapids-cmake/cpm/versions.json

@@ -24,14 +24,13 @@
       "git_tag": "d3477661d771e0d6fd22259bf6dd6f8c64a7401c"
     },
     "fmt": {
-      "version": "10.1.1",
+      "version": "11.0.2",
       "git_url": "https://github.com/fmtlib/fmt.git",
       "git_tag": "${version}",
       "patches": [
         {
-          "file": "fmt/fix_10_1_1_version.diff",
-          "issue": "fmt 10.1.1 produces a CMake package with version 10.1.0",
-          "fixed_in": "10.2.0"
+          "file": "fmt/fix_11_0_2_unreachable_loop.diff",
+          "issue": "fmt 11.0.2 produces a warning about an unreachable loop when compiled with nvcc"
         }
       ]
     },
@@ -70,16 +69,9 @@
       "git_tag": "branch-${version}"
     },
     "spdlog": {
-      "version": "1.12.0",
+      "version": "1.14.1",
       "git_url": "https://github.com/gabime/spdlog.git",
-      "git_tag": "v${version}",
-      "patches": [
-        {
-          "file": "spdlog/nvcc_constexpr_fix.diff",
-          "issue": "Fix constexpr mismatch between spdlog and fmt [https://github.com/gabime/spdlog/issues/2856]",
-          "fixed_in": "1.13"
-        }
-      ]
+      "git_tag": "v${version}"
     }
   }
 }