mirror of
https://github.com/ikawrakow/ik_llama.cpp.git
synced 2026-05-24 14:46:16 +00:00
* Autoparser - complete refactoring of parser architecture Autoparser: add optional argument reshuffle capability Autoparser: True streaming (#20177) * Relax atomicity constraint for nicer, more pleasent, True Streaming parsing * Whitespace * Remove redundant atomics Revert to OAI-compatible args (#20213) * Revert to OAI-compatible args * Apply workaround::func_args_not_string Fix structured outputs (#20223) * Fix structured outputs * Update common/chat-auto-parser-generator.cpp Co-authored-by: Aldehir Rojas <hello@alde.dev> --------- Co-authored-by: Aldehir Rojas <hello@alde.dev> Fix compile bug (#20203) * Fix compile bug * Update common/chat-auto-parser-helpers.cpp Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> # Conflicts: # common/chat-auto-parser-helpers.cpp common : gracefully handle incomplete output (#20191) * common : handle incomplete UTF-8 at end of input in PEG parser * cont : if reached end prematurely, emit needs_more_input to propagate partial output * cont: refactor peg parse context to add lenient flag * cont : remove partial flag, keep lenient flag PEG parser for LFM2 (#20251) * PEG parser for LFM2 * Simplify using python_value() common: map developer role to system (#20215) * Map developer role to system * Simplify common: consolidate PEG string parsers (#20263) * common : consolidate PEG string parsers * cont : fix json_string_content() examples : fix empty items in json_schema_to_grammar.py [no ci] (#19968) * Fix logic for retrieving schema items in `json_schema_to_grammar.py` If `schema['items']` is `{}` and `prefixItems not in schema', as `{}` is Falsy, the original code here will raise an error. I think if `schema['items']` is `{}`, them items should just be `{}` * Apply suggestion from @CISC Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> * Add tests for arrays with empty items Add two unit tests to `tests/test-json-schema-to-grammar.cpp` that validate handling of arrays when 'items' is an empty schema and when 'prefixItems' is present alongside an empty 'items'. Both tests expect the same generated grammar, ensuring the JSON Schema->grammar conversion treats an empty 'items' schema (and the presence of 'prefixItems') correctly and covering this edge case. --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> Reduce level of content parser warning message to avoid log spam on non-debug verbosity (#20347) do not return if template parse failed add arg to enable parallel tool call common : fix incorrect uses of stoul (#20313) # Conflicts: # common/arg.cpp # src/llama-grammar.cpp examples : fix empty items in json_schema_to_grammar.py [no ci] (#19968) * Fix logic for retrieving schema items in `json_schema_to_grammar.py` If `schema['items']` is `{}` and `prefixItems not in schema', as `{}` is Falsy, the original code here will raise an error. I think if `schema['items']` is `{}`, them items should just be `{}` * Apply suggestion from @CISC Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> * Add tests for arrays with empty items Add two unit tests to `tests/test-json-schema-to-grammar.cpp` that validate handling of arrays when 'items' is an empty schema and when 'prefixItems' is present alongside an empty 'items'. Both tests expect the same generated grammar, ensuring the JSON Schema->grammar conversion treats an empty 'items' schema (and the presence of 'prefixItems') correctly and covering this edge case. --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> Add support for MiroThinker with new jinja template common/parser: handle reasoning budget (#20297) * v1 * Finished! * Handlie cli * Reasoning sampler * Apply suggestions from code review Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> * Less explosive terminology :) * Add utf-8 case and tests * common : migrate reasoning budget sampler to common * cont : clean up * cont : expose state and allow passing as initial state * cont : remove unused imports * cont : update state machine doc string --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> Co-authored-by: Alde Rojas <hello@alde.dev> common/parser: use nlohmann::ordered_json to preserve parameter order (#20385) common/parser: add GigaChatV3/3.1 models support (#19931) Co-authored-by: Mishusha <pmv26021975@gmail.com> common/parser: gracefully handle undetected tool parser, print error message. (#20286) fix: prevent nullptr dereference (#20552) common : fix iterator::end() dereference (#20445) # Conflicts: # common/regex-partial.cpp jinja : add capability check for object args (#20612) common/parser: add `--skip-chat-parsing` to force a pure content parser. (#20289) * Add `--force-pure-content` to force a pure content parser. * Update common/arg.cpp Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> common : rework gpt-oss parser (#20393) * common : rework gpt-oss parser * cont : fix gpt-oss tests * cont : add structured output test * cont : rename final to final_msg common : fix gpt-oss content removal (#20745) common/parser: add proper reasoning tag prefill reading (#20424) * Implement proper prefill extraction * Refactor cli parameters, update docs, move reasoning budget sampler part to common/reasoning-budget.cpp * Update tools/server/server-task.cpp * refactor: move grammars to variant, remove grammar_external, handle exception internally * Make code less C++y Co-authored-by: Georgi Gerganov <ggerganov@gmail.com> chat : handle tool calls with no required args in TAG_WITH_TAGGED format (#20764) * chat : handle tool calls with no required args in TAG_WITH_TAGGED format * Update tests/test-chat.cpp [no ci] Co-authored-by: Aldehir Rojas <hello@alde.dev> --------- Co-authored-by: Piotr Wilkin (ilintar) <piotr.wilkin@syndatis.com> Co-authored-by: Aldehir Rojas <hello@alde.dev> common/parser : fix out_of_range crash in throw path (#20424 regression) (#20777) * chat : fix out_of_range crash in throw path (#20424 regression) #20424 introduced effective_input = generation_prompt + input, but the throw path uses input.substr(result.end) where result.end is a position within effective_input. Every thinking model with a non-empty generation_prompt crashes with std::out_of_range instead of the intended error message. Test crashes on unpatched master, passes with fix: cmake -B build -DLLAMA_BUILD_TESTS=ON -DLLAMA_BUILD_TOOLS=OFF cmake --build build --target test-chat ./build/bin/test-chat * Update test-chat.cpp * Update test-chat.cpp * Update test-chat.cpp --------- Co-authored-by: Piotr Wilkin (ilintar) <piotr.wilkin@syndatis.com> jinja : fix heap OOB read in value equality comparison (#20782) Address GHSA-q9j6-4hhc-rq9p and GHSA-2q4c-9gq5-5vfp. The three-iterator overload of std::equal in value_array_t::equivalent() and value_object_t::equivalent() reads past the end of the shorter container when comparing arrays or objects of different lengths. Use the four-iterator overload (C++14) which checks both range lengths. Found-by: Pwno common : fix typo in debug log ('extracft' -> 'extract') (#20807) common/parser: fix nasty bug causing subtle corruption of generation prompt (#20825) jinja : refactor token advancement (#20864) * refactor token advancement * exercise sub-expressions common/autoparser : detect reasoning markers when enable_thinking changes system prompt (#20859) common : replace wrap_for_generation with a prefix convenience function and fix gpt-oss (#20912) jinja: fix macro with kwargs (#20960) * jinja: fix macro with kwargs * Apply suggestions from code review Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> * fix newline problem --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> common : inhibit lazy grammar sampler while reasoning is active (#20970) * common : inhibit grammar while reasoning budget is active * cont : update force_pos in accept * cont : fix tests * cont : tweak should apply logic * cont : return early not using grammar sampler * Add tests * cont : prevent backend sampling when reasoning budget enabled * cont : fix typo --------- Co-authored-by: Piotr Wilkin <piotr.wilkin@syndatis.com> # Conflicts: # common/reasoning-budget.h # common/sampling.cpp # tools/cli/cli.cpp # tools/server/server-common.cpp # tools/server/server-task.cpp common/parser: fix reasoning whitespace bugs + extra parser tests (#21085) * fix whitespace reasoning issues + add reconstruction tests * Proper fix * fix Nemotron autoparser test expectations to include newline in marker common : add reasoning_format = none support to gpt-oss (#21094) common/json-schema: fix: handle non-capturing groups (?:...) in JSON schema pattern converter (#21124) The regex-to-grammar converter in _visit_pattern() crashes with SIGSEGV when a JSON schema "pattern" field contains a non-capturing group (?:...). Root cause: when the parser sees '(' followed by '?', it pushes a warning but does not advance past '?:'. The recursive transform() call then interprets '?' as a quantifier and calls seq.back() on an empty vector, causing undefined behavior. This commonly occurs when serving OpenAI-compatible tool calls from clients that include complex regex patterns in their JSON schemas (e.g., date validation patterns like ^(?:(?:\d\d[2468][048]|...)-02-29|...)$). The fix: - Skip '?:' after '(' to treat non-capturing groups as regular groups - For unsupported syntax (?=, ?!, etc.), skip to matching ')' safely, handling escaped characters to avoid miscounting parenthesis depth - Adjust the ')' unbalanced-parentheses check using direct char comparisons instead of substr - Add test cases for non-capturing groups (C++ only, as the JS/Python implementations do not yet support this syntax) common/parser: fix handling of tool definition with missing properties key (#21128) jinja : handle empty expressions correctly (#20913) * Reject empty computed member expressions before returning slices[0] from parse_member_expression_arguments(). * Treat empty computed member expressions with Jinja2 undefined semantics Treat empty computed member expressions like `a[]` as undefined instead of raising a parser error, to match Jinja2 behavior. - return a noop expression for empty computed member arguments - return undefined when a computed member key evaluates to undefined - add Jinja tests covering `a[]|default('fallback')` and `a[] is undefined` * Handle undefined computed member properties Move undefined-property handling to the common member access path, and add a test covering `a[undefined] is undefined`. * Use default undefined value in member access Initialize val and then return it when property is undefined. Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> * empty statement parses to blank_expression instead of noop_statement --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> common : gpt-oss handle builtin and unsolicited tool calls (#21213) fix: tool call parsing for LFM2 and LFM2.5 models (#21242) * fix: tool call parsing for LFM2 and LFM2.5 models' * refactor: add test / break out lfm2 and lfm2.5 parsing logic # Conflicts: # common/chat.cpp Relax prefill parser to allow space. (#21240) * Relax prefill parser to allow space. * Move changes from prefix() to parser generation * Only allow spaces if we're not having a pure content parser next common : add commentary rules for gpt-oss-20b (#21286) add reasoning budget model, mtmd: fix gguf conversion for audio/vision mmproj (#21309) * fix gguf conversion for audio/vision mmproj * fix test # Conflicts: # convert_hf_to_gguf.py # examples/eval-callback/eval-callback.cpp # examples/mtmd/CMakeLists.txt # examples/mtmd/clip-impl.h # examples/mtmd/mtmd.cpp # gguf-py/gguf/constants.py # gguf-py/gguf/gguf_writer.py # gguf-py/gguf/tensor_mapping.py # src/CMakeLists.txt # src/llama-arch.cpp # src/llama-arch.h # src/llama-model.cpp # src/llama-model.h # src/llama-vocab.cpp # src/models/models.h # tests/test-llama-archs.cpp # tools/mtmd/clip-graph.h # tools/mtmd/clip-model.h # tools/mtmd/clip.cpp # tools/mtmd/models/models.h fix: gemma 4 template (#21326) chat : avoid including json in chat.h (#21306) jinja: coerce input for string-specific filters (#21370) common : fix tool call type detection for nullable and enum schemas (#21327) * common : fix tool call type detection for nullable and enum schemas * common, tests : fix grammar delegation for nullable/enum schemas and add tests Fix enum type inference to scan all enum values (not just index 0) so schemas like {"enum": [0, "celsius"]} correctly detect string type. Fix schema_delegates in peg-parser to handle nullable type arrays (["string", "null"]) and typeless enum schemas in raw mode, allowing the tagged parser to use raw text instead of JSON-formatted strings. Add test cases for Qwen3-Coder (TAG_WITH_TAGGED format): - nullable string ["string", "null"] - nullable string with null first ["null", "string"] - nullable integer ["integer", "null"] - enum without explicit type key common/parser: fix call ID detection (Mistral parser mostly) + atomicity for tag-json parsers (#21230) * Fix call ID detection (Mistral parser mostly) + atomicity for tag-json parsers * Rename * Update common/chat-auto-parser-generator.cpp Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> common : add gemma 4 specialized parser (#21418) * common : add gemma4 dedicated parser * cont : add '<|tool_response>' as eog * cont : emit JSON from Gemma4 tool call AST * cont : more fixes * cont : refactor convert function * cont : refine rules and mapping * cont : add more tests * cont : clean up * cont : remove autoparser gemma4 implementation * cont : more cleanup * cont : rename gemma4.jinja to match the others * cont : add custom template to support interleaved thinking * cont : preserve reasoning in model turns * cont : fix initializer error * cont : fix unused vars * cont : fix accidental static * cont : fix specialized_template signature * fix extra semicolon * remove debug line and extra space [no ci] fix reasoning budget parser: fix MiniMax handling (#21573) jinja : support ensure_ascii=true, string repetition and int/float self-filtering (#21623) * feat: jinja engine improvements for reka-edge Port three Jinja engine improvements needed for the reka-edge model: 1. Python-style string repetition ("ab" * 3 → "ababab") 2. ensure_ascii=true support for tojson filter (escapes non-ASCII to \uXXXX) 3. int() builtin on value_int_t (identity, needed for Reka Edge template) * fix: escape invalid utf8 bytes when ensure_ascii=true The json_ensure_ascii_preserving_format function does not correctly handle an edge case where if UTF-8 parsing fails, it adds the non-ascii character back to the output as a raw byte. This commit fixes that by adding the unicode standard replacement character \\ufffd to the output instead. This is the standard behavior for various programming languages like Python, Rust, Go, etc. * chore: address PR comments 1. Add todo comment for supporting string repetition for array/tuples 2. Add support for float identity operation 3. Move invalid ascii test case to test_fuzzing * chore: accept suggestion for common/jinja/value.cpp Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> --------- Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com> common : simplify autoparser tagged parser rules (#21216) * common : simplify autoparser tagged parser rules * cont : remove upper limit on optional args * cont : revert changes to parsing at the end * cont : undo arbitrary ordering of optional args * cont : fix uninitialized required parameters * revert to simplify merge * re-apply patches * restore flexible optional arg ordering tests common : fix ambiguous grammar rule in gemma4 (#21661) * common : fix ambiguous grammar rule in gemma4 * cont : fix missing comma... common : enable reasoning budget sampler for gemma4 (#21697) * fix: enable reasoning budget sampler for gemma4 Add thinking_start_tag and thinking_end_tag to common_chat_params_init_gemma4(). Without these, the reasoning budget sampler never activates for gemma4. Make the newline after "thought" optional in the PEG parser to handle budget=0 (sampler forces end tag before the newline). Add test case for empty thinking block. Fixes #21487 * use p.space() instead of p.optional(p.literal("\n")) in gemma4 thought parser common : better align to the updated official gemma4 template (#21704) fix: Fix broken structured output when using $refs in json_schema (#21699) chat: dedicated DeepSeek v3.2 parser + "official" template (#21785) Hide render_message_to_json warning common/gemma4 : handle parsing edge cases (#21760) common: skip reasoning budget sampler when no budget is requested (#21870) * common: skip reasoning budget sampler when no budget is requested After I added thinking_start_tag / thinking_end_tag for gemma4 in #21697, the reasoning budget sampler gets unconditionally created even when no budget is configured (the default -1). The same applies to kimi_k2, lfm2, lfm2_5, and ministral_3 which also set these tags. The budget gets converted to INT_MAX, so the sampler never actually forces any tokens but still runs per-token checks (start tag matching in IDLE state, token-to-piece conversion + UTF-8 checks in COUNTING state). More importantly, the mere existence of the sampler (non-null rbudget) disables backend sampling. Backend sampling lets the GPU select tokens directly, avoiding a full logits transfer from GPU to CPU every token. This could explain the 30% speed regression reported in #21784 (98 t/s to 70 t/s on Vulkan). So I added a reasoning_budget_tokens >= 0 check to the sampler creation condition. When the budget is unlimited, the sampler is not created, backend sampling stays enabled, and no per-token overhead is added. When a budget is explicitly set (0, 128, 1024, etc.), the sampler is created and works as before. * common: preserve rbudget when grammar is lazy Following up on the review feedback on #21870: keep the reasoning budget sampler when grammar_lazy is true, so the thinking-block grammar suppression from #20970 still works when tools are in use. This way, we only skip the sampler when both no budget is set AND grammar is not lazy. autoparser: support case of JSON_NATIVE with per-call markers (test case: Reka-Edge) (#21892) * fix grammar * fix add sampled token --------- Co-authored-by: Piotr Wilkin (ilintar) <piotr.wilkin@syndatis.com> Co-authored-by: firecoperana <firecoperana>
803 lines
31 KiB
C++
803 lines
31 KiB
C++
#define LLAMA_API_INTERNAL
|
|
#include "sampling.h"
|
|
#include "llama-vocab.h"
|
|
#include "common.h"
|
|
#include "reasoning-budget.cpp"
|
|
|
|
#include <random>
|
|
#include <nlohmann/json.hpp>
|
|
using json = nlohmann::ordered_json;
|
|
|
|
struct common_sampler * common_sampler_init(const struct llama_model * model, const struct common_params_sampling & params) {
|
|
const llama_vocab * vocab = llama_model_get_vocab(model);
|
|
|
|
struct common_sampler * result = new common_sampler();
|
|
|
|
result->params = params;
|
|
result->grammar = nullptr;
|
|
result->rbudget = nullptr;
|
|
|
|
struct llama_grammar* grmr;
|
|
const std::string & grammar_str = common_grammar_value(params.grammar);
|
|
if (grammar_str.compare(0, 11, "%llguidance") == 0) {
|
|
#ifdef LLAMA_USE_LLGUIDANCE
|
|
grmr = llama_sampler_init_llg(vocab, "lark", params.grammar.c_str());
|
|
result->grammar = grmr;
|
|
#else
|
|
GGML_ABORT("llguidance (cmake -DLLAMA_LLGUIDANCE=ON) is not enabled");
|
|
#endif // LLAMA_USE_LLGUIDANCE
|
|
}
|
|
else {
|
|
std::vector<std::string> trigger_patterns;
|
|
std::vector<llama_token> trigger_tokens;
|
|
for (const auto & trigger : params.grammar_triggers) {
|
|
switch (trigger.type) {
|
|
case COMMON_GRAMMAR_TRIGGER_TYPE_WORD:
|
|
{
|
|
const auto & word = trigger.value;
|
|
trigger_patterns.push_back(regex_escape(word));
|
|
break;
|
|
}
|
|
case COMMON_GRAMMAR_TRIGGER_TYPE_PATTERN:
|
|
{
|
|
trigger_patterns.push_back(trigger.value);
|
|
break;
|
|
}
|
|
case COMMON_GRAMMAR_TRIGGER_TYPE_PATTERN_FULL:
|
|
{
|
|
const auto & pattern = trigger.value;
|
|
std::string anchored = "^$";
|
|
if (!pattern.empty()) {
|
|
anchored = (pattern.front() != '^' ? "^" : "")
|
|
+ pattern
|
|
+ (pattern.back() != '$' ? "$" : "");
|
|
}
|
|
trigger_patterns.push_back(anchored);
|
|
break;
|
|
}
|
|
case COMMON_GRAMMAR_TRIGGER_TYPE_TOKEN:
|
|
{
|
|
const auto token = trigger.token;
|
|
trigger_tokens.push_back(token);
|
|
break;
|
|
}
|
|
default:
|
|
GGML_ASSERT(false && "unknown trigger type");
|
|
}
|
|
}
|
|
|
|
std::vector<const char *> trigger_patterns_c;
|
|
trigger_patterns_c.reserve(trigger_patterns.size());
|
|
for (const auto & regex : trigger_patterns) {
|
|
trigger_patterns_c.push_back(regex.c_str());
|
|
}
|
|
|
|
if (!grammar_str.empty()) {
|
|
grmr = params.grammar_lazy
|
|
? llama_sampler_init_grammar_lazy_patterns(vocab, grammar_str.c_str(), "root",
|
|
trigger_patterns_c.data(), trigger_patterns_c.size(),
|
|
trigger_tokens.data(), trigger_tokens.size())
|
|
: llama_sampler_init_grammar(vocab, grammar_str.c_str(), "root");
|
|
if (grmr) {
|
|
result->prev.resize(params.n_prev);
|
|
|
|
result->grammar = grmr;
|
|
}
|
|
}
|
|
result->n_valid = 0;
|
|
result->grammar_str = grammar_str;
|
|
result->grammar_root = "root";
|
|
}
|
|
|
|
|
|
|
|
|
|
// Feed generation prompt tokens to the grammar sampler so it advances past
|
|
// tokens the template already placed in the prompt.
|
|
// Only applies to output-format and tool-call grammars; user-supplied grammars must not be prefilled.
|
|
std::vector<llama_token> prefill_tokens;
|
|
if (!params.generation_prompt.empty() && common_grammar_needs_prefill(params.grammar)) {
|
|
GGML_ASSERT(vocab != nullptr);
|
|
prefill_tokens = common_tokenize(vocab, params.generation_prompt, false, true);
|
|
if (!prefill_tokens.empty()) {
|
|
std::string first_token = common_token_to_piece(vocab, prefill_tokens[0], true);
|
|
if (std::isspace(first_token[0]) && !std::isspace(params.generation_prompt[0])) {
|
|
// Some tokenizers will add a space before the first special token, need to remove
|
|
prefill_tokens = std::vector<llama_token>(prefill_tokens.begin() + 1, prefill_tokens.end());
|
|
}
|
|
}
|
|
|
|
if (grmr && !params.grammar_lazy) {
|
|
try {
|
|
for (const auto & token : prefill_tokens) {
|
|
llama_grammar_accept_impl(*grmr, vocab, nullptr, token);
|
|
LOG_DBG("%s: accepted prefill token (%d)\n", __func__, token);
|
|
}
|
|
}
|
|
catch (std::exception & e) {
|
|
LOG_ERR("%s: error initializing grammar sampler for grammar:\n%s\n\nGeneration prompt:\n'%s'\n", __func__,
|
|
common_grammar_value(params.grammar).c_str(), params.generation_prompt.c_str());
|
|
throw e;
|
|
}
|
|
}
|
|
}
|
|
|
|
// reasoning budget sampler (skip when budget is unlimited unless a lazy grammar is active, which needs rbudget for thinking-block suppression)
|
|
if (!params.reasoning_budget_start.empty() && !params.reasoning_budget_end.empty() && (params.grammar_lazy || params.reasoning_budget_tokens >= 0)) {
|
|
result->rbudget = common_reasoning_budget_init(
|
|
vocab,
|
|
params.reasoning_budget_start,
|
|
params.reasoning_budget_end,
|
|
params.reasoning_budget_forced,
|
|
params.reasoning_budget_tokens < 0 ? INT_MAX : params.reasoning_budget_tokens,
|
|
prefill_tokens);
|
|
}
|
|
|
|
llama_sampling_set_rng_seed(result, params.seed);
|
|
for (const auto& cnstr : params.samplers_sequence)
|
|
{
|
|
switch (cnstr)
|
|
{
|
|
case llama_sampler_type::DRY:
|
|
{
|
|
std::vector<const char*> c_breakers;
|
|
c_breakers.reserve(params.dry_sequence_breakers.size());
|
|
for (const auto& str : params.dry_sequence_breakers)
|
|
{
|
|
c_breakers.push_back(str.c_str());
|
|
}
|
|
result->smpl=llama_sampler_init_dry(vocab, params.dry_multiplier, params.dry_base, params.dry_allowed_length, params.dry_penalty_last_n, c_breakers.data(), c_breakers.size());
|
|
|
|
break;
|
|
}
|
|
case llama_sampler_type::ADAPTIVE_P:
|
|
{
|
|
GGML_ASSERT(vocab);
|
|
auto n_vocab = llama_vocab_n_tokens(vocab);
|
|
result->adapt_p_ctx = llama_init_adaptive_p(n_vocab, params.adaptive_target, params.adaptive_decay, params.adaptive_updt_w_cur, result->rng());
|
|
break;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
void common_sampler_free(struct common_sampler * ctx) {
|
|
if (!ctx) {
|
|
return;
|
|
}
|
|
if (ctx->grammar) {
|
|
llama_grammar_free(ctx->grammar);
|
|
}
|
|
if (ctx->smpl)
|
|
llama_sampler_dry_free(ctx->smpl);
|
|
if (ctx->rbudget)
|
|
common_reasoning_budget_free(ctx->rbudget);
|
|
delete ctx;
|
|
}
|
|
|
|
static void llama_grammar_reset(common_sampler * ctx) {
|
|
if (!ctx->grammar) {
|
|
return;
|
|
}
|
|
std::vector<const char*> trigger_patterns_c;
|
|
trigger_patterns_c.reserve(ctx->grammar->trigger_patterns.size());
|
|
for (auto& trigger_pattern : ctx->grammar->trigger_patterns) {
|
|
trigger_patterns_c.push_back(trigger_pattern.pattern.c_str());
|
|
}
|
|
|
|
auto* grammar_new = llama_grammar_init_impl(ctx->grammar->vocab, ctx->grammar_str.c_str(), ctx->grammar_root.c_str(),
|
|
ctx->grammar->lazy, trigger_patterns_c.data(), trigger_patterns_c.size(),
|
|
ctx->grammar->trigger_tokens.data(), ctx->grammar->trigger_tokens.size());
|
|
|
|
llama_grammar_free_impl(ctx->grammar);
|
|
ctx->grammar = grammar_new;
|
|
}
|
|
|
|
void common_sampler_reset(common_sampler * ctx) {
|
|
// llama_grammar_reset(ctx);
|
|
ctx->prev.clear();
|
|
llama_sampler_dry_reset(ctx->smpl);
|
|
}
|
|
|
|
void common_sampler_review(common_sampler * ctx, const size_t n_unsent, const bool rewind_status) {
|
|
// add stateful samplers here
|
|
if (ctx->adapt_p_ctx != nullptr) {
|
|
llama_review_adaptive_p(ctx->adapt_p_ctx, n_unsent, rewind_status);
|
|
}
|
|
}
|
|
|
|
void llama_sampling_set_rng_seed(struct common_sampler * ctx, uint32_t seed) {
|
|
if (seed == LLAMA_DEFAULT_SEED) {
|
|
seed = std::random_device{}();
|
|
}
|
|
ctx->rng.seed(seed);
|
|
}
|
|
|
|
void common_sampler_clone(common_sampler * src, common_sampler * dst) {
|
|
if (dst->grammar) {
|
|
llama_grammar_free(dst->grammar);
|
|
dst->grammar = nullptr;
|
|
}
|
|
|
|
if (src->grammar) {
|
|
dst->grammar_root = src->grammar_root;
|
|
dst->grammar_str = src->grammar_str;
|
|
dst->grammar = llama_grammar_copy(src->grammar);
|
|
}
|
|
|
|
dst->prev = src->prev;
|
|
dst->smpl = llama_sampler_dry_clone(src->smpl);
|
|
if (src->rbudget) {
|
|
dst->rbudget = common_reasoning_budget_clone(src->rbudget);
|
|
}
|
|
}
|
|
|
|
llama_token llama_sampling_last(common_sampler * ctx) {
|
|
return ctx->prev.back();
|
|
}
|
|
|
|
std::string llama_sampling_prev_str(common_sampler * ctx_sampling, llama_context * ctx_main, int n) {
|
|
const int size = ctx_sampling->prev.size();
|
|
|
|
n = std::min(n, size);
|
|
|
|
std::string result;
|
|
|
|
for (int i = size - n; i < size; i++) {
|
|
result += common_token_to_piece(ctx_main, ctx_sampling->prev[i]);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
std::string llama_sampling_print(const common_params_sampling & params) {
|
|
char result[1024];
|
|
|
|
snprintf(result, sizeof(result),
|
|
"\trepeat_last_n = %d, repeat_penalty = %.3f, frequency_penalty = %.3f, presence_penalty = %.3f\n"
|
|
"\ttop_k = %d, tfs_z = %.3f, top_p = %.3f, min_p = %.3f, typical_p = %.3f, temp = %.3f\n"
|
|
"\tmirostat = %d, mirostat_lr = %.3f, mirostat_ent = %.3f\n"
|
|
"\txtc_probability = %.3f, xtc_threshold = %.3f, top_n_sigma = %.3f\n"
|
|
"\tadaptive_target = %.2f, adaptive_decay = %.2f",
|
|
params.penalty_last_n, params.penalty_repeat, params.penalty_freq, params.penalty_present,
|
|
params.top_k, params.tfs_z, params.top_p, params.min_p, params.typical_p, params.temp,
|
|
params.mirostat, params.mirostat_eta, params.mirostat_tau,
|
|
params.xtc_probability, params.xtc_threshold, params.top_n_sigma,
|
|
params.adaptive_target, params.adaptive_decay);
|
|
|
|
return std::string(result);
|
|
}
|
|
|
|
std::string llama_sampling_order_print(const common_params_sampling & params) {
|
|
std::string result = "CFG -> Penalties ";
|
|
if (params.mirostat == 0) {
|
|
for (auto sampler_type : params.samplers_sequence) {
|
|
const auto sampler_type_name = llama_sampling_type_to_str(sampler_type);
|
|
if (!sampler_type_name.empty()) {
|
|
result += "-> " + sampler_type_name + " ";
|
|
}
|
|
}
|
|
} else {
|
|
result += "-> mirostat ";
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
std::string llama_sampling_type_to_str(llama_sampler_type sampler_type) {
|
|
switch (sampler_type) {
|
|
case llama_sampler_type::DRY: return "dry";
|
|
case llama_sampler_type::TOP_K: return "top_k";
|
|
case llama_sampler_type::TFS_Z: return "tfs_z";
|
|
case llama_sampler_type::TYPICAL_P: return "typical_p";
|
|
case llama_sampler_type::TOP_P: return "top_p";
|
|
case llama_sampler_type::MIN_P: return "min_p";
|
|
case llama_sampler_type::TEMPERATURE: return "temperature";
|
|
case llama_sampler_type::XTC : return "xtc";
|
|
case llama_sampler_type::TOP_N_SIGMA: return "top_n_sigma";
|
|
case llama_sampler_type::ADAPTIVE_P : return "adaptive_p";
|
|
default : return "";
|
|
}
|
|
}
|
|
|
|
std::vector<llama_sampler_type> llama_sampling_types_from_names(const std::vector<std::string> & names, bool allow_alt_names) {
|
|
std::unordered_map<std::string, llama_sampler_type> sampler_canonical_name_map {
|
|
{"dry", llama_sampler_type::DRY},
|
|
{"top_k", llama_sampler_type::TOP_K},
|
|
{"top_p", llama_sampler_type::TOP_P},
|
|
{"typical_p", llama_sampler_type::TYPICAL_P},
|
|
{"min_p", llama_sampler_type::MIN_P},
|
|
{"tfs_z", llama_sampler_type::TFS_Z},
|
|
{"xtc", llama_sampler_type::XTC},
|
|
{"top_n_sigma", llama_sampler_type::TOP_N_SIGMA},
|
|
{"temperature", llama_sampler_type::TEMPERATURE},
|
|
{"adaptive_p", llama_sampler_type::ADAPTIVE_P},
|
|
};
|
|
|
|
// since samplers names are written multiple ways
|
|
// make it ready for both system names and input names
|
|
std::unordered_map<std::string, llama_sampler_type> sampler_alt_name_map {
|
|
{"dry", llama_sampler_type::DRY},
|
|
{"top-k", llama_sampler_type::TOP_K},
|
|
{"top-p", llama_sampler_type::TOP_P},
|
|
{"nucleus", llama_sampler_type::TOP_P},
|
|
{"typical-p", llama_sampler_type::TYPICAL_P},
|
|
{"typical", llama_sampler_type::TYPICAL_P},
|
|
{"min-p", llama_sampler_type::MIN_P},
|
|
{"tfs-z", llama_sampler_type::TFS_Z},
|
|
{"tfs", llama_sampler_type::TFS_Z},
|
|
{"xtc", llama_sampler_type::XTC},
|
|
{"top-n-sigma", llama_sampler_type::TOP_N_SIGMA},
|
|
{"temp", llama_sampler_type::TEMPERATURE},
|
|
{"adaptive-p", llama_sampler_type::ADAPTIVE_P},
|
|
};
|
|
|
|
std::vector<llama_sampler_type> sampler_types;
|
|
sampler_types.reserve(names.size());
|
|
for (const auto & name : names)
|
|
{
|
|
auto sampler_item = sampler_canonical_name_map.find(name);
|
|
if (sampler_item != sampler_canonical_name_map.end())
|
|
{
|
|
sampler_types.push_back(sampler_item->second);
|
|
}
|
|
else
|
|
{
|
|
if (allow_alt_names)
|
|
{
|
|
sampler_item = sampler_alt_name_map.find(name);
|
|
if (sampler_item != sampler_alt_name_map.end())
|
|
{
|
|
sampler_types.push_back(sampler_item->second);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return sampler_types;
|
|
}
|
|
|
|
std::vector<llama_sampler_type> llama_sampling_types_from_chars(const std::string & names_string) {
|
|
std::unordered_map<char, llama_sampler_type> sampler_name_map {
|
|
{'d', llama_sampler_type::DRY},
|
|
{'k', llama_sampler_type::TOP_K},
|
|
{'p', llama_sampler_type::TOP_P},
|
|
{'y', llama_sampler_type::TYPICAL_P},
|
|
{'m', llama_sampler_type::MIN_P},
|
|
{'f', llama_sampler_type::TFS_Z},
|
|
{'x', llama_sampler_type::XTC},
|
|
{'n', llama_sampler_type::TOP_N_SIGMA},
|
|
{'t', llama_sampler_type::TEMPERATURE},
|
|
{'w', llama_sampler_type::ADAPTIVE_P},
|
|
};
|
|
|
|
std::vector<llama_sampler_type> sampler_types;
|
|
sampler_types.reserve(names_string.size());
|
|
for (const auto & c : names_string) {
|
|
const auto sampler_item = sampler_name_map.find(c);
|
|
if (sampler_item != sampler_name_map.end()) {
|
|
sampler_types.push_back(sampler_item->second);
|
|
}
|
|
}
|
|
return sampler_types;
|
|
}
|
|
|
|
// no reasons to expose this function in header
|
|
static void sampler_queue(
|
|
struct llama_context* ctx_main,
|
|
const common_params_sampling& params,
|
|
common_sampler * ctx_sampling,
|
|
llama_token_data_array& cur_p,
|
|
size_t min_keep) {
|
|
const float temp = params.temp;
|
|
const float dynatemp_range = params.dynatemp_range;
|
|
const float dynatemp_exponent = params.dynatemp_exponent;
|
|
const int32_t top_k = params.top_k;
|
|
const float top_p = params.top_p;
|
|
const float min_p = params.min_p;
|
|
const float tfs_z = params.tfs_z;
|
|
const float typical_p = params.typical_p;
|
|
const float xtc_probability = params.xtc_probability;
|
|
const float xtc_threshold = params.xtc_threshold;
|
|
const float top_n_sigma = params.top_n_sigma;
|
|
|
|
const std::vector<llama_sampler_type> & samplers_sequence = params.samplers_sequence;
|
|
bool use_adaptive_p = false; // see below
|
|
for (auto sampler_type : samplers_sequence) {
|
|
switch (sampler_type) {
|
|
case llama_sampler_type::DRY : llama_sample_dry (ctx_main, ctx_sampling->smpl, &cur_p); break;
|
|
case llama_sampler_type::TOP_K : llama_sample_top_k (ctx_main, &cur_p, top_k, min_keep); break;
|
|
case llama_sampler_type::TFS_Z : llama_sample_tail_free(ctx_main, &cur_p, tfs_z, min_keep); break;
|
|
case llama_sampler_type::TYPICAL_P : llama_sample_typical (ctx_main, &cur_p, typical_p, min_keep); break;
|
|
case llama_sampler_type::TOP_P : llama_sample_top_p (ctx_main, &cur_p, top_p, min_keep); break;
|
|
case llama_sampler_type::MIN_P : llama_sample_min_p (ctx_main, &cur_p, min_p, min_keep); break;
|
|
case llama_sampler_type::XTC : llama_sample_xtc (ctx_main, &cur_p, xtc_probability, xtc_threshold, min_keep); break;
|
|
case llama_sampler_type::TOP_N_SIGMA: llama_sample_top_n_sigma(ctx_main, &cur_p, top_n_sigma); break;
|
|
case llama_sampler_type::DIST : llama_sample_dist (ctx_main, &cur_p); break;
|
|
case llama_sampler_type::TEMPERATURE:
|
|
if (dynatemp_range > 0) {
|
|
float dynatemp_min = std::max(0.0f, temp - dynatemp_range);
|
|
float dynatemp_max = std::max(0.0f, temp + dynatemp_range);
|
|
llama_sample_entropy(ctx_main, &cur_p, dynatemp_min, dynatemp_max, dynatemp_exponent);
|
|
} else {
|
|
llama_sample_temp(ctx_main, &cur_p, temp);
|
|
}
|
|
break;
|
|
case llama_sampler_type::ADAPTIVE_P: use_adaptive_p = true; break;
|
|
default : break;
|
|
}
|
|
|
|
}
|
|
if (use_adaptive_p) {
|
|
// adaptive p should be put to the last, so we ignore the order in the sampler
|
|
llama_sample_adaptive_p(ctx_main, &cur_p, ctx_sampling->adapt_p_ctx);
|
|
}
|
|
}
|
|
|
|
static bool grammar_should_apply(struct common_sampler * gsmpl) {
|
|
if (!gsmpl->grammar) {
|
|
return false;
|
|
}
|
|
if (!gsmpl->rbudget) {
|
|
return true;
|
|
}
|
|
if (gsmpl->params.grammar_lazy) {
|
|
// if grammar is lazy, only apply when reasoning budget is not active
|
|
const auto state = common_reasoning_budget_get_state(gsmpl->rbudget);
|
|
return state == REASONING_BUDGET_IDLE || state == REASONING_BUDGET_DONE;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static llama_token llama_sampling_sample_impl(
|
|
struct common_sampler * ctx_sampling,
|
|
struct llama_context * ctx_main,
|
|
struct llama_context * ctx_cfg,
|
|
const int idx,
|
|
bool grammar_first) {
|
|
const common_params_sampling & params = ctx_sampling->params;
|
|
|
|
const float temp = params.temp;
|
|
const int mirostat = params.mirostat;
|
|
const float mirostat_tau = params.mirostat_tau;
|
|
const float mirostat_eta = params.mirostat_eta;
|
|
const float adaptive_target = params.adaptive_target;
|
|
|
|
std::vector<float> original_logits;
|
|
llama_sampling_prepare(ctx_sampling, ctx_main, ctx_cfg, idx, /* grammar_first= */ grammar_first, &original_logits);
|
|
llama_token_data_array & cur_p = ctx_sampling->cur_p;
|
|
if (ctx_sampling->grammar != NULL && !grammar_first) {
|
|
GGML_ASSERT(!original_logits.empty());
|
|
}
|
|
auto & rbudget = ctx_sampling->rbudget;
|
|
|
|
llama_token id = 0;
|
|
float * logits = llama_get_logits_ith(ctx_main, idx);
|
|
// apply reasoning budget first
|
|
common_reasoning_budget_apply(rbudget, &cur_p);
|
|
// Sample grammar first for resampling
|
|
if (ctx_sampling->grammar != NULL && grammar_first && grammar_should_apply(ctx_sampling)) {
|
|
// Apply grammar constraints to all candidates
|
|
llama_grammar_apply(ctx_sampling->grammar, ctx_main, &cur_p);
|
|
}
|
|
|
|
// llama_sampler_apply
|
|
if (temp < 0.0) {
|
|
// greedy sampling, with probs
|
|
llama_sample_softmax(ctx_main, &cur_p);
|
|
id = cur_p.data[0].id;
|
|
} else if (temp == 0.0) {
|
|
// greedy sampling, no probs
|
|
id = llama_sample_token_greedy(ctx_main, &cur_p);
|
|
} else {
|
|
if (mirostat == 1) {
|
|
const int mirostat_m = 100;
|
|
llama_sample_temp(ctx_main, &cur_p, temp);
|
|
id = llama_sample_token_mirostat(ctx_main, &cur_p, mirostat_tau, mirostat_eta, mirostat_m, &ctx_sampling->mirostat_mu);
|
|
} else if (mirostat == 2) {
|
|
llama_sample_temp(ctx_main, &cur_p, temp);
|
|
id = llama_sample_token_mirostat_v2(ctx_main, &cur_p, mirostat_tau, mirostat_eta, &ctx_sampling->mirostat_mu);
|
|
} else if (adaptive_target >= 0.0f && ctx_sampling->adapt_p_ctx!=nullptr) {
|
|
// adaptive p sampling
|
|
llama_prep_adaptive_p(ctx_main, &cur_p, ctx_sampling->adapt_p_ctx);
|
|
sampler_queue(ctx_main, params, ctx_sampling, cur_p, std::max(1, params.min_keep));
|
|
id = llama_sample_token_adaptive_p(ctx_main, &cur_p, ctx_sampling->adapt_p_ctx);
|
|
} else {
|
|
// temperature sampling
|
|
size_t min_keep = std::max(1, params.min_keep);
|
|
|
|
sampler_queue(ctx_main, params,ctx_sampling, cur_p, min_keep);
|
|
id = llama_sample_token_with_rng(ctx_main, &cur_p, ctx_sampling->rng);
|
|
|
|
}
|
|
}
|
|
|
|
if (grammar_first || !grammar_should_apply(ctx_sampling)) {
|
|
return id;
|
|
}
|
|
|
|
if (ctx_sampling->grammar != NULL && !grammar_first && grammar_should_apply(ctx_sampling)) {
|
|
// Get a pointer to the logits
|
|
float * logits = llama_get_logits_ith(ctx_main, idx);
|
|
|
|
// Create an array with a single token data element for the sampled id
|
|
llama_token_data single_token_data = {id, logits[id], 0.0f};
|
|
llama_token_data_array single_token_data_array = { &single_token_data, 1, false };
|
|
|
|
// Apply grammar constraints to the single token
|
|
llama_grammar_apply(ctx_sampling->grammar, ctx_main, &single_token_data_array);
|
|
|
|
// Check if the token is valid according to the grammar by seeing if its logit has been set to -INFINITY
|
|
bool is_valid = single_token_data_array.data[0].logit != -INFINITY;
|
|
|
|
// If the token is not valid according to the grammar, perform resampling
|
|
if (!is_valid) {
|
|
LOG("Resampling because token %d: '%s' does not meet grammar rules\n", id, common_token_to_piece(ctx_main, id).c_str());
|
|
|
|
// Restore logits from the copy
|
|
std::copy(original_logits.begin(), original_logits.end(), logits);
|
|
|
|
return llama_sampling_sample_impl(ctx_sampling, ctx_main, ctx_cfg, idx, /* is_resampling= */ true);
|
|
}
|
|
}
|
|
ctx_sampling->n_valid = temp == 0.0f ? 0 : cur_p.size;
|
|
|
|
return id;
|
|
}
|
|
|
|
static llama_token_data_array llama_sampling_prepare_impl(
|
|
struct common_sampler * ctx_sampling,
|
|
struct llama_context * ctx_main,
|
|
struct llama_context * ctx_cfg,
|
|
const int idx,
|
|
bool grammar_first,
|
|
std::vector<float> * original_logits) {
|
|
const common_params_sampling & params = ctx_sampling->params;
|
|
|
|
const int n_vocab = llama_n_vocab(llama_get_model(ctx_main));
|
|
|
|
const int32_t penalty_last_n = params.penalty_last_n < 0 ? params.n_prev : params.penalty_last_n;
|
|
const float penalty_repeat = params.penalty_repeat;
|
|
const float penalty_freq = params.penalty_freq;
|
|
const float penalty_present = params.penalty_present;
|
|
|
|
const bool penalize_nl = params.penalize_nl;
|
|
|
|
auto & prev = ctx_sampling->prev;
|
|
auto & cur = ctx_sampling->cur;
|
|
|
|
// Get a pointer to the logits
|
|
float * logits = llama_get_logits_ith(ctx_main, idx);
|
|
|
|
if (ctx_sampling->grammar != NULL && !grammar_first) {
|
|
GGML_ASSERT(original_logits != NULL);
|
|
// Only make a copy of the original logits if we are not applying grammar checks, not sure if I actually have to do this.
|
|
*original_logits = {logits, logits + n_vocab};
|
|
}
|
|
|
|
// apply params.logit_bias map
|
|
for (auto it = params.logit_bias.begin(); it != params.logit_bias.end(); it++) {
|
|
logits[it->first] += it->second;
|
|
}
|
|
|
|
if (ctx_cfg) {
|
|
float * logits_guidance = llama_get_logits_ith(ctx_cfg, idx);
|
|
llama_sample_apply_guidance(ctx_main, logits, logits_guidance, params.cfg_scale);
|
|
}
|
|
|
|
cur.resize(n_vocab);
|
|
|
|
if ((ctx_sampling->server_biases != nullptr) && (ctx_sampling->server_biases->size() == n_vocab)) {
|
|
for (llama_token token_id = 0; token_id < n_vocab; token_id++) {
|
|
cur[token_id] = llama_token_data{token_id, logits[token_id] + ctx_sampling->server_biases->at(token_id), 0.0f};
|
|
}
|
|
} else {
|
|
for (llama_token token_id = 0; token_id < n_vocab; token_id++) {
|
|
cur[token_id] = llama_token_data{token_id, logits[token_id], 0.0f};
|
|
}
|
|
}
|
|
|
|
ctx_sampling->cur_p = { cur.data(), cur.size(), false };
|
|
|
|
llama_token_data_array & cur_p = ctx_sampling->cur_p;
|
|
|
|
// apply penalties
|
|
const auto& penalty_tokens = params.use_penalty_prompt_tokens ? params.penalty_prompt_tokens : prev;
|
|
const int penalty_tokens_used_size = std::min((int)penalty_tokens.size(), penalty_last_n);
|
|
if (penalty_tokens_used_size) {
|
|
const float nl_logit = logits[llama_token_nl(llama_get_model(ctx_main))];
|
|
|
|
llama_sample_repetition_penalties(ctx_main, &cur_p,
|
|
penalty_tokens.data() + penalty_tokens.size() - penalty_tokens_used_size,
|
|
penalty_tokens_used_size, penalty_repeat, penalty_freq, penalty_present);
|
|
|
|
if (!penalize_nl) {
|
|
for (size_t idx = 0; idx < cur_p.size; idx++) {
|
|
if (cur_p.data[idx].id == llama_token_nl(llama_get_model(ctx_main))) {
|
|
cur_p.data[idx].logit = nl_logit;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// apply grammar checks before sampling logic
|
|
if (grammar_first && ctx_sampling->grammar != NULL) {
|
|
llama_grammar_apply(ctx_sampling->grammar, ctx_main, &cur_p);
|
|
}
|
|
|
|
return cur_p;
|
|
}
|
|
|
|
llama_token common_sampler_sample_legacy(
|
|
struct common_sampler * ctx_sampling,
|
|
struct llama_context * ctx_main,
|
|
struct llama_context * ctx_cfg,
|
|
const int idx) {
|
|
// Call the implementation function with is_resampling set to false by default
|
|
return llama_sampling_sample_impl(ctx_sampling, ctx_main, ctx_cfg, idx, /* is_resampling= */ false);
|
|
}
|
|
|
|
llama_token common_sampler_sample(
|
|
struct common_sampler * ctx_sampling,
|
|
struct llama_context * ctx_main,
|
|
const int idx,
|
|
bool grammar_first) {
|
|
// Call the implementation function with is_resampling set to false by default
|
|
return llama_sampling_sample_impl(ctx_sampling, ctx_main, nullptr, idx, /* is_resampling= */ grammar_first);
|
|
}
|
|
|
|
llama_token_data_array llama_sampling_prepare(
|
|
struct common_sampler * ctx_sampling,
|
|
struct llama_context * ctx_main,
|
|
struct llama_context * ctx_cfg,
|
|
const int idx,
|
|
bool grammar_first,
|
|
std::vector<float> * original_logits) {
|
|
return llama_sampling_prepare_impl(ctx_sampling,ctx_main, ctx_cfg, idx, grammar_first, original_logits);
|
|
}
|
|
|
|
void common_sampler_accept(
|
|
struct common_sampler * ctx_sampling,
|
|
struct llama_context * ctx_main,
|
|
llama_token token,
|
|
bool accept_grammar) {
|
|
if (ctx_sampling->prev.size() > 0) {
|
|
ctx_sampling->prev.erase(ctx_sampling->prev.begin());
|
|
}
|
|
ctx_sampling->prev.push_back(token);
|
|
|
|
// grammar_should_apply() checks the reasoning budget state, so calculate this before we accept
|
|
accept_grammar = accept_grammar && grammar_should_apply(ctx_sampling);
|
|
if (ctx_sampling->rbudget) {
|
|
common_reasoning_budget_accept(ctx_sampling->rbudget, token);
|
|
}
|
|
|
|
if (ctx_sampling->grammar != NULL && accept_grammar) {
|
|
llama_grammar_accept_token(ctx_sampling->grammar, ctx_main, token);
|
|
}
|
|
if (ctx_sampling->smpl) {
|
|
llama_sampler_dry_accept(ctx_sampling->smpl, token);
|
|
}
|
|
}
|
|
|
|
llama_token_data_array * common_sampler_get_candidates(struct common_sampler * gsmpl, bool do_sort) {
|
|
auto * res = &gsmpl->cur_p;
|
|
|
|
if (do_sort && !res->sorted) {
|
|
// remember the selected token before sorting
|
|
const llama_token id = res->data[res->selected].id;
|
|
|
|
std::sort(res->data, res->data + res->size, [](const llama_token_data & a, const llama_token_data & b) {
|
|
return a.p > b.p;
|
|
});
|
|
|
|
// restore the selected token after sorting
|
|
for (size_t i = 0; i < res->size; ++i) {
|
|
if (res->data[i].id == id) {
|
|
res->selected = i;
|
|
break;
|
|
}
|
|
}
|
|
|
|
res->sorted = true;
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
std::vector<llama_token> llama_sampling_sample_and_accept_n(struct common_sampler * gsmpl, struct llama_context * ctx, const std::vector<llama_token> & draft) {
|
|
std::vector<int> idxs(draft.size() + 1);
|
|
for (size_t i = 0; i < idxs.size(); ++i) {
|
|
idxs[i] = i;
|
|
}
|
|
|
|
return common_sampler_sample_and_accept_n(gsmpl, ctx, idxs, draft);
|
|
}
|
|
|
|
std::vector<llama_token> common_sampler_sample_and_accept_n(struct common_sampler * gsmpl, struct llama_context * ctx, const std::vector<int> & idxs, const std::vector<llama_token> & draft, bool grammar_first) {
|
|
GGML_ASSERT(idxs.size() == draft.size() + 1 && "idxs.size() must be draft.size() + 1");
|
|
|
|
std::vector<llama_token> result;
|
|
result.reserve(idxs.size());
|
|
|
|
size_t i = 0;
|
|
for (; i < draft.size(); i++) {
|
|
const llama_token id = common_sampler_sample(gsmpl, ctx, idxs[i], grammar_first);
|
|
|
|
common_sampler_accept(gsmpl, ctx, id, true);
|
|
|
|
result.push_back(id);
|
|
|
|
if (draft[i] != id) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (i == draft.size()) {
|
|
const llama_token id = common_sampler_sample(gsmpl, ctx, idxs[i], grammar_first);
|
|
|
|
common_sampler_accept(gsmpl, ctx, id, true);
|
|
|
|
result.push_back(id);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
template <>
|
|
json common_grammar_trigger::to_json() const {
|
|
json out{
|
|
{"type", (int)type},
|
|
{"value", value},
|
|
};
|
|
if (type == COMMON_GRAMMAR_TRIGGER_TYPE_TOKEN) {
|
|
out["token"] = (int)token;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
template <>
|
|
common_grammar_trigger common_grammar_trigger::from_json(const json& in) {
|
|
common_grammar_trigger out;
|
|
out.type = (common_grammar_trigger_type)in.at("type").get<int>();
|
|
out.value = in.at("value").get<std::string>();
|
|
if (out.type == COMMON_GRAMMAR_TRIGGER_TYPE_TOKEN) {
|
|
out.token = (llama_token)in.at("token").get<int>();
|
|
}
|
|
return out;
|
|
}
|
|
|
|
llama_token common_sampler_sample_speculative(struct common_sampler * gsmpl, struct llama_context * ctx, int idx, float * out_prob) {
|
|
GGML_UNUSED(gsmpl);
|
|
|
|
float * logits = llama_get_logits_ith(ctx, idx);
|
|
const int n_vocab = llama_n_vocab(llama_get_model(ctx));
|
|
|
|
int best_id = 0;
|
|
float max_val = logits[0];
|
|
for (int i = 1; i < n_vocab; ++i) {
|
|
if (logits[i] > max_val) {
|
|
max_val = logits[i];
|
|
best_id = i;
|
|
}
|
|
}
|
|
|
|
if (out_prob) {
|
|
double sum_exp = 0.0;
|
|
for (int i = 0; i < n_vocab; ++i) {
|
|
sum_exp += exp((double)(logits[i] - max_val));
|
|
}
|
|
*out_prob = (float)(1.0 / sum_exp);
|
|
}
|
|
|
|
return best_id;
|
|
}
|