Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JSON Schema to GBNF integration tests #7790

Merged
merged 7 commits into from
Jun 22, 2024
Merged

JSON Schema to GBNF integration tests #7790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b174dd
Adding simple bare-bones test for end-to-end integration test for jso…
HanClinto Jun 6, 2024
74985de
Adding additional examples as documented in #7789 . Also adding the a…
HanClinto Jun 6, 2024
acd3c46
Uncommenting formerly commented tests so that they fail for others wh…
HanClinto Jun 6, 2024
d4a63b0
Merging improved schema test methods added by @ochafik in #7797
HanClinto Jun 12, 2024
939b58a
Adding #define to temporarily remove failing tests so that this PR ca…
HanClinto Jun 12, 2024
3bdf7c3
Fixing nits from ochafik. Removing escape slashes, adding additional …
HanClinto Jun 22, 2024
5d15dc8
Fixing grammar indentation to be consistent throughout file.
HanClinto Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,7 @@ tests/test-grammar-parser: tests/test-grammar-parser.cpp ggml.o llama.o grammar-
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)

tests/test-grammar-integration: tests/test-grammar-integration.cpp ggml.o llama.o grammar-parser.o $(OBJS)
tests/test-grammar-integration: tests/test-grammar-integration.cpp json-schema-to-grammar.o ggml.o llama.o grammar-parser.o $(OBJS)
$(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
$(CXX) $(CXXFLAGS) $(filter-out %.h $<,$^) $(call GET_OBJ_FILE, $<) -o $@ $(LDFLAGS)

Expand Down
Loading
Loading