permit simultaneous use of top_p and min_p

This commit is contained in:
cebtenzzre 2023-10-29 01:31:14 -04:00
parent 69e638e56a
commit 3ddfd67d13

View file

@ -190,11 +190,8 @@ llama_token llama_sampling_sample(
llama_sample_top_k (ctx_main, &cur_p, top_k, min_keep);
llama_sample_tail_free(ctx_main, &cur_p, tfs_z, min_keep);
llama_sample_typical (ctx_main, &cur_p, typical_p, min_keep);
if (min_p != 0.0) {
llama_sample_min_p(ctx_main, &cur_p, min_p, min_keep);
} else {
llama_sample_top_p(ctx_main, &cur_p, top_p, min_keep);
}
llama_sample_top_p (ctx_main, &cur_p, top_p, min_keep);
llama_sample_min_p (ctx_main, &cur_p, min_p, min_keep);
llama_sample_temp (ctx_main, &cur_p, temp);
id = llama_sample_token(ctx_main, &cur_p);