Skip to content

speculative : fix "ngram-map-k4v" name in logging#24253

Merged
pwilkin merged 2 commits into
ggml-org:masterfrom
ddh0:ngram-map-k-name-fix
Jun 10, 2026
Merged

speculative : fix "ngram-map-k4v" name in logging#24253
pwilkin merged 2 commits into
ggml-org:masterfrom
ddh0:ngram-map-k-name-fix

Conversation

@ddh0

@ddh0 ddh0 commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

Overview

This is a non-functional change.

When using --spec-type ngram-map-k4v, the log messages at startup and runtime say ngram-map-k. Added logic in the in the constructor of common_speculative_impl_ngram_map_k to pass the correct COMMON_SPECULATIVE_TYPE_NGRAM_MAP_K4V when config.key_only is false.

After this change, the log messages use the correct name.

Requirements

This is a non-functional change.

When using `--spec-type ngram-map-k4v`, the log messages at startup and
runtime say `ngram-map-k`. Added logic in the in the constructor of
`common_speculative_impl_ngram_map_k` to pass the correct
`COMMON_SPECULATIVE_TYPE_NGRAM_MAP_K4V` when `config.key_only` is
`false`.

After this change, the log messages use the correct name.
@ddh0 ddh0 requested a review from a team as a code owner June 7, 2026 05:31
@ddh0

ddh0 commented Jun 7, 2026

Copy link
Copy Markdown
Contributor Author

Before:

./build/bin/llama-server [...] --spec-type ngram-map-k4v --spec-ngram-map-k4v-size-n 4 --spec-ngram-map-k4v-size-m 4 --spec-ngram-map-k4v-min-hits 1 --spec-draft-n-min 1 --spec-draft-n-max 4
I common_speculative_impl_ngram_map_k: adding speculative implementation 'ngram-map-k'
I common_speculative_impl_ngram_map_k: - size_key=4, size_value=4, key_only=0, min_hits=1
statistics    ngram-map-k: #calls(b,g,a) = [...]

After:

./build/bin/llama-server [...] --spec-type ngram-map-k4v --spec-ngram-map-k4v-size-n 4 --spec-ngram-map-k4v-size-m 4 --spec-ngram-map-k4v-min-hits 1 --spec-draft-n-min 1 --spec-draft-n-max 4
I common_speculative_impl_ngram_map_k: adding speculative implementation 'ngram-map-k4v'
I common_speculative_impl_ngram_map_k: - size_key=4, size_value=4, key_only=0, min_hits=1
statistics    ngram-map-k4v: #calls(b,g,a) = [...]

However I'm not sure if this change has any other implications?

@ngxson ngxson requested a review from ggerganov June 9, 2026 21:26
@pwilkin pwilkin merged commit d2e22ed into ggml-org:master Jun 10, 2026
21 of 25 checks passed
@pwilkin

pwilkin commented Jun 10, 2026

Copy link
Copy Markdown
Member

Uhh, sorry, though it was a simple change then I read the further comments. If this is not OK I'll revert.

@ggerganov

Copy link
Copy Markdown
Member

I think it's ok

Jcfunk added a commit to Jcfunk/llama.cpp that referenced this pull request Jun 11, 2026
* upstream/HEAD: (329 commits)
  vendor : update LibreSSL to 4.3.2 (ggml-org#24397)
  Remove padding and multiple D2D copies for MTP (ggml-org#24086)
  chat: fix LFM2/LFM2.5 ignoring json_schema (ggml-org#24377)
  CUDA: Fix ssm_scan_f32 data-races (ggml-org#24360)
  ci : bump komac version (ggml-org#24396)
  speculative : fix "ngram-map-k4v" name in logging (ggml-org#24253)
  webui: implement pinned conversations support (ggml-org#21387)
  graph: Fix granite speech model inference by applying embedding scale when deepstack is not used (ggml-org#24357)
  ci : fix windows release (ggml-org#24369)
  ui: add opt-in run_javascript frontend tool (ggml-org#24244)
  mtmd: build_vit batching (ggml-org#24352)
  vulkan: reduce iq1 shared memory usage for mul_mm (ggml-org#24287)
  vulkan: add `v_dot2_f32_f16` support in matrix-matrix multiplication and Flash Attention (ggml-org#24123)
  ui: Fix excessive style recalculation on hover (ggml-org#24243)
  mtmd: refactor video subproc handling (ggml-org#24316)
  server: log prompts to directory (ggml-org#22031)
  ui: fix mobile chat form overflow and bust stale bundle cache (ggml-org#24158)
  ggml : add GGML_OP_COL2IM_1D (ggml-org#24206)
  server : do not clear slots without unified KV cache (ggml-org#24190)
  models : fix plamo2 attention_key/value_length regression (ggml-org#24317)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants