Skip to content

Commit 224090c

Browse files
iboBNeo Zhang
authored andcommitted
llama : C++20 compatibility for u8 strings (ggml-org#8408)
1 parent 35f85f7 commit 224090c

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/llama.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@
5757
#include <io.h>
5858
#endif
5959

60+
#if __cplusplus >= 202000L
61+
#define LU8(x) (const char*)(u8##x)
62+
#else
63+
#define LU8(x) u8##x
64+
#endif
65+
6066
#include <algorithm>
6167
#include <array>
6268
#include <cassert>
@@ -21511,12 +21517,12 @@ static int32_t llama_chat_apply_template_internal(
2151121517
if (add_ass) {
2151221518
ss << "<|assistant|>";
2151321519
}
21514-
} else if (tmpl == "minicpm" || tmpl_contains(u8"<用户>")) {
21520+
} else if (tmpl == "minicpm" || tmpl_contains(LU8("<用户>"))) {
2151521521
// MiniCPM-3B-OpenHermes-2.5-v2-GGUF
2151621522
for (auto message : chat) {
2151721523
std::string role(message->role);
2151821524
if (role == "user") {
21519-
ss << u8"<用户>";
21525+
ss << LU8("<用户>");
2152021526
ss << trim(message->content);
2152121527
ss << "<AI>";
2152221528
} else {
@@ -21532,7 +21538,7 @@ static int32_t llama_chat_apply_template_internal(
2153221538
} else if (role == "user") {
2153321539
ss << "User: " << message->content << "\n\n";
2153421540
} else if (role == "assistant") {
21535-
ss << "Assistant: " << message->content << u8"<|end▁of▁sentence|>";
21541+
ss << "Assistant: " << message->content << LU8("<|end▁of▁sentence|>");
2153621542
}
2153721543
}
2153821544
if (add_ass) {

0 commit comments

Comments
 (0)