From f5d08724e75d3f41d4737c333349e03b21baa704 Mon Sep 17 00:00:00 2001 From: ddh0 Date: Sun, 14 Dec 2025 21:51:59 -0600 Subject: [PATCH] fix bad merge my git skills are lacking --- common/sampling.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/common/sampling.cpp b/common/sampling.cpp index ee58aa50b3..1e26f44a6c 100644 --- a/common/sampling.cpp +++ b/common/sampling.cpp @@ -253,8 +253,6 @@ struct common_sampler * common_sampler_init(const struct llama_model * model, co for (const auto & str : params.dry_sequence_breakers) { c_breakers.push_back(str.c_str()); } - - llama_sampler_chain_add(result->chain, llama_sampler_init_dry (vocab, llama_model_n_ctx_train(model), params.dry_multiplier, params.dry_base, params.dry_allowed_length, params.dry_penalty_last_n, c_breakers.data(), c_breakers.size())); samplers.push_back(llama_sampler_init_dry (vocab, llama_model_n_ctx_train(model), params.dry_multiplier, params.dry_base, params.dry_allowed_length, params.dry_penalty_last_n, c_breakers.data(), c_breakers.size())); } break; @@ -286,7 +284,6 @@ struct common_sampler * common_sampler_init(const struct llama_model * model, co samplers.push_back(llama_sampler_init_penalties (params.penalty_last_n, params.penalty_repeat, params.penalty_freq, params.penalty_present)); break; case COMMON_SAMPLER_TYPE_POWER_LAW: - llama_sampler_chain_add(result->chain, llama_sampler_init_power_law (params.power_law_target, params.power_law_decay, params.seed)); has_distribution_sampler = true; break; default: @@ -295,10 +292,8 @@ struct common_sampler * common_sampler_init(const struct llama_model * model, co } // only add `dist` to the end of the chain if no other distribution samplers were added if (!has_distribution_sampler) { - llama_sampler_chain_add(result->chain, llama_sampler_init_dist(params.seed)); + samplers.push_back(llama_sampler_init_dist(params.seed)); } - - samplers.push_back(llama_sampler_init_dist(params.seed)); } else if (params.mirostat == 1) { samplers.push_back(llama_sampler_init_temp(params.temp)); samplers.push_back(llama_sampler_init_mirostat(llama_vocab_n_tokens(vocab), params.seed, params.mirostat_tau, params.mirostat_eta, 100));