vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

json: nits + regen deps

Browse source
This commit is contained in:
ochafik 2024-03-12 03:51:32 +00:00
parent 7e1440cc01
commit 917b5d2260
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

0
examples/server/json-schema-to-grammar.hpp Normal file
View file

4
tests/test-json-schema-to-grammar.cpp
View file

@ -50,7 +50,7 @@ struct TestCase {
void verify(const string& series, const string& actual) const { void verify(const string& series, const string& actual) const {
if (trim(actual) != trim(expected)) { if (trim(actual) != trim(expected)) {
cerr << "#" << endl; cerr << "#" << endl;
cerr << "# Test " << series.c_str() << " / " << name.c_str() << " failed." << endl; cerr << "# Test " << name.c_str() << " (" << series.c_str() << ") failed." << endl;
cerr << "#" << endl; cerr << "#" << endl;
cerr << schema.c_str() << endl; cerr << schema.c_str() << endl;
cerr << "# EXPECTED:\n" << expected.c_str() << endl; cerr << "# EXPECTED:\n" << expected.c_str() << endl;
@ -68,12 +68,14 @@ static void run_py(const TestCase& tc) {
std::system(("python ./examples/json-schema-to-grammar.py " + INPUT_NAME + " > " + OUT_NAME).c_str()); std::system(("python ./examples/json-schema-to-grammar.py " + INPUT_NAME + " > " + OUT_NAME).c_str());
tc.read_and_verify("Python"); tc.read_and_verify("Python");
} }
static void run_mjs(const TestCase& tc) { static void run_mjs(const TestCase& tc) {
cerr << "# Running MJS " << tc.name.c_str() << endl; cerr << "# Running MJS " << tc.name.c_str() << endl;
tc.prepare(); tc.prepare();
std::system(("node ./tests/run-json-schema-to-grammar.mjs " + INPUT_NAME + " > " + OUT_NAME).c_str()); std::system(("node ./tests/run-json-schema-to-grammar.mjs " + INPUT_NAME + " > " + OUT_NAME).c_str());
tc.read_and_verify("JavaScript"); tc.read_and_verify("JavaScript");
} }
static void run_cpp(const TestCase& tc) { static void run_cpp(const TestCase& tc) {
cerr << "# Running C++ " << tc.name.c_str() << endl; cerr << "# Running C++ " << tc.name.c_str() << endl;
auto actual = json_schema_to_grammar(nlohmann::json::parse(tc.schema)); auto actual = json_schema_to_grammar(nlohmann::json::parse(tc.schema));