-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update fmt (to 11.0.2) and spdlog (to 1.14.1) (#689)
* Bump fmt (to 11.0.2) and spdlog (to 1.14.1) * fix fmt pin in dependencies.yaml * point at rmm testing branch * try patching fmt * move patch down into 'fmt' directory * avoid unrecognized-pragma errors when fmt headers are compiled by C/C++ compilers (only want this for nvcc) * revert testing-only changes [skip ci] * skip CI [skip ci]
- Loading branch information
Showing
5 changed files
with
30 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
24 changes: 24 additions & 0 deletions
24
rapids-cmake/cpm/patches/fmt/fix_11_0_2_unreachable_loop.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters