root
/
MNN
mirror of https://github.com/alibaba/MNN.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master'

This commit is contained in:
若遗 2025-09-05 14:31:03 +08:00
parent 4faa7ef3a3 c73c2e2d0b
commit 0b79a26ddb
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
transformers/llm/engine/src/prompt.cpp
View File

@ -55,22 +55,24 @@ void Prompt::setParams(std::shared_ptr<LlmConfig> config) {
#ifdef LLM_USE_MINJA #ifdef LLM_USE_MINJA
if (config->config_.document.HasMember("jinja")) { if (config->config_.document.HasMember("jinja")) {
auto& document = config->config_.document["jinja"]; auto& document = config->config_.document["jinja"];
if (nullptr == mCommonTemplate.get()) { if (document.HasMember("chat_template")) {
// Only create jinja once if (nullptr == mCommonTemplate.get()) {
std::string bosToken, eosToken; // Only create jinja once
if (document.HasMember("bos") && document["bos"].IsString()) { std::string bosToken, eosToken;
bosToken = document["bos"].GetString(); if (document.HasMember("bos") && document["bos"].IsString()) {
bosToken = document["bos"].GetString();
}
if (document.HasMember("eos") && document["eos"].IsString()) {
eosToken = document["eos"].GetString();
}
std::string templateChat = document["chat_template"].GetString();
mCommonTemplate.reset(new JinjaTemplate(templateChat, bosToken, eosToken));
} }
if (document.HasMember("eos") && document["eos"].IsString()) { if (document.HasMember("context")) {
eosToken = document["eos"].GetString(); mCommonTemplate->setExtraContext(document["context"]);
} }
std::string templateChat = document["chat_template"].GetString(); return;
mCommonTemplate.reset(new JinjaTemplate(templateChat, bosToken, eosToken));
} }
if (document.HasMember("context")) {
mCommonTemplate->setExtraContext(document["context"]);
}
return;
} }
#endif #endif
mCommonTemplate.reset(); mCommonTemplate.reset();