ikawrakow/ik_llama.cpp
1
0
Fork 0
mirror of https://github.com/ikawrakow/ik_llama.cpp.git synced 2026-04-28 10:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

llama : add token matching support to llama-grammar (#1220)

Browse Source 
* llama : add token matching support to llama-grammar

llama : add token matching support to llama-grammar (#17816)

common/grammar : replace problematic backtracking regex `[\s\S]*` (#18342)

* disable tests and fix warnings

---------

Co-authored-by: firecoperana <firecoperana>
This commit is contained in:
firecoperana
2026-02-02 23:57:17 -06:00
committed by GitHub
parent 8ba7e2b40c
commit 7e8d444033
21 changed files with 644 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/sampling.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "llama.h"
#include "grammar-parser.h"
#include "llama-grammar.h"
#include <set>
#include <random>
#include <string>
@@ -113,10 +113,10 @@ struct llama_sampling_context {
// mirostat sampler state
float mirostat_mu;
llama_grammar * grammar;
std::string grammar_str;
std::string grammar_root;
// internal
grammar_parser::parse_state parsed_grammar;
llama_grammar * grammar;
// TODO: replace with ring-buffer
std::vector<llama_token> prev;
@@ -148,7 +148,7 @@ void common_sampler_reset(const struct llama_vocab* vocab, llama_sampling_contex
void llama_sampling_set_rng_seed(struct llama_sampling_context * ctx, uint32_t seed);
// Copy the sampler context
void llama_sampling_cp(llama_sampling_context * src, llama_sampling_context * dst);
void common_sampler_clone(llama_sampling_context * src, llama_sampling_context * dst);
// Get the last sampled token
llama_token llama_sampling_last(llama_sampling_context * ctx);