Skip to content

support for llguidance grammars #10224

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

Merged
ggerganov merged 34 commits into from
Feb 2, 2025
Merged

support for llguidance grammars #10224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
76290d9
initial porting of previous LLG patch
mmoskal Jan 25, 2025
f19655c
update for new APIs
mmoskal Jan 25, 2025
f4dc4b8
build: integrate llguidance as an external project
mmoskal Jan 25, 2025
afb6cac
use '%llguidance' as marker to enable llg lark syntax
mmoskal Jan 26, 2025
b5399d4
add some docs
mmoskal Jan 26, 2025
adc4aed
clarify docs
mmoskal Jan 26, 2025
2a92bfb
code style fixes
mmoskal Jan 26, 2025
8cb12d4
remove llguidance.h from .gitignore
mmoskal Jan 26, 2025
de269a1
fix tests when llg is enabled
mmoskal Jan 26, 2025
a7be666
pass vocab not model to llama_sampler_init_llg()
mmoskal Jan 26, 2025
3675050
copy test-grammar-integration.cpp to test-llguidance.cpp
mmoskal Jan 26, 2025
58006dd
clang fmt
mmoskal Jan 26, 2025
036b91f
fix ref-count bug
mmoskal Jan 26, 2025
f245ca2
build and run test
mmoskal Jan 26, 2025
16a5484
gbnf -> lark syntax
mmoskal Jan 26, 2025
2937537
conditionally include llguidance test based on LLAMA_LLGUIDANCE flag
mmoskal Jan 26, 2025
c7ebf57
rename llguidance test file to test-grammar-llguidance.cpp
mmoskal Jan 26, 2025
0a211fc
add gh action for llg test
mmoskal Jan 26, 2025
8e027f8
align tests with LLG grammar syntax and JSON Schema spec
mmoskal Jan 26, 2025
ca88ce7
llama_tokenizer() in fact requires valid utf8
mmoskal Jan 26, 2025
44e1973
update llg
mmoskal Jan 26, 2025
c9e9853
format file
mmoskal Jan 26, 2025
efc36c9
add $LLGUIDANCE_LOG_LEVEL support
mmoskal Jan 26, 2025
08fefd1
fix whitespace
mmoskal Jan 26, 2025
1afc53a
fix warning
mmoskal Jan 26, 2025
00fcd98
include <cmath> for INFINITY
mmoskal Jan 26, 2025
437ff31
add final newline
mmoskal Jan 26, 2025
5475357
fail llama_sampler_init_llg() at runtime
mmoskal Jan 29, 2025
d06448a
Link gbnf_to_lark.py script; fix links; refer to llg docs for lexemes
mmoskal Jan 29, 2025
59da969
simplify #includes
mmoskal Jan 30, 2025
d59d939
improve doc string for LLAMA_LLGUIDANCE
mmoskal Jan 30, 2025
6b2de55
Merge branch 'master' into llg
mmoskal Jan 31, 2025
a049afb
typo in merge
mmoskal Jan 31, 2025
7057589
bump llguidance to 0.6.12
mmoskal Jan 31, 2025
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
Prev Previous commit
Next Next commit
rename llguidance test file to test-grammar-llguidance.cpp
  • Loading branch information
@mmoskal
mmoskal committed Jan 26, 2025
commit c7ebf578222575fb9f0526ae799e70144b980edb
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ llama_test(test-tokenizer-0 NAME test-tokenizer-0-refact ARGS ${CMAKE
llama_test(test-tokenizer-0 NAME test-tokenizer-0-starcoder ARGS ${CMAKE_CURRENT_SOURCE_DIR}/../models/ggml-vocab-starcoder.gguf)

if (LLAMA_LLGUIDANCE)
llama_target_and_test(test-llguidance.cpp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/../models/ggml-vocab-llama-bpe.gguf)
llama_target_and_test(test-grammar-llguidance.cpp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/../models/ggml-vocab-llama-bpe.gguf)
endif ()

if (NOT WIN32)
Expand Down
0 tests/test-llguidance.cpp → tests/test-grammar-llguidance.cpp
View file
Open in desktop
File renamed without changes.
Loading