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

cont : pre-fetch rules

Browse source
This commit is contained in:
Georgi Gerganov 2024-07-16 23:12:29 +03:00
parent 5a71d1aefd
commit b4b242e6bd
No known key found for this signature in database
GPG key ID: 449E073F9DC10735
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/gbnf-validator/gbnf-validator.cpp
View file

@ -16,13 +16,15 @@ static bool llama_sample_grammar_string(struct llama_grammar * grammar, const st
auto decoded = decode_utf8(input_str, {});
const auto & code_points = decoded.first;
llama_grammar_stacks & cur_stacks = llama_grammar_get_stacks(grammar);
const llama_grammar_rules & prev_rules = llama_grammar_get_rules (grammar);
llama_grammar_stacks & cur_stacks = llama_grammar_get_stacks(grammar);
size_t pos = 0;
for (auto it = code_points.begin(), end = code_points.end() - 1; it != end; ++it) {
const llama_grammar_rules & prev_rules = llama_grammar_get_rules (grammar);
const llama_grammar_stacks prev_stacks = llama_grammar_get_stacks(grammar); // copy
const llama_grammar_stacks prev_stacks = llama_grammar_get_stacks(grammar); // copy
llama_grammar_accept(prev_rules, prev_stacks, *it, cur_stacks);
if (cur_stacks.empty()) {
error_pos = pos;
error_msg = "Unexpected character '" + unicode_cpt_to_utf8(*it) + "'";

8
tests/test-grammar-integration.cpp
View file

@ -49,12 +49,14 @@ static bool match_string(const std::string & input, llama_grammar * grammar) {
const auto & code_points = decoded.first;
llama_grammar_stacks & cur_stacks = llama_grammar_get_stacks(grammar);
const llama_grammar_rules & prev_rules = llama_grammar_get_rules (grammar);
llama_grammar_stacks & cur_stacks = llama_grammar_get_stacks(grammar);
for (auto it = code_points.begin(), end = code_points.end() - 1; it != end; ++it) {
const llama_grammar_rules & prev_rules = llama_grammar_get_rules (grammar);
const llama_grammar_stacks prev_stacks = llama_grammar_get_stacks(grammar); // copy
const llama_grammar_stacks prev_stacks = llama_grammar_get_stacks(grammar); // copy
llama_grammar_accept(prev_rules, prev_stacks, *it, cur_stacks);
if (cur_stacks.empty()) {
// no stacks means that the grammar failed to match at this point
return false;