Merge branch 'branch-23.10' into cccl-update-2.1.0

ci/build_cpp.sh

@@ -11,6 +11,6 @@ rapids-print-env
 
 rapids-logger "Begin cpp build"
 
-rapids-mamba-retry mambabuild conda/recipes/rapids_core_dependencies
+rapids-conda-retry mambabuild conda/recipes/rapids_core_dependencies
 
 rapids-upload-conda-to-s3 cpp

dependencies.yaml

@@ -132,7 +132,7 @@ dependencies:
         packages:
           - pip
           - pip:
-            - sphinxcontrib-moderncmakedomain
+              - sphinxcontrib-moderncmakedomain
           - sphinx
           - sphinx-copybutton
           - sphinx_rtd_theme
@@ -145,6 +145,9 @@ dependencies:
           - scikit-build>=0.13.1
           - libpng
           - zlib
+      - output_types: [conda]
+        packages:
+          - fmt==9.1.0
   style_checks:
     common:
       - output_types: [conda, requirements]

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

@@ -0,0 +1,13 @@
+diff --git a/include/fmt/core.h b/include/fmt/core.h
+index f6a37af..ffabe63 100644
+--- a/include/fmt/core.h
++++ b/include/fmt/core.h
+@@ -286,7 +286,7 @@
+
+ // Enable minimal optimizations for more compact code in debug mode.
+ FMT_GCC_PRAGMA("GCC push_options")
+-#if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER)
++#if !defined(__OPTIMIZE__) && !defined(__NVCOMPILER) && !defined(__LCC__) && !defined(__CUDACC__)
+ FMT_GCC_PRAGMA("GCC optimize(\"Og\")")
+ #endif
+

rapids-cmake/cpm/versions.json

@@ -14,7 +14,14 @@
     "fmt" : {
       "version" : "9.1.0",
       "git_url" : "https://github.com/fmtlib/fmt.git",
-      "git_tag" : "${version}"
+      "git_tag" : "${version}",
+      "patches" : [
+        {
+          "file" : "fmt/no_debug_warnings.diff",
+          "issue" : "No warnings during debug builds [https://github.com/fmtlib/fmt/issues/3351]",
+          "fixed_in" : "10.0"
+        }
+      ]
     },
     "GTest" : {
       "version" : "1.13.0",