From 685c84c35ed2dc343e2d20c276f35d14ff1d293a Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Fri, 13 Dec 2024 12:54:10 +0200 Subject: [PATCH] common : move back the penalties at the front of the sampling chain ggml-ci --- common/common.h | 2 +- examples/server/webui/src/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/common.h b/common/common.h index 98b177e78..5f556c24d 100644 --- a/common/common.h +++ b/common/common.h @@ -139,6 +139,7 @@ struct common_params_sampling { std::vector samplers = { + COMMON_SAMPLER_TYPE_PENALTIES, COMMON_SAMPLER_TYPE_DRY, COMMON_SAMPLER_TYPE_TOP_K, COMMON_SAMPLER_TYPE_TYPICAL_P, @@ -146,7 +147,6 @@ struct common_params_sampling { COMMON_SAMPLER_TYPE_MIN_P, COMMON_SAMPLER_TYPE_XTC, COMMON_SAMPLER_TYPE_TEMPERATURE, - COMMON_SAMPLER_TYPE_PENALTIES, }; std::string grammar; // optional BNF-like grammar to constrain sampling diff --git a/examples/server/webui/src/main.js b/examples/server/webui/src/main.js index a16df1ccc..441fd7351 100644 --- a/examples/server/webui/src/main.js +++ b/examples/server/webui/src/main.js @@ -33,7 +33,7 @@ const CONFIG_DEFAULT = { systemMessage: 'You are a helpful assistant.', showTokensPerSecond: false, // make sure these default values are in sync with `common.h` - samplers: 'dkypmxt', + samplers: 'edkypmxt', temperature: 0.8, dynatemp_range: 0.0, dynatemp_exponent: 1.0,