vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Combine vicuna chat templates

Browse source
This commit is contained in:
Kai Zau 2024-03-30 17:47:37 +09:00
parent e423aa1adf
commit 5305d6822a
1 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

28
llama.cpp
View file

@ -15698,7 +15698,7 @@ static int32_t llama_chat_apply_template_internal(
} }
} }
} else if (tmpl == "openchat" || tmpl.find("GPT4 Correct ") != std::string::npos) { } else if (tmpl == "openchat" || tmpl.find("GPT4 Correct ") != std::string::npos) {
// Openchat, Starling // openchat/openchat-3.5-0106,
for (auto message : chat) { for (auto message : chat) {
std::string role(message->role); std::string role(message->role);
if (role == "user") { if (role == "user") {
@ -15713,27 +15713,17 @@ static int32_t llama_chat_apply_template_internal(
if (add_ass) { if (add_ass) {
ss << "GPT4 Correct Assistant:"; ss << "GPT4 Correct Assistant:";
} }
} else if (tmpl == "vicuna" || tmpl.find("USER: ") != std::string::npos) { } else if (tmpl == "vicuna" || (tmpl.find("ASSISTANT: ") != std::string::npos && tmpl.find("USER: ") != std::string::npos)) {
// Vicuna 1.1+, Nous Capybara, etc. // eachadea/vicuna-13b-1.1 (and Orca variant)
for (auto message : chat) { for (auto message : chat) {
std::string role(message->role); std::string role(message->role);
if (role == "system") { if (role == "system") {
ss << message->content << "\n\n"; // Orca-Vicuna variant uses a system prefix
} else if (role == "user") { if (tmpl.find("SYSTEM: ") != std::string::npos) {
ss << "USER: " << message->content << "\n"; ss << "SYSTEM: " << message->content << "\n";
} else if (role == "assistant") { } else {
ss << "ASSISTANT: " << message->content << "</s>\n"; ss << message->content << "\n\n";
} }
}
if (add_ass) {
ss << "ASSISTANT:";
}
} else if (tmpl == "orca-vicuna" || tmpl.find("SYSTEM: ") != std::string::npos) {
// Orca-Vicuna
for (auto message : chat) {
std::string role(message->role);
if (role == "system") {
ss << "SYSTEM: " << message->content << "\n";
} else if (role == "user") { } else if (role == "user") {
ss << "USER: " << message->content << "\n"; ss << "USER: " << message->content << "\n";
} else if (role == "assistant") { } else if (role == "assistant") {