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

cont : keep backend sampling disabled for now

This commit is contained in:
Georgi Gerganov 2025-12-04 17:42:09 +02:00
parent 6958d41366
commit abc19635a3
No known key found for this signature in database
GPG Key ID: 449E073F9DC10735
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/common.cpp
View File

@ -1101,8 +1101,11 @@ common_init_result::common_init_result(common_params & params) :
pimpl->samplers_seq_config[i] = { i, common_sampler_get(pimpl->samplers[i].get()) }; pimpl->samplers_seq_config[i] = { i, common_sampler_get(pimpl->samplers[i].get()) };
} }
cparams.samplers = pimpl->samplers_seq_config.data(); // TODO: temporarily gated behind a flag
cparams.n_samplers = pimpl->samplers_seq_config.size(); if (params.sampling.backend_sampling) {
cparams.samplers = pimpl->samplers_seq_config.data();
cparams.n_samplers = pimpl->samplers_seq_config.size();
}
llama_context * lctx = llama_init_from_model(model, cparams); llama_context * lctx = llama_init_from_model(model, cparams);
if (lctx == NULL) { if (lctx == NULL) {

1
examples/batched/batched.cpp
View File

@ -81,6 +81,7 @@ int main(int argc, char ** argv) {
sampler_configs.push_back({ i, smpl }); sampler_configs.push_back({ i, smpl });
} }
// TODO: temporarily gated behind a flag
if (params.sampling.backend_sampling) { if (params.sampling.backend_sampling) {
ctx_params.samplers = sampler_configs.data(); ctx_params.samplers = sampler_configs.data();
ctx_params.n_samplers = sampler_configs.size(); ctx_params.n_samplers = sampler_configs.size();