From 3ddfd67d137841c51e991f920a4ed7b865dd5e23 Mon Sep 17 00:00:00 2001 From: cebtenzzre Date: Sun, 29 Oct 2023 01:31:14 -0400 Subject: [PATCH] permit simultaneous use of top_p and min_p --- common/sampling.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/common/sampling.cpp b/common/sampling.cpp index ccac97a24..673d67a6d 100644 --- a/common/sampling.cpp +++ b/common/sampling.cpp @@ -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);