happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor style fixes 

no functional changes
This commit is contained in:
ddh0 2025-12-30 15:47:14 -06:00
parent c6a6f6354b
commit 080749909e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llama.h
View File

@ -1334,6 +1334,7 @@ extern "C" {
/// @param seed RNG seed /// @param seed RNG seed
/// ///
/// ref: https://github.com/ggml-org/llama.cpp/pull/17927 /// ref: https://github.com/ggml-org/llama.cpp/pull/17927
///
LLAMA_API struct llama_sampler * llama_sampler_init_adaptive_p( LLAMA_API struct llama_sampler * llama_sampler_init_adaptive_p(
float target, float target,
float decay, float decay,

8
src/llama-sampling.cpp
View File

@ -2346,7 +2346,9 @@ struct llama_sampler * llama_sampler_init_dry_testing(int32_t context_size, floa
// of selected tokens, used to compute an adapted target at each sampling step. // of selected tokens, used to compute an adapted target at each sampling step.
// //
// see llama.h for a full description of the sampler // see llama.h for a full description of the sampler
//
// ref: https://github.com/ggml-org/llama.cpp/pull/17927 // ref: https://github.com/ggml-org/llama.cpp/pull/17927
//
struct llama_sampler_adaptive_p { struct llama_sampler_adaptive_p {
const float target; // target probability (0.0 - 1.0; negative = disabled) const float target; // target probability (0.0 - 1.0; negative = disabled)
const float decay; // EMA decay; history ~= 1/(1-decay) tokens (0.0 - 0.99) const float decay; // EMA decay; history ~= 1/(1-decay) tokens (0.0 - 0.99)
@ -2414,12 +2416,12 @@ static void llama_sampler_adaptive_p_apply(struct llama_sampler * smpl, llama_to
} }
static void llama_sampler_adaptive_p_reset(struct llama_sampler * smpl) { static void llama_sampler_adaptive_p_reset(struct llama_sampler * smpl) {
auto * ctx = (llama_sampler_adaptive_p *) smpl->ctx; auto * ctx = (llama_sampler_adaptive_p *) smpl->ctx;
// ctx->target and ctx->decay never change after init, so it's safe to keep them as is. // ctx->target and ctx->decay never change after init, so it's safe to keep them as is.
// original_probs is completely overwritten on every call to _apply. // original_probs is completely overwritten on every call to _apply.
// so we only need to reset the EMA state. // so we only need to reset the EMA state.
ctx->weighted_sum = ctx->target / (1.0f - ctx->decay); ctx->weighted_sum = ctx->target / (1.0f - ctx->decay);
ctx->total_weight = 1.0f / (1.0f - ctx->decay); ctx->total_weight = 1.0f / (1.0f - ctx->decay);
} }
static struct llama_sampler * llama_sampler_adaptive_p_clone(const struct llama_sampler * smpl) { static struct llama_sampler * llama_sampler_adaptive_p_clone(const struct llama_sampler * smpl) {