Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	README.md
#	examples/main/README.md
#	examples/run/run.cpp
This commit is contained in:
Concedo 2025-02-14 11:34:29 +08:00
commit 39fad991cc
31 changed files with 1319 additions and 620 deletions

View file

@ -675,7 +675,7 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
));
add_opt(common_arg(
{"--no-context-shift"},
string_format("disables context shift on inifinite text generation (default: %s)", params.ctx_shift ? "disabled" : "enabled"),
string_format("disables context shift on infinite text generation (default: %s)", params.ctx_shift ? "disabled" : "enabled"),
[](common_params & params) {
params.ctx_shift = false;
}