mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2025-09-10 17:14:36 +00:00
flag to retain grammar, fix makefile (+2 squashed commit)
Squashed commit: [d5cd3f28] flag to retain grammar, fix makefile [b3352963] updated lite to v73
This commit is contained in:
parent
7ab01ee3c6
commit
bc841ec302
5 changed files with 66 additions and 13 deletions
|
@ -44,6 +44,7 @@ std::vector<std::string> generated_tokens;
|
|||
|
||||
llama_grammar * grammar = nullptr; //currently used grammar
|
||||
grammar_parser::parse_state parsed_grammar;
|
||||
static std::string current_grammar = "";
|
||||
|
||||
//return val: 0=fail, 1=(original ggml, alpaca), 2=(ggmf), 3=(ggjt)
|
||||
static FileFormat file_format = FileFormat::BADFORMAT;
|
||||
|
@ -1282,7 +1283,20 @@ generation_outputs gpttype_generate(const generation_inputs inputs, generation_o
|
|||
generated_tokens.clear(); // New Generation, new tokens
|
||||
|
||||
std::string grammarstr = inputs.grammar;
|
||||
load_grammar(grammarstr);
|
||||
bool grammar_retain_state = inputs.grammar_retain_state;
|
||||
if(grammar_retain_state)
|
||||
{
|
||||
if(grammarstr=="" || current_grammar!=grammarstr) //if grammar is identical, retain state
|
||||
{
|
||||
load_grammar(grammarstr);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
load_grammar(grammarstr);
|
||||
}
|
||||
current_grammar = grammarstr;
|
||||
|
||||
|
||||
if (params.repeat_last_n < 1)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue