diff --git a/dependencies.yaml b/dependencies.yaml index 4131d958..d11e9e6d 100644 --- a/dependencies.yaml +++ b/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 diff --git a/rapids-cmake/cpm/patches/fmt/fix_10_1_1_version.diff b/rapids-cmake/cpm/patches/fmt/fix_10_1_1_version.diff deleted file mode 100644 index 8a66afd4..00000000 --- a/rapids-cmake/cpm/patches/fmt/fix_10_1_1_version.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/fmt/core.h b/include/fmt/core.h -index 1fe13888..f9e3b7d6 100644 ---- a/include/fmt/core.h -+++ b/include/fmt/core.h -@@ -18,7 +18,7 @@ - #include - - // The fmt library version in the form major * 10000 + minor * 100 + patch. --#define FMT_VERSION 100100 -+#define FMT_VERSION 100101 - - #if defined(__clang__) && !defined(__ibmxl__) - # define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) diff --git a/rapids-cmake/cpm/patches/fmt/fix_11_0_2_unreachable_loop.diff b/rapids-cmake/cpm/patches/fmt/fix_11_0_2_unreachable_loop.diff new file mode 100644 index 00000000..f4ffe3fc --- /dev/null +++ b/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 FMT_CONSTEXPR auto length(const Char* s) -> size_t { + return len; + } + ++#if defined(__NVCC__) ++#pragma nv_diag_suppress 128 ++#endif + template + 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; diff --git a/rapids-cmake/cpm/patches/spdlog/nvcc_constexpr_fix.diff b/rapids-cmake/cpm/patches/spdlog/nvcc_constexpr_fix.diff deleted file mode 100644 index 5bc2915f..00000000 --- a/rapids-cmake/cpm/patches/spdlog/nvcc_constexpr_fix.diff +++ /dev/null @@ -1,41 +0,0 @@ -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 8f69f2a1..5fd65e2a 100644 --- a/rapids-cmake/cpm/versions.json +++ b/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}" } } }