diff --git a/rapids-cmake/cpm/patches/fmt/no_debug_warnings.diff b/rapids-cmake/cpm/patches/fmt/no_debug_warnings.diff deleted file mode 100644 index 9c778f41..00000000 --- a/rapids-cmake/cpm/patches/fmt/no_debug_warnings.diff +++ /dev/null @@ -1,13 +0,0 @@ -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 - diff --git a/rapids-cmake/cpm/patches/spdlog/nvcc_constexpr_fix.diff b/rapids-cmake/cpm/patches/spdlog/nvcc_constexpr_fix.diff new file mode 100644 index 00000000..5bc2915f --- /dev/null +++ b/rapids-cmake/cpm/patches/spdlog/nvcc_constexpr_fix.diff @@ -0,0 +1,41 @@ +diff --git a/include/spdlog/common.h b/include/spdlog/common.h +index 0a262eb2..29ef2324 100644 +--- a/include/spdlog/common.h ++++ b/include/spdlog/common.h +@@ -62,17 +62,26 @@ + + // visual studio up to 2013 does not support noexcept nor constexpr + #if defined(_MSC_VER) && (_MSC_VER < 1900) +-# define SPDLOG_NOEXCEPT _NOEXCEPT +-# define SPDLOG_CONSTEXPR +-# define SPDLOG_CONSTEXPR_FUNC inline ++ #define SPDLOG_NOEXCEPT _NOEXCEPT ++ #define SPDLOG_CONSTEXPR + #else +-# define SPDLOG_NOEXCEPT noexcept +-# define SPDLOG_CONSTEXPR constexpr +-# if __cplusplus >= 201402L +-# define SPDLOG_CONSTEXPR_FUNC constexpr +-# else +-# define SPDLOG_CONSTEXPR_FUNC inline +-# endif ++ #define SPDLOG_NOEXCEPT noexcept ++ #define SPDLOG_CONSTEXPR constexpr ++#endif ++ ++// If building with std::format, can just use constexpr, otherwise if building with fmt ++// SPDLOG_CONSTEXPR_FUNC needs to be set the same as FMT_CONSTEXPR to avoid situations where ++// a constexpr function in spdlog could end up calling a non-constexpr function in fmt ++// depending on the compiler ++// If fmt determines it can't use constexpr, we should inline the function instead ++#ifdef SPDLOG_USE_STD_FORMAT ++ #define SPDLOG_CONSTEXPR_FUNC constexpr ++#else // Being built with fmt ++ #if FMT_USE_CONSTEXPR ++ #define SPDLOG_CONSTEXPR_FUNC FMT_CONSTEXPR ++ #else ++ #define SPDLOG_CONSTEXPR_FUNC inline ++ #endif + #endif + + #if defined(__GNUC__) || defined(__clang__) diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index 552e5691..748a11a9 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -12,16 +12,9 @@ "git_tag" : "7c76a124df0c2cd3fd66e3e080b9470a3b4707c6" }, "fmt" : { - "version" : "9.1.0", + "version" : "10.1.1", "git_url" : "https://github.com/fmtlib/fmt.git", - "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" - } - ] + "git_tag" : "${version}" }, "GTest" : { "version" : "1.13.0", @@ -76,9 +69,16 @@ "git_tag" : "branch-${version}" }, "spdlog" : { - "version" : "1.11.0", + "version" : "1.12.0", "git_url" : "https://github.com/gabime/spdlog.git", - "git_tag" : "v${version}" + "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" + } + ] }, "Thrust" : { "version" : "1.17.2",