mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-09-19 17:25:07 +02:00
Merge commit 'f534da26e4ab045b6899adc07cd2b9a065355ce9' into concedo_experimental
# Conflicts: # .github/workflows/release.yml # docs/ops.md # docs/ops/WebGPU.csv # ggml/src/CMakeLists.txt # ggml/src/ggml-cpu/kleidiai/kleidiai.cpp # ggml/src/ggml-hexagon/ggml-hexagon.cpp # ggml/src/ggml-openvino/ggml-openvino.cpp # ggml/src/ggml-webgpu/ggml-webgpu-shader-lib.hpp # ggml/src/ggml-webgpu/ggml-webgpu.cpp # models/templates/deepseek-ai-DeepSeek-V4.jinja # tests/test-backend-ops.cpp # tests/test-chat-auto-parser.cpp # tests/test-chat.cpp # tests/test-llama-archs.cpp
This commit is contained in:
@@ -2428,7 +2428,8 @@ class ChatStore {
|
||||
|
||||
if (currentConfig.samplers) apiOptions.samplers = currentConfig.samplers;
|
||||
|
||||
apiOptions.backend_sampling = currentConfig.backend_sampling;
|
||||
if (hasValue(currentConfig.backend_sampling))
|
||||
apiOptions.backend_sampling = currentConfig.backend_sampling;
|
||||
|
||||
if (currentConfig.customJson) apiOptions.custom = currentConfig.customJson;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user