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

fix conflict

Browse source
This commit is contained in:
wbpxre150 2023-04-15 09:19:46 +08:00
parent d071650c2c
commit c90261449f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/main/main.cpp
View file

@ -481,8 +481,8 @@ int main(int argc, char ** argv) {
// this was a command, so we need to stop anything more from printing.
is_command = true;
}
// insert input prefix
if (!params.instruct_prefix.empty() && !antiprompt.any) {
// instruct mode: insert instruction prefix
if (params.instruct && !is_antiprompt) {
n_consumed = embd_inp.size();
embd_inp.insert(embd_inp.end(), inp_pfx.begin(), inp_pfx.end());
}