mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-10-22 06:09:59 +00:00
Merge commit '033df86b69' into concedo_experimental
# Conflicts: # docs/backend/SYCL.md # docs/development/parsing.md # examples/speculative-simple/speculative-simple.cpp # ggml/src/ggml-hexagon/ggml-hexagon.cpp # ggml/src/ggml-hexagon/htp/get-rows-ops.c # ggml/src/ggml-hexagon/htp/get-rows-ops.h # ggml/src/ggml-hexagon/htp/hmx-mm-kernels-tiled.h # ggml/src/ggml-hexagon/htp/htp-ops.h # ggml/src/ggml-hexagon/htp/hvx-erf.h # ggml/src/ggml-hexagon/htp/main.c # ggml/src/ggml-hexagon/htp/matmul-ops.c # ggml/src/ggml-hexagon/htp/unary-ops.c # ggml/src/ggml-hexagon/htp/unary-ops.h # ggml/src/ggml-sycl/CMakeLists.txt # ggml/src/ggml-sycl/common.hpp # ggml/src/ggml-sycl/element_wise.cpp # ggml/src/ggml-sycl/element_wise.hpp # ggml/src/ggml-sycl/fusion.cpp # ggml/src/ggml-sycl/fwht.cpp # ggml/src/ggml-sycl/ggml-sycl.cpp # ggml/src/ggml-sycl/im2col.hpp # ggml/src/ggml-sycl/pad.hpp # ggml/src/ggml-sycl/rope.hpp # ggml/src/ggml-sycl/upscale.hpp # scripts/snapdragon/run.py # scripts/sync_vendor.py # src/CMakeLists.txt # tests/test-backend-ops.cpp # tests/test-backend-sampler.cpp # tests/test-chat.cpp # tests/test-llama-archs.cpp # tools/imatrix/imatrix.cpp # tools/server/README.md
This commit is contained in:
commit
0890a5ee77
114 changed files with 3800 additions and 763 deletions
|
|
@ -6087,7 +6087,7 @@ std::string gpttype_parse_chat_tool_calls(const std::string & generated_text,
|
|||
common_chat_msg parsed;
|
||||
try
|
||||
{
|
||||
parsed = common_chat_parse(generated_text, is_partial, parser_params);
|
||||
parsed = common_chat_parse(common_chat_input(generated_text), is_partial, parser_params);
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue