mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2025-09-12 09:59:41 +00:00
Merge commit 'c8ade30036
' into concedo_experimental
# Conflicts: # ggml/src/ggml-cuda/CMakeLists.txt # ggml/src/ggml-opencl/CMakeLists.txt # ggml/src/ggml-opencl/ggml-opencl.cpp # ggml/src/ggml-opencl/kernels/im2col_f16.cl # ggml/src/ggml-opencl/kernels/im2col_f32.cl # ggml/src/ggml-sycl/im2col.cpp # tools/mtmd/clip.cpp
This commit is contained in:
commit
0d72c794fa
10 changed files with 418 additions and 127 deletions
|
@ -253,6 +253,7 @@ struct server_task {
|
|||
defaults.sampling = params_base.sampling;
|
||||
defaults.speculative = params_base.speculative;
|
||||
defaults.n_keep = params_base.n_keep;
|
||||
defaults.antiprompt = params_base.antiprompt;
|
||||
|
||||
// enabling this will output extra debug information in the HTTP responses from the server
|
||||
params.verbose = params_base.verbosity > 9;
|
||||
|
@ -490,6 +491,10 @@ struct server_task {
|
|||
}
|
||||
}
|
||||
}
|
||||
// set reverse prompt from cli args if not set in the request
|
||||
if (params.antiprompt.empty()) {
|
||||
params.antiprompt = defaults.antiprompt;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue