mirror of
https://github.com/ikawrakow/ik_llama.cpp.git
synced 2026-08-12 22:29:39 +04:00
* common: fix coding mistakes (typos in identifiers, flags and log strings) Fix misspelled identifiers and user-facing strings across common, server and model loading: - allow_ruless -> allow_rules (misspelled identifier used in the allowlist CLI parsing and the server slot/context code) - get_formated_timings/get_formated_generation -> get_formatted_* - 'termionated' -> 'terminated' in the fit-margin assert message - 'defaulr' -> 'default' in the YAML dump - 'overriden' -> 'overridden' in tensor buffer type override logs - 'becausee' -> 'because' in the output-tensor split log - 'etected NaNs' -> 'detected NaNs' in the imatrix error message * common: fix comment typos across src, common, include and examples Fix misspelled words in code comments: - llama.h: 'typy' -> 'type', 'transfrom' -> 'transform', 'ecoder' -> 'encoder', 'indicies' -> 'indices', 'Intializes' -> 'Initializes' - common.h: 'embendings' -> 'embeddings', 'pr' -> 'or' in the fused-indexer-topk comment - chat.cpp: 'overridde' -> 'override' - ngram-map: 'occurences' -> 'occurrences', 'stastistics' -> 'statistics' - speculative.cpp: 'dont'/'inehit' -> 'don't'/'inherit' - llama-mmap.cpp: 'dont't' -> 'don't' - llama-model.h: 'hcurrently andle' -> 'currently handle' - build_gemma3/4.cpp: 'emdeddings' -> 'embeddings' - examples: 'quantizuation', 'logprobe', 'throught', 'retrun', 'swich', 'convinient', 'temporally' (-> 'temporary'), 'temproal', 'preceed' * common: remove duplicate definitions and duplicate help entries - clip-impl.h: drop the second, identical #define TN_FFN_GATE - common.cpp: remove the duplicate '-t, --threads N' help entry that was misplaced in the export-lora section (already listed in the general section) - common.cpp: merge the two 'embedding' help groups into a single group so the embedding options are listed together - llama.cpp: remove the redundant LLAMA_MAX_LAYERS define (llama-hparams.h already defines the same value and is included by llama.cpp) * common: fix remaining typos (accomodate, recommanded, occurences, occassionally) - accomodate -> accommodate in src/llama.cpp comment - recommanded -> recommended in quantize.cpp user-facing output - occurences -> occurrences in test-chat.cpp JSON string - occassionally -> occasionally in vendor/stb/stb_image_resize2.h comment Note: tokenizer.ggml.seperator_token_id kept as-is to match GGUF spec * common: remove duplicate help entries - remove the duplicate '--reasoning-budget N' help entry that was repeated in the main section (introduced ine0596bf614'Autoparser - complete refactoring of parser architecture (PR 1376)') - remove the second '--parallel-tool-calls' help entry that advertised the '-ptc' short flag, which belongs to '--print-token-count' (introduced ine0596bf614'Autoparser - complete refactoring of parser architecture (PR 1376)'); the '-ptc' alias was non-functional for '--parallel-tool-calls' because the parser only binds it to '--print-token-count' The canonical help entries are kept: - '--reasoning-budget N' is listed once - '--parallel-tool-calls' is listed once (without the conflicting '-ptc' alias) * common: remove duplicate LOG_ENABLE define - the '#undef LOG_ENABLE / #define LOG_ENABLE() // dummy stub' pair was repeated verbatim inside the LOG_DISABLE_LOGS section - remove the second occurrence (introduced ina2588b53e1'main : log file (PR 2748)') * llama-bench: align MLA and attention-max-batch flags with common tools llama-bench used '--mla-attn' and '--attn-max-batch' while the common CLI parsing (common/common.cpp) uses '--mla-use' and '--attention-max-batch' for the same features. This made the flags inconsistent across tools. - update the help text to advertise the canonical names '--mla-use' and '--attention-max-batch' - keep the old '--mla-attn' and '--attn-max-batch' spellings working as aliases so existing scripts are not broken The divergent names were introduced in3e536b95b0'Add optional MLA (PR 188)'. * fix typos in comments and user-facing strings - ngram-map.cpp: 'Do we haven a existing' -> 'Do we have an existing' (introduced in1cb7e1bf39'spec : add self speculative decoding, ngram and refactor (PR 1261)') - build_mamba.cpp: 'weigth' -> 'weight' (introduced in8befd92ea5'Refactor model compute graphs (PR 1651)') - gguf-split.cpp: 'one of splits have 0 tensors' -> 'one of the splits has 0 tensors' (introduced in75b580db0a'split: allow --split-max-size option (PR 6343)') - gguf-split.cpp: 'merged from %d split' -> 'merged from %d splits' (introduced in1b5523dc79'gguf-split: split and merge gguf per batch of tensors (PR 6135)') - convert-llama2c-to-ggml.cpp: missing opening quote in the help line, '(default %s\\')' -> '(default '%s\\')' (introduced inbb9ebb4394'Adding support for llama2.c models (PR 2559)') * harmonize British and American spelling to American English The codebase uses American English (e.g. --embd-normalize, --color), but a few strings/comments still used British spellings. Unify them: - 'normalisation' -> 'normalization' in common.h, common.cpp help text and code comment, and llama-build-context.cpp comment - 'colorise' -> 'colorize' in the --color help text (common.cpp) - 'behaviour' -> 'behavior' in a chat.cpp warning and a llama.cpp comment - also fix 'openai' -> 'OpenAI' capitalization in the embedding help text and common.h comment (embedding output format is OpenAI-style) * common: fix help text formatting inconsistencies - '-smf16'/'--split-mode-f16' and '-smf32'/'--split-mode-f32' help entries displayed hardcoded 'true'/'false' as the default value; show the actual state derived from params.reduce_type instead - '-no-mmad' help entry had 'fused_mmad?' without a space before the ternary operator - '--reasoning-tokens' help continuation lines used tab characters for indentation while the sibling '--reasoning-format' entry uses spaces; convert to consistent space indentation * common: revert smf16/smf32 help text default display change Revert the '-smf16'/'--split-mode-f16' and '-smf32'/'--split-mode-f32' help entries back to their original hardcoded 'true'/'false' default display. The change to derive the default from params.reduce_type was not desired; the split-mode options are legacy and the hardcoded defaults reflect their intended meaning. The other formatting fixes in the same area (fused_mmad ternary spacing and the reasoning-tokens tab-to-space indentation) are kept. * llama-bench: fix help text column alignment The --mla-use and --attention-max-batch help lines introduced by the flag alignment landed one column off from the sibling entries ((default: at column 51 instead of 50). Adjust the padding so all help lines align. * common: fix help text defaults for graph-reduce-type and log-format Mismatch 1: -grt, --graph-reduce-type help shows default "f32", but actual default (common.h:463) is "f16" and llama.cpp uses GGML_TYPE_F16. Mismatch 2: --log-format help shows default "json", but actual default (common.h:536 log_json=false) is text. * common: add -ptcall short flag for --parallel-tool-calls * typo
116 lines
4.8 KiB
C++
116 lines
4.8 KiB
C++
#pragma once
|
|
//
|
|
// common/ngram-map.h: structures used to manage a map from n-grams to a list of m-grams
|
|
//
|
|
// These structures are used to do a lookup of n-grams followed by m-grams in token history.
|
|
//
|
|
// There are two algorithms implemented:
|
|
// 1. ngram_simple: lookup of n-grams followed by m-grams in token history.
|
|
// 2. ngram_map: lookup of n-grams followed by m-grams in token history using a map.
|
|
// The map is a vector of key n-grams, and for each key n-gram there is a list of value m-grams.
|
|
//
|
|
// ref: https://github.com/ggml-org/llama.cpp/pull/18471
|
|
//
|
|
|
|
#include "llama.h"
|
|
#include "common.h"
|
|
|
|
#include <vector>
|
|
|
|
// n-gram simple
|
|
//
|
|
|
|
// config of n-gram simple.
|
|
struct common_ngram_simple_config {
|
|
uint16_t size_ngram; // size of n-grams to lookup in self-mode
|
|
uint16_t size_mgram; // size of m-grams to draft in self-mode
|
|
};
|
|
|
|
// Searches for a n-gram in the history and checks whether a draft sequence should be generated.
|
|
llama_tokens common_ngram_simple_draft(
|
|
const common_ngram_simple_config & config,
|
|
const llama_tokens & tokens, llama_token sampled);
|
|
|
|
|
|
// n-gram map
|
|
//
|
|
|
|
// maximum number of m-gram values stored for each key n-gram.
|
|
#define COMMON_NGRAM_MAX_VALUES 4
|
|
|
|
// number of entries in the (optional, size 0 to disable) map from ngram-hash to ngram-index.
|
|
#define COMMON_NGRAM_HASH_MAP_SIZE 262144
|
|
|
|
// statistics of a m-gram after a known n-gram
|
|
struct common_ngram_map_value {
|
|
size_t value_idx = 0; // index of value m-gram in token-history (0 if unused)
|
|
uint16_t value_num = 0; // number of occurrences of this value m-gram after the key n-gram (0 in an unused values-slot)
|
|
int16_t n_accepted = -1; // number of accepted tokens at last draft (-1 if unused)
|
|
};
|
|
|
|
// statistics of a n-gram
|
|
struct common_ngram_map_key {
|
|
size_t key_idx; // index of key n-gram in token-history
|
|
size_t stat_idx; // index of last token of statistics computation (key_num, values)
|
|
|
|
uint16_t key_num; // number of occurrences of this key n-gram in token-history
|
|
common_ngram_map_value values[COMMON_NGRAM_MAX_VALUES]; // some known values after the key
|
|
};
|
|
|
|
// map from n-grams to following m-grams in token-history
|
|
struct common_ngram_map {
|
|
uint16_t size_key; // size of key n-grams
|
|
uint16_t size_value; // size of value m-grams
|
|
|
|
bool key_only; // true if only key n-grams are used, no values.
|
|
|
|
std::vector<common_ngram_map_key> keys; // key n-grams which occur several times in token-history
|
|
uint16_t min_hits; // minimum number of key hits to consider a draft
|
|
|
|
bool show_key_map_stats = false; // true, if statistics of the key_map should be printed.
|
|
|
|
common_ngram_map(uint16_t sz_key, uint16_t sz_value, bool only_keys,
|
|
uint16_t min_hits)
|
|
: size_key(sz_key), size_value(sz_value), key_only(only_keys),
|
|
min_hits(min_hits) {
|
|
key_map.resize(COMMON_NGRAM_HASH_MAP_SIZE); // 2^18 hash entries, 0 entries if key_map shouldn't be used
|
|
}
|
|
|
|
// In reasoning chats the previous reasoning block will be removed from context history.
|
|
// A rebuild of the ngram map is needed after that.
|
|
|
|
size_t size_last_begin = 0; // number of tokens at previous start of generation
|
|
|
|
bool last_draft_created = false; // true if a draft was created at last call.
|
|
size_t last_draft_key_idx = 0; // index of last key used for draft generation (0 = no draft)
|
|
uint16_t last_draft_value_idx = 0; // index of last value used for draft generation.
|
|
|
|
size_t idx_last_check = 0; // index of last check in context history
|
|
|
|
// optional map "hash to ngram-index" for faster lookup of n-grams. map is empty if unused.
|
|
//
|
|
// uint32_t instead of size_t (size of current histories is << UINT32_MAX)
|
|
std::vector<uint32_t> key_map; // key_map[hash] = index of ngram in context window
|
|
uint32_t key_map_last_idx = 0; // index of the last ngram added to key_map
|
|
};
|
|
|
|
// Initialize the n-gram map with the given token history.
|
|
// map: the ngram map to initialize.
|
|
// tokens: the token history to base the map on.
|
|
void common_ngram_map_begin(
|
|
common_ngram_map & map,
|
|
const llama_tokens & tokens);
|
|
|
|
// Searches for the n-gram in the history and checks whether a draft sequence should be generated.
|
|
// map: the ngram map to search in.
|
|
// inp: the tokens generated so far.
|
|
// sampled: the token that was just sampled.
|
|
// draft: vector to store the draft tokens, initially empty.
|
|
void common_ngram_map_draft(
|
|
common_ngram_map & map,
|
|
const llama_tokens & inp, llama_token sampled,
|
|
llama_tokens & draft);
|
|
|
|
// Update the statistics of a value after a draft was processed.
|
|
void common_ngram_map_accept(common_ngram_map & map, uint16_t n_accepted);
|