PR #6640 grammars: x{min,max} repetition operator

grammars: x{min,max} repetition operator #6640

ochafik merged 36 commits into ggml-org:master from ochafik:grammar-reps

grammars: x{min,max} repetition operator + tweak +/*/? to avoid dupli…

01604690

grammars: handle `x{n}` and fix `x{n,n}`

f2030e32

grammars: document new repetition operators

de0fd3f7

ochafik force pushed 1 year ago

grammars: nit

9d9b5a34

ochafik force pushed to 9d9b5a34 1 year ago

HanClinto commented on 2024-04-12

grammars: uniform use of int for min & max

6b5518c9

grammars: refactor parser test

0ceb69af

grammar: parsing tests w/ natural pretty print of updated expectations

8938a050

HanClinto commented on 2024-04-12

grammars: much prettier print of expectations (+ TEST_GRAMMAR_PARSER_…

0d7347f2

HanClinto commented on 2024-04-12

grammars: improve test pretty print again

2e2df723

HanClinto commented on 2024-04-12

grammars: pretty print rules and chars

ffe321d0

grammars: fix copy rule skipping

a9351b8f

grammars: disallow `a{,}` (not allowed in regexps)

9d8efa54

HanClinto commented on 2024-04-12

Update common/grammar-parser.cpp

2d98ebf0

grammars: fix copy rule skipping (again) & display of expectations

ec913426

grammars: more test cases

22faba62

ochafik marked this pull request as ready for review 1 year ago

HanClinto commented on 2024-04-12

Merge remote-tracking branch 'origin/master' into grammar-reps

1fb77875

grammars: update reps parsing to bring ? / * / + closer to before

15585e0f

ochafik force pushed to 15585e0f 1 year ago

ochafik changed the title ~~grammars: x{min,max} repetition operator, tweak +/*/? to avoid duplication~~ grammars: x{min,max} repetition operator 1 year ago

json: use new GBNF repetitions{m,n} syntax

93b754ec

ochafik force pushed to 93b754ec 1 year ago

grammars: update performance gotchas w/ repetition advice

2ecc2ae9

Merge remote-tracking branch 'origin/master' into grammar-reps

a9a29836

HanClinto commented on 2024-04-24

Update examples/json_schema_to_grammar.py

d47f5374

Update examples/server/public/json-schema-to-grammar.mjs

724f879f

grammars: comment on rule repetitions

a61281fe

grammars: ensure unambiguous number alternatives

d03c98ed

grammar: nit typo switched error msgs

21bac1e4

grammar: nit numbering in comment

0c74ad3c

HanClinto commented on 2024-04-24

json: update numeric rule to be unambiguous

218f41fa

HanClinto commented on 2024-04-24

Apply suggestions from code review

28138351

Update examples/server/public/json-schema-to-grammar.mjs

46fe6483

json: fix integral-part

eb7ccd88

Merge branch 'grammar-reps' of https://github.com/ochafik/llama.cpp i…

3c02508a

Merge remote-tracking branch 'origin/master' into grammar-reps

476c97dd

grammar: add repetition tests

990bf571

mofosyne added enhancement

mofosyne added Review Complexity : High

Merge remote-tracking branch 'origin/master' into grammar-reps

d070aee6

github-actions added testing

github-actions added examples

github-actions added python

github-actions added server

Merge remote-tracking branch 'origin/master' into grammar-reps

8266b7cd

Merge remote-tracking branch 'origin/master' into grammar-reps

2b79d47d

HanClinto approved these changes on 2024-06-05

ochafik merged 55b2d084 into master 1 year ago

Reviewers

HanClinto

Assignees

No one assigned

Labels

enhancement testing examples python Review Complexity : High server

Milestone

No milestone

llama.cpp grammars: x{min,max} repetition operator #6640 Merged

grammars: x{min,max} repetition operator #6640

llama.cpp
grammars: x{min,max} repetition operator
#6640

Merged