Repository navigation
[sync] Upstream sync to v0.25.0 (2026-07-20) - #29
Merged
Merged
Conversation
Signed-off-by: Wallbreazzz <110282866+Wallbreazzz@users.noreply.github.com>
vllm-project#4434) Signed-off-by: wangyu <410167048@qq.com> Signed-off-by: [Your Name] <[Your Email]>
…tion[1/N] (vllm-project#4225) Signed-off-by: princepride <wangzhipeng628@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
…roject#4026) Signed-off-by: Zening Chen <59945561+zeningc@users.noreply.github.com> Signed-off-by: zeningc <zening.chen@yahoo.com>
Signed-off-by: zhumingjue <zhumingjue@huawei.com>
…llm-project#4415) Signed-off-by: leo.yang <leo.yang.engineer@gmail.com> Co-authored-by: Yueqian Lin <70319226+linyueqian@users.noreply.github.com>
…ct#2645) (vllm-project#4051) Signed-off-by: leo.yang <leo.yang.engineer@gmail.com>
…#4009) (vllm-project#4045) Signed-off-by: leo.yang <leo.yang.engineer@gmail.com>
…-TTS talker (vllm-project#4230) Signed-off-by: leo.yang <leo.yang.engineer@gmail.com>
…T Caching. (vllm-project#4213) Signed-off-by: amy-why-3459 <wuhaiyan17@huawei.com>
… fix stale references (vllm-project#4567) Signed-off-by: Yueqian Lin <linyueqian@outlook.com>
…ct#4494) Signed-off-by: Kwokho Tsui <kh_tsui@163.com> Co-authored-by: Kwokho Tsui <kh_tsui@163.com>
…#2531) Signed-off-by: Ian Eaves <ian.k.eaves@gmail.com>
Signed-off-by: Alex Brooks <albrooks@redhat.com>
Signed-off-by: tjtanaa <tunjian.tan@embeddedllm.com>
…#3798) Signed-off-by: Zhengyuan Su <su.zhengyuan@u.nus.edu> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…ject#4568) Signed-off-by: Zhengyuan Su <su.zhengyuan@u.nus.edu>
…llm-project#4466) (vllm-project#4525) Signed-off-by: Yueqian Lin <linyueqian@outlook.com> Co-authored-by: Sy03 <1370724210@qq.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: Maciej Bala <mbala@nvidia.com> Signed-off-by: MaciejBalaNV <mbala@nvidia.com>
Signed-off-by: princepride <wangzhipeng628@gmail.com>
…llm-project#4575) Signed-off-by: lishunyang12 <125541396+lishunyang12@users.noreply.github.com> Signed-off-by: Yueqian Lin <linyueqian@outlook.com> Signed-off-by: lishunyang <lishunyang12@163.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com> Co-authored-by: Yueqian Lin <linyueqian@outlook.com>
Signed-off-by: yixiaoer <shin@yixiaoer.sg>
Signed-off-by: Rein Yang <ruiruyang2@gmail.com> Signed-off-by: R2-Y <ruiruyang2@gmail.com>
Signed-off-by: Maciej Bala <mbala@nvidia.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: Alex Brooks <albrooks@redhat.com> Co-authored-by: 汪志鹏 <wangzhipeng628@gmail.com>
…M 0.23.0 (vllm-project#4428) Signed-off-by: nagelanping <xiao.yi.ming@foxmail.com>
…lm-project#4009) (vllm-project#4044) Signed-off-by: leo.yang <leo.yang.engineer@gmail.com>
…ference) (vllm-project#4467) Signed-off-by: david6666666 <530634352@qq.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…/skills to better match the current vllm-omni codebase and repo conventions (vllm-project#4110) Signed-off-by: Lancer <maruixiang6688@gmail.com> Signed-off-by: Hongsheng Liu <liuhongsheng4@huawei.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…lm-project#5158) Signed-off-by: Weiming Liao <liaowm5@gmail.com> Co-authored-by: wangyu <53896905+yenuo26@users.noreply.github.com>
…th correct RNG handling for upcoming Cosmos3 distilled models (vllm-project#5176) Signed-off-by: Bartosz Stefaniak <bstefaniak@nvidia.com>
…oject#4643 OOM) (vllm-project#4761) Signed-off-by: Inesh Reddy <ineshreddy249@gmail.com> Signed-off-by: Inesh Reddy Chappidi <ineshreddy249@gmail.com> Co-authored-by: SYLAR <125541396+lishunyang12@users.noreply.github.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…t#4786) Signed-off-by: Nick Cao <ncao@redhat.com>
…sage and fix vllm-project#5182 (vllm-project#5185) Signed-off-by: wangyu <410167048@qq.com>
…m-project#5031) Signed-off-by: zwhzzz0821 <2831474076@qq.com> Co-authored-by: zwhzzz0821 <zwhzzz0821@users.noreply.github.com> Co-authored-by: SYLAR <125541396+lishunyang12@users.noreply.github.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: psv666 <2693925048@qq.com> Co-authored-by: amy-why-3459 <wuhaiyan17@huawei.com>
Signed-off-by: Liangyx2 <yuxiang.liang@intel.com> Signed-off-by: Yuxiang Liang <yuxiang.liang@intel.com> Signed-off-by: Yuxiang <yuxiang.liang@intel.com> Co-authored-by: Chendi.Xue <chendi.xue@intel.com>
Signed-off-by: Acerak01-fy <wfy2003324@163.com>
…-project#4953) Signed-off-by: Alex Brooks <albrooks@redhat.com>
Signed-off-by: Lancer <maruixiang6688@gmail.com>
Signed-off-by: David Chen <530634352@qq.com>
…eech.py (vllm-project#4833) Signed-off-by: boatman <109857087+sphinxkkkbc@users.noreply.github.com> Co-authored-by: Yueqian Lin <70319226+linyueqian@users.noreply.github.com>
…ject#5136) Signed-off-by: diyapeng <50388704+diyapeng@users.noreply.github.com> Co-authored-by: diyapeng <50388704+diyapeng@users.noreply.github.com>
…#5147) Signed-off-by: mglyn <1203789601@qq.com>
vllm-project#5117) Signed-off-by: amy-why-3459 <wuhaiyan17@huawei.com>
…5210) Signed-off-by: zwhzzz0821 <2831474076@qq.com>
Signed-off-by: zhumingjue <zhumingjue@huawei.com>
Signed-off-by: leo <yaoliu548926@gmail.com>
Carries wiped by `git merge -X theirs upstream/main`: - vLLM version bump to v0.25.1 (midstream/vllm-version, vllm-wheels.yml) - Modality validation in serving_chat.py (PR vllm-project#4720, open upstream) - Modalities/logprobs validation string fix in api_server.py (PR vllm-project#4743) - _SKIP_ISSUE_3649 marker in test_invalid_audio_speech.py - test_stream_finish_reason.py helper extraction (tests/helpers/serving_chat.py) - Formatting fix in test_invalid_omni_chat.py Signed-off-by: Ricardo Noriega De Soto <rnoriega@redhat.com>
oglok
force-pushed
the
sync-upstream-2026-07-20
branch
from
July 22, 2026 15:17
ce8e744 to
5b482be
Compare
dougbtv
approved these changes
Jul 22, 2026
dougbtv
left a comment
dougbtv
left a comment
Collaborator
There was a problem hiding this comment.
Same content as PR #28, verified all key midstream files are identical (Dockerfile.ubi, midstream-build.yml, docker-bake.hcl, version files, ROCm/CPU Dockerfiles — all SHA-match).
Merge-based approach (-X theirs + re-apply carries) is the right pattern for protected main — matches how nm-vllm-ent does it. The explicit list of 7 re-applied files in the PR description is a nice touch for auditability.
Previous review findings still apply (tracked in INFERENG-9317): CUDA path clean, ROCm/CPU Dockerfiles have pre-existing issues for follow-up.
LGTM for merge (use "Create a merge commit" to preserve upstream history).
2 tasks
2 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Syncs nm-vllm-omni-ent with upstream/main (
e24bddfb, 283 commits since fork pointb1a4b08a).Uses the same merge-based workflow as nm-vllm-ent:
git merge -X theirs upstream/mainfollowed by re-applying downstream carries.vLLM version
Bumped from v0.23.0 → v0.25.1 — upstream now requires vLLM v0.25.0+ (PR vllm-project#5043). Uses nm-cicd wheel build
29766140891fromsync-v0.25.1branch.Carries dropped (merged upstream)
Carries preserved
All build/infra, smoke tests, bugfix validators, and audio/text merge carries are preserved.
Carries re-applied after merge
7 files were overwritten by
-X theirsand re-applied from the validated rebased branch:midstream/vllm-version+vllm-wheels.yml(v0.25.1 bump)serving_chat.py(modality validation — PR [Bugfix] Return error for unsupported output modalities instead of empty choices vllm-project/vllm-omni#4720, open)api_server.py(modalities/logprobs validation string — PR [BugFix] Add modalities and logprobs validation for /v1/chat/completions vllm-project/vllm-omni#4743)test_invalid_audio_speech.py(_SKIP_ISSUE_3649 marker)test_stream_finish_reason.py(helper extraction to tests/helpers/)test_invalid_omni_chat.py(formatting)Open upstream PRs still carried
Deferred
3 carries from
v0.21.0(lost during v0.23.0 sync): fa3-fwd, av dependency, exclude list — follow-up PR.Test plan
python -c "import vllm_omni"workspytest tests/entrypoints/openai_api/test_audio_format.py tests/entrypoints/openai_api/test_modality_validation.py tests/entrypoints/test_stream_finish_reason.py