tqcq/llama.cpp
0
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-06-27 12:05:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

llama : better rwkv chat template and add missing inputs.use_jinja setting (#14336)

Browse Source 
* llama-cli : add missing `inputs.use_jinja` setting

Signed-off-by: Molly Sophia <mollysophia379@gmail.com>

* llama : better legacy chat template for rwkv

Signed-off-by: Molly Sophia <mollysophia379@gmail.com>

---------

Signed-off-by: Molly Sophia <mollysophia379@gmail.com>
This commit is contained in:
Molly Sophia
2025-06-23 19:56:19 +08:00
committed by GitHub
parent defe2158dd
commit 72c6bc3f3d
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/llama-chat.cpp
View File

@ -528,12 +528,17 @@ int32_t llm_chat_apply_template(
} }
} else if (tmpl == LLM_CHAT_TEMPLATE_RWKV_WORLD) { } else if (tmpl == LLM_CHAT_TEMPLATE_RWKV_WORLD) {
// this template requires the model to have "\n\n" as EOT token // this template requires the model to have "\n\n" as EOT token
for (auto message : chat) { for (size_t i = 0; i < chat.size(); i++) {
std::string role(message->role); std::string role(chat[i]->role);
if (role == "user") { if (role == "system") {
ss << "User: " << message->content << "\n\nAssistant:"; ss << "System: " << trim(chat[i]->content) << "\n\n";
} else { } else if (role == "user") {
ss << message->content << "\n\n"; ss << "User: " << trim(chat[i]->content) << "\n\n";
if (i == chat.size() - 1) {
ss << "Assistant:";
}
} else if (role == "assistant") {
ss << "Assistant: " << trim(chat[i]->content) << "\n\n";
} }
} }
} else if (tmpl == LLM_CHAT_TEMPLATE_GRANITE) { } else if (tmpl == LLM_CHAT_TEMPLATE_GRANITE) {

1
tools/main/main.cpp
View File

@ -292,6 +292,7 @@ int main(int argc, char ** argv) {
if (!params.system_prompt.empty() || !params.prompt.empty()) { if (!params.system_prompt.empty() || !params.prompt.empty()) {
common_chat_templates_inputs inputs; common_chat_templates_inputs inputs;
inputs.use_jinja = g_params->use_jinja;
inputs.messages = chat_msgs; inputs.messages = chat_msgs;
inputs.add_generation_prompt = !params.prompt.empty(); inputs.add_generation_prompt = !params.prompt.empty();