-
-
Notifications
You must be signed in to change notification settings - Fork 8.4k
[Core][V0] Enable regex support with xgrammar #13228
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.
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
Conversation
👋 Hi! Thank you for contributing to the vLLM project. 💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels. Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging. To run CI, PR reviewers can either: Add 🚀 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be a good idea to check xgrammar version and print out warning if they are using an old version?
hm, I'm not sure we do that other places. We just assume the code has what we express is required in the requirements files. You're on your own if you veer outside of that! |
This pull request has merge conflicts that must be resolved before it can be |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it should work fine with xgrammar. Thanks @russellb !
4a72f20
to
750db44
Compare
marked as a draft again as the pin to |
This pull request has merge conflicts that must be resolved before it can be |
6267b82
to
3d8da0b
Compare
This should be ready now |
superseded by #14868 |
Removing this from v0.8.0 because it is not a bugfix. We will release another version soon for features. |
wfm. we can have more time to fix bugs instead of rushing it in. |
7c0b64d
to
b2374c9
Compare
b2374c9
to
c418afd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR enables regex support in xgrammar by updating the grammar configuration and modifying the guided decoding logic. Key changes include adding a new regex_str field to GrammarConfig, adding a branch to handle regex-guided decoding in from_guided_params and _ensure_ctx, and updating test cases and fallback logic accordingly.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
File | Description |
---|---|
vllm/model_executor/guided_decoding/xgrammar_decoding.py | Adds regex_str to configuration, handles regex-guided decoding in from_guided_params and _ensure_ctx |
vllm/model_executor/guided_decoding/init.py | Removes fallback check for regex support in favor of JSON validation |
tests/entrypoints/llm/test_guided_generate.py | Updates tests to verify failure when unsupported JSON schema features are provided |
Comments suppressed due to low confidence (1)
vllm/model_executor/guided_decoding/xgrammar_decoding.py:253
- To prevent ambiguity when multiple guided decoding options are provided, consider validating that only one of grammar, json, or regex is set in guided_params.
elif guided_params.regex:
This pull request has merge conflicts that must be resolved before it can be |
Now that we're on a new enough version of xgrammar, this can be turned on. Signed-off-by: Russell Bryant <rbryant@redhat.com>
564e730
to
561ea37
Compare
Thanks for your awesome work! @russellb @aarnphm @simon-mo @DarkLight1337 |
Signed-off-by: Russell Bryant <rbryant@redhat.com> Signed-off-by: Yang Wang <elainewy@meta.com>
SUMMARY: sync to upstream `v0.8.4` and cherry-pick of `7eb42556281d30436a3a988f2c9184ec63c59338`. the cherry-pick is @LucasWilkinson 's llama4 patch. GIT LOG: ```bash commit b197179 (HEAD -> sync-upstream-v0.8.4, origin/sync-upstream-v0.8.4) Author: Lucas Wilkinson <LucasWilkinson@users.noreply.github.com> Date: Fri Apr 18 01:13:29 2025 -0400 [BugFix] Accuracy fix for llama4 int4 - improperly casted scales (vllm-project#16801) Signed-off-by: Lucas Wilkinson <lwilkinson@neuralmagic.com> commit 60267cc Author: andy-neuma <andy@neuralmagic.com> Date: Mon Apr 21 14:57:52 2025 -0400 remove duplicate entries commit 9d18b50 Merge: db0e117 dc1b4a6 Author: andy-neuma <andy@neuralmagic.com> Date: Mon Apr 21 14:50:01 2025 -0400 Merge remote-tracking branch 'upstream/v0.8.4' into sync-upstream-v0.8.4 commit db0e117 Author: andy-neuma <andy@neuralmagic.com> Date: Mon Apr 21 14:35:23 2025 -0400 Revert "Revert "[V1] DP scale-out (1/N): Use zmq ROUTER/DEALER sockets for input queue (vllm-project#15906)"" This reverts commit 296c657. commit dc1b4a6 (tag: v0.8.4, upstream/v0.8.4) Author: Russell Bryant <rbryant@redhat.com> Date: Sun Apr 13 22:13:38 2025 -0400 [Core][V0] Enable regex support with xgrammar (vllm-project#13228) Signed-off-by: Russell Bryant <rbryant@redhat.com> ``` COMMANDS: ```bash git fetch upstream git checkout -b sync-upstream-v0.8.4 git revert 296c657 git merge upstream/v0.8.4 git cherry-pick 7eb4255 ``` TEST PLAN: accept sync ... https://github.com/neuralmagic/nm-cicd/actions/runs/14581880024 release ... https://github.com/neuralmagic/nm-cicd/actions/runs/14596026989 --------- Signed-off-by: Tristan Leclercq <tristanleclercq@gmail.com> Signed-off-by: yihong0618 <zouzou0208@gmail.com> Signed-off-by: reidliu41 <reid201711@gmail.com> Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com> Signed-off-by: Jinzhen Lin <linjinzhen@hotmail.com> Signed-off-by: Jonghyun Choe <andy.choe729@gmail.com> Signed-off-by: Lu Fang <fanglu@fb.com> Signed-off-by: Hyesoo Yang <hyeygit@gmail.com> Signed-off-by: Ben Jackson <ben@ben.com> Signed-off-by: Roger Wang <ywang@roblox.com> Signed-off-by: Isotr0py <2037008807@qq.com> Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io> Signed-off-by: Varun Sundar Rabindranath <varun@neuralmagic.com> Signed-off-by: paolovic <paul-philipp.luley@uzh.ch> Signed-off-by: Chengji Yao <chengjiyao@google.com> Signed-off-by: Kay Yan <kay.yan@daocloud.io> Signed-off-by: Woosuk Kwon <woosuk.kwon@berkeley.edu> Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk> Signed-off-by: shen-shanshan <467638484@qq.com> Signed-off-by: YamPengLi <yampayne.lyp@alibaba-inc.com> Signed-off-by: WangErXiao <863579016@qq.com> Signed-off-by: Aston Zhang <22279212+astonzhang@users.noreply.github.com> Signed-off-by: Chris Thi <chris.c.thi@gmail.com> Signed-off-by: drisspg <drisspguessous@gmail.com> Signed-off-by: Jon Swenson <jmswen@gmail.com> Signed-off-by: Keyun Tong <tongkeyun@gmail.com> Signed-off-by: Lu Fang <fanglu@meta.com> Signed-off-by: Xiaodong Wang <xdwang@meta.com> Signed-off-by: Yang Chen <yangche@fb.com> Signed-off-by: Ye (Charlotte) Qi <yeq@meta.com> Signed-off-by: Yong Hoon Shin <yhshin@meta.com> Signed-off-by: Zijing Liu <liuzijing2014@gmail.com> Signed-off-by: Lu Fang <lufang@fb.com> Signed-off-by: Lucia Fang <fanglu@fb.com> Signed-off-by: Gregory Shtrasberg <Gregory.Shtrasberg@amd.com> Signed-off-by: NickLucche <nlucches@redhat.com> Signed-off-by: Benjamin Chislett <benjamin.chislett@centml.ai> Signed-off-by: Nick Hill <nhill@redhat.com> Signed-off-by: Leon Seidel <leon.seidel@fau.de> Signed-off-by: mgoin <michael@neuralmagic.com> Signed-off-by: youkaichao <youkaichao@gmail.com> Signed-off-by: Miles Williams <42222518+mlsw@users.noreply.github.com> Signed-off-by: mgoin <mgoin64@gmail.com> Signed-off-by: Siyuan Liu <lsiyuan@google.com> Signed-off-by: Kebe <mail@kebe7jun.com> Signed-off-by: simon-mo <simon.mo@hey.com> Signed-off-by: Alex-Brooks <Alex.Brooks@ibm.com> Signed-off-by: Tianyuan Wu <Tianyuan.Wu@amd.com> Signed-off-by: imkero <kerorek@outlook.com> Signed-off-by: Lucas Wilkinson <lwilkinson@neuralmagic.com> Signed-off-by: Russell Bryant <rbryant@redhat.com> Signed-off-by: Jee Jee Li <pandaleefree@gmail.com> Signed-off-by: Yue <yueshen@nvidia.com> Signed-off-by: tjtanaa <tunjian.tan@embeddedllm.com> Signed-off-by: kliuae <kuanfu.liu@embeddedllm.com> Signed-off-by: luka <luka@neuralmagic.com> Signed-off-by: lvfei.lv <lvfei.lv@alibaba-inc.com> Signed-off-by: Ajay Vohra <ajayvohr@amazon.com> Signed-off-by: Guillaume Calmettes <gcalmettes@scaleway.com> Signed-off-by: zh Wang <rekind133@outlook.com> Signed-off-by: Chendi Xue <chendi.xue@intel.com> Signed-off-by: Joe Runde <Joseph.Runde@ibm.com> Signed-off-by: zRzRzRzRzRzRzR <2448370773@qq.com> Signed-off-by: Aaron Ang <aaron.angyd@gmail.com> Signed-off-by: Benjamin Kitor <bkitor@gigaio.com> Signed-off-by: Michael Goin <mgoin64@gmail.com> Signed-off-by: Chenyaaang <chenyangli@google.com> Signed-off-by: cyy <cyyever@outlook.com> Signed-off-by: wineandchord <guoqizhou19@gmail.com> Signed-off-by: LiuXiaoxuanPKU <lilyliupku@gmail.com> Signed-off-by: Chih-Chieh-Yang <7364402+cyang49@users.noreply.github.com> Signed-off-by: look <eeslook@163.com> Signed-off-by: jadewang21 <jadewangcn@outlook.com> Signed-off-by: alexey-belyakov <alexey.belyakov@intel.com> Signed-off-by: jiang.li <jiang1.li@intel.com> Signed-off-by: DefTruth <qiustudent_r@163.com> Signed-off-by: chaow <chaow@amd.com> Signed-off-by: Tomasz Zielinski <tomasz.zielinski@intel.com> Signed-off-by: rzou <zou3519@gmail.com> Signed-off-by: Travis Johnson <tsjohnso@us.ibm.com> Signed-off-by: Christian Sears <csears@redhat.com> Signed-off-by: Gogs <gogs@fake.local> Signed-off-by: Yuan Tang <terrytangyuan@gmail.com> Signed-off-by: Tianer Zhou <ezhoureal@gmail.com> Signed-off-by: hzji210@gmail.com <hzji210@gmail.com> Signed-off-by: Jie Fu <jiefu@tencent.com> Signed-off-by: snowcharm <snowcharmqq@gmail.com> Signed-off-by: Ryan McConville <ryan@ryanmcconville.com> Co-authored-by: Tristan Leclercq <49700633+tristanleclercq@users.noreply.github.com> Co-authored-by: Kevin H. Luu <kevin@anyscale.com> Co-authored-by: yihong <zouzou0208@gmail.com> Co-authored-by: Reid <61492567+reidliu41@users.noreply.github.com> Co-authored-by: reidliu41 <reid201711@gmail.com> Co-authored-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Co-authored-by: Chauncey <chaunceyjiang@gmail.com> Co-authored-by: Jinzhen Lin <linjinzhen@hotmail.com> Co-authored-by: Jonghyun Choe <andy.choe729@gmail.com> Co-authored-by: Lucia Fang <116399278+luccafong@users.noreply.github.com> Co-authored-by: Hyesoo Yang <45211235+hyeygit@users.noreply.github.com> Co-authored-by: Ben Jackson <ben@ben.com> Co-authored-by: Roger Wang <136131678+ywang96@users.noreply.github.com> Co-authored-by: Paul Schweigert <paul@paulschweigert.com> Co-authored-by: Isotr0py <mozf@mail2.sysu.edu.cn> Co-authored-by: rongfu.leng <rongfu.leng@daocloud.io> Co-authored-by: Varun Sundar Rabindranath <varunsundar08@gmail.com> Co-authored-by: Varun Sundar Rabindranath <varun@neuralmagic.com> Co-authored-by: paolovic <91155454+paolovic@users.noreply.github.com> Co-authored-by: paolovic <paul-philipp.luley@uzh.ch> Co-authored-by: Chengji Yao <chengjiyao@google.com> Co-authored-by: Woosuk Kwon <woosuk.kwon@berkeley.edu> Co-authored-by: Martin Hoyer <mhoyer@redhat.com> Co-authored-by: Kay Yan <kay.yan@daocloud.io> Co-authored-by: Cyrus Leung <tlleungac@connect.ust.hk> Co-authored-by: Shanshan Shen <467638484@qq.com> Co-authored-by: YamPengLi <yampayne.lyp@alibaba-inc.com> Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com> Co-authored-by: Robin <863579016@qq.com> Co-authored-by: Lu Fang <30275821+houseroad@users.noreply.github.com> Co-authored-by: Lu Fang <fanglu@fb.com> Co-authored-by: Roger Wang <ywang@roblox.com> Co-authored-by: Gregory Shtrasberg <156009573+gshtras@users.noreply.github.com> Co-authored-by: Nicolò Lucchesi <nlucches@redhat.com> Co-authored-by: Benjamin Chislett <benjamin.chislett@centml.ai> Co-authored-by: Nick Hill <nhill@redhat.com> Co-authored-by: leon-seidel <83984854+leon-seidel@users.noreply.github.com> Co-authored-by: Driss Guessous <32754868+drisspg@users.noreply.github.com> Co-authored-by: Michael Goin <michael@neuralmagic.com> Co-authored-by: youkaichao <youkaichao@gmail.com> Co-authored-by: Miles Williams <42222518+mlsw@users.noreply.github.com> Co-authored-by: Satyajith Chilappagari <satchill@amazon.com> Co-authored-by: mgoin <mgoin64@gmail.com> Co-authored-by: Jennifer Zhao <ai.jenniferzhao@gmail.com> Co-authored-by: zxfan-cpu <zxfanzhang@tencent.com> Co-authored-by: Yong Hoon Shin <48474650+sarckk@users.noreply.github.com> Co-authored-by: Siyuan Liu <lsiyuan@google.com> Co-authored-by: Kebe <mail@kebe7jun.com> Co-authored-by: Simon Mo <simon.mo@hey.com> Co-authored-by: Alex Brooks <alex.brooks@ibm.com> Co-authored-by: TY-AMD <tianyuan.wu@amd.com> Co-authored-by: wang.yuqi <noooop@126.com> Co-authored-by: Kero Liang <kerorek@outlook.com> Co-authored-by: Lucas Wilkinson <LucasWilkinson@users.noreply.github.com> Co-authored-by: Russell Bryant <rbryant@redhat.com> Co-authored-by: Jee Jee Li <pandaleefree@gmail.com> Co-authored-by: yueshen2016 <39203804+yueshen2016@users.noreply.github.com> Co-authored-by: TJian <tunjian.tan@embeddedllm.com> Co-authored-by: Hongxia Yang <hongxia.yang@amd.com> Co-authored-by: kliuae <kuanfu.liu@embeddedllm.com> Co-authored-by: Luka Govedič <ProExpertProg@users.noreply.github.com> Co-authored-by: Accelerator1996 <lvfei.lv@alibaba-inc.com> Co-authored-by: ajayvohra2005 <ajayvohr@amazon.com> Co-authored-by: Guillaume Calmettes <gcalmettes@scaleway.com> Co-authored-by: zh Wang <rekind133@outlook.com> Co-authored-by: Chendi.Xue <chendi.xue@intel.com> Co-authored-by: Joe Runde <Joseph.Runde@ibm.com> Co-authored-by: Yuxuan Zhang <2448370773@qq.com> Co-authored-by: Aaron Ang <67321817+aaron-ang@users.noreply.github.com> Co-authored-by: Jintao <huangjintao@mail.ustc.edu.cn> Co-authored-by: Benjamin Kitor <bkitor@gigaio.com> Co-authored-by: Chenyaaang <42742451+Chenyaaang@users.noreply.github.com> Co-authored-by: cyyever <cyyever@outlook.com> Co-authored-by: Ye (Charlotte) Qi <yeq@meta.com> Co-authored-by: wineandchord <guoqizhou123123@qq.com> Co-authored-by: Nicolò Lucchesi <nicolo.lucchesi@gmail.com> Co-authored-by: Lily Liu <lilyliupku@gmail.com> Co-authored-by: Chih-Chieh Yang <7364402+cyang49@users.noreply.github.com> Co-authored-by: Yu Chin Fabian Lim <flim@sg.ibm.com> Co-authored-by: look <eeslook@163.com> Co-authored-by: WWW <jadewangcn@outlook.com> Co-authored-by: Alexey Belyakov <alexey.belyakov@intel.com> Co-authored-by: Li, Jiang <jiang1.li@intel.com> Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> Co-authored-by: chaow-amd <chaow@amd.com> Co-authored-by: Tomasz Zielinski <85164140+tzielinski-habana@users.noreply.github.com> Co-authored-by: Richard Zou <zou3519@users.noreply.github.com> Co-authored-by: Travis Johnson <tsjohnso@us.ibm.com> Co-authored-by: Kai Wu <kaiwu@meta.com> Co-authored-by: Christian Sears <117944059+Chr1st1anSears@users.noreply.github.com> Co-authored-by: Gogs <gogs@fake.local> Co-authored-by: Yuan Tang <terrytangyuan@gmail.com> Co-authored-by: Tianer Zhou <ezhoureal@gmail.com> Co-authored-by: Huazhong Ji <hzji210@gmail.com> Co-authored-by: Jie Fu (傅杰) <jiefu@tencent.com> Co-authored-by: SnowCharm <qiuyilun@u.nus.edu> Co-authored-by: Ryan McConville <ryan@ryanmcconville.com> Co-authored-by: andy-neuma <andy@neuralmagic.com>
Signed-off-by: Russell Bryant <rbryant@redhat.com>
Signed-off-by: Russell Bryant <rbryant@redhat.com>
Signed-off-by: Russell Bryant <rbryant@redhat.com> Signed-off-by: Mu Huai <tianbowen.tbw@antgroup.com>
We already support this in V1. This is just low hanging fruit to enable in V0 as well.