Skip to content

Samplers: Move n_vocab from llama_sampler_data to penalty_sampler - #26520

Merged
ggerganov merged 1 commit into
masterfrom
osimons/penalty_sampler_folllow_up
Aug 4, 2026
Merged

ggerganov merged 1 commit into
masterfrom
osimons/penalty_sampler_folllow_up

Conversation

@ORippler

@ORippler ORippler commented Aug 3, 2026

Copy link
Copy Markdown
Collaborator

Overview

This matches how it is done for logit_bias and mirostat samplers, see #25262 (comment)

Additional information

Follow-up to #25262

Requirements

@ORippler
ORippler requested review from a team, CISC and ggerganov as code owners August 3, 2026 14:43
@github-actions github-actions Bot added the testing Everything test related label Aug 3, 2026
@ORippler ORippler changed the title Move n_vocab from llama_sampler_data to penalty_sampler Samplers: Move n_vocab from llama_sampler_data to penalty_sampler Aug 3, 2026
@ggerganov

Copy link
Copy Markdown
Member

Good idea for trying the stacked PRs feature. (@forforever73 we should probably migrate the dev-metal branch to stacked PRs)

This matches how it is done for logit_bias and mirostat samplers, see
#25262 (comment)
@ggerganov
ggerganov force-pushed the osimons/penalty_sampler_folllow_up branch from 2fcf088 to 5e8c888 Compare August 3, 2026 16:10
@forforever73

Copy link
Copy Markdown
Contributor

@ggerganov thanks for the suggestion😀This is new to me. I will check it out tomorrow.

@ggerganov
ggerganov requested a review from danbev August 3, 2026 19:06
@ggerganov

Copy link
Copy Markdown
Member

Need one more approval

@ggerganov
ggerganov merged commit 935cad6 into master Aug 4, 2026
23 of 26 checks passed
@ggerganov
ggerganov deleted the osimons/penalty_sampler_folllow_up branch August 4, 2026 06:03
Matlan1 added a commit to Matlan1/localm that referenced this pull request Aug 5, 2026
… why (#1079)

Documentation-only; no behaviour change. The undecidable arity window was
described as ggml == 0.18.0, "upstream b10192..~b10264". The approximation is now
measured away, and the window's INTERNAL structure recorded, which is the part
that was missing.

Measured release by release against real upstream headers:

    b10255..b10257  ggml 0.18.0  4-arg
    b10258          ggml 0.18.0  5-arg   <- the signature flips here, the merge
                                            of ggml-org/llama.cpp#26520
    b10261, b10262  ggml 0.18.0  5-arg   <- last 0.18.0 actually tagged
    b10263, b10264  never tagged
    b10265          ggml 0.18.1  5-arg

So the window is b10192..b10262, and the signature flips INSIDE it at b10258.
b10192..b10257 really are 4-arg; b10258..b10262 really are 5-arg. localm reports
UNKNOWN for both halves, because ggml 0.18.0 does not distinguish them and
nothing else in the binary does either - conservative by about five releases at
the top end, costing them the repetition-penalty sampler rather than risking a
mis-marshalled call. That is the intended trade, but it was not written down, so
a reader could not tell deliberate conservatism from an oversight.

The b10258 boundary was found by another session bisecting raw headers and
confirming b10258 is identical to #26520's merge commit; independently
re-measured here (b10257 4-arg, b10258 5-arg) before writing it in.

Also expands the comment on why the fingerprint test drifts TWO fields rather
than one, since the first version of that test drifted one, failed, and thereby
confirmed the scored fingerprint works - a note worth keeping so the fixture
does not get "simplified" back and silently stop testing what it names.

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
satindergrewal pushed a commit to satindergrewal/llama.cpp that referenced this pull request Aug 12, 2026
…-org#26520)

This matches how it is done for logit_bias and mirostat samplers, see
ggml-org#25262 (comment)
brittlewis12 pushed a commit to brittlewis12/llama.cpp that referenced this pull request Aug 17, 2026
thecodacus pushed a commit to thecodacus/llama.cpp that referenced this pull request Sep 7, 2026
…-org#26520)

This matches how it is done for logit_bias and mirostat samplers, see
ggml-org#25262 (comment)
zbrad pushed a commit to zbrad/llama.cpp that referenced this pull request Sep 10, 2026
…-org#26520)

This matches how it is done for logit_bias and mirostat samplers, see
ggml-org#25262 (comment)
pl752 pushed a commit to pl752/llama.cpp that referenced this pull request Sep 15, 2026
frostyautumnleaf pushed a commit to frostyautumnleaf/llama.cpp that referenced this pull request Oct 5, 2026
…-org#26520)

This matches how it is done for logit_bias and mirostat samplers, see
ggml-org#25262 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

testing Everything test related

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants