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

llama-cli : fix dangling reference to sampler config

This commit is contained in:
Georgi Gerganov 2025-11-24 19:51:32 +02:00
parent d0bea21a3c
commit e2d4f0829c
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/common.cpp
View File

@ -976,8 +976,6 @@ struct common_init_result common_init_context_from_model(
const llama_vocab * vocab = llama_model_get_vocab(model); const llama_vocab * vocab = llama_model_get_vocab(model);
auto cparams = common_context_params_to_llama(params); auto cparams = common_context_params_to_llama(params);
cparams.samplers = params.backend_samplers;
cparams.n_samplers = params.n_backend_samplers;
llama_context * lctx = llama_init_from_model(model, cparams); llama_context * lctx = llama_init_from_model(model, cparams);
if (lctx == NULL) { if (lctx == NULL) {
@ -1247,6 +1245,9 @@ struct llama_context_params common_context_params_to_llama(const common_params &
cparams.type_k = params.cache_type_k; cparams.type_k = params.cache_type_k;
cparams.type_v = params.cache_type_v; cparams.type_v = params.cache_type_v;
cparams.samplers = params.backend_samplers;
cparams.n_samplers = params.n_backend_samplers;
return cparams; return cparams;
} }

3
tools/main/main.cpp
View File

@ -146,8 +146,9 @@ int main(int argc, char ** argv) {
// Configure backend sampler if configured // Configure backend sampler if configured
llama_sampler * backend_sampler = common_sampler_backend_init(model, sparams); llama_sampler * backend_sampler = common_sampler_backend_init(model, sparams);
if (backend_sampler) {
llama_sampler_seq_config sampler_config = { 0, backend_sampler }; llama_sampler_seq_config sampler_config = { 0, backend_sampler };
if (backend_sampler) {
params.backend_samplers = &sampler_config; params.backend_samplers = &sampler_config;
params.n_backend_samplers = 1; params.n_backend_samplers = 1;
} }