mirror of
https://github.com/LostRuins/koboldcpp.git
synced 2026-09-18 16:55:14 +02:00
Merge commit 'acecd56032ddc34bada14a2d978f110d9c987095' into concedo_experimental
# Conflicts: # .github/workflows/build-cpu.yml # common/CMakeLists.txt # common/chat-auto-parser-generator.cpp # docs/development/parsing.md # grammars/README.md # json_to_gbnf.py # tests/CMakeLists.txt # tests/test-chat-peg-parser.cpp # tests/test-chat.cpp # tests/test-grammar-integration.cpp # tests/test-json-schema-to-grammar.cpp # tools/cli/README.md # tools/completion/README.md # tools/server/README.md
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
// Change JSON_ASSERT from assert() to GGML_ASSERT:
|
||||
#define JSON_ASSERT GGML_ASSERT
|
||||
#include <nlohmann/json.hpp>
|
||||
#include "json-schema.cpp"
|
||||
#include "json-schema-to-grammar.cpp"
|
||||
#include "llama.h"
|
||||
#include "sampling.h"
|
||||
|
||||
Reference in New Issue
Block a user