Skip to content

Clean stage proc rebase - #7

Open
chickeyton wants to merge 351 commits into
clean_stage_procfrom
clean_stage_proc_rebase
Open

chickeyton wants to merge 351 commits into
clean_stage_procfrom
clean_stage_proc_rebase

Conversation

@chickeyton

Copy link
Copy Markdown
Owner

PLEASE FILL IN THE PR DESCRIPTION HERE.

Purpose

Test Plan

vLLM Version:

vLLM-Omni Commit:

Test Result

BEFORE SUBMITTING: read CONTRIBUTING.md and run the precheck-pr skill with the code agent for a self-check against project conventions.
(anything written below this line will be removed by GitHub Actions)

@chickeyton
chickeyton force-pushed the clean_stage_proc_rebase branch from 5660ce5 to 0e6a4eb Compare July 24, 2026 09:52
AbelSara and others added 11 commits July 24, 2026 14:45
…ject#4968)

Signed-off-by: zhuhh97 <zhuhonghan@huawei.com>
Signed-off-by: dph97 <nenbaying@163.com>
Signed-off-by: zhuhh97 <zhh@unknown>
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: dengyunyang <584797741@qq.com>
)

Signed-off-by: TaffyOfficial <2324465096@qq.com>
Co-authored-by: TaffyOfficial <2324465096@qq.com>
…m-project#5107)

Signed-off-by: Ziyang Zhang <hafuhafu@qq.com>
Co-authored-by: Sy03 <1370724210@qq.com>
Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…lm-project#5406)

Signed-off-by: boatman <109857087+sphinxkkkbc@users.noreply.github.com>
…ing) (vllm-project#5237)

Signed-off-by: y_null <y_null@qq.com>
Signed-off-by: amy-why-3459 <wuhaiyan17@huawei.com>
Co-authored-by: amy-why-3459 <wuhaiyan17@huawei.com>
Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: princepride <wangzhipeng628@gmail.com>
Signed-off-by: 汪志鹏 <wangzhipeng628@gmail.com>
Signed-off-by: lishunyang12 <lishunyang03@gmail.com>
Co-authored-by: lishunyang12 <lishunyang03@gmail.com>
@chickeyton
chickeyton force-pushed the clean_stage_proc_rebase branch from 0e6a4eb to a3fb18a Compare July 27, 2026 01:20
princepride and others added 17 commits July 27, 2026 09:46
Signed-off-by: princepride <wangzhipeng628@gmail.com>
Signed-off-by: zhumingjue <zhumingjue@huawei.com>
…llm-project#5152)

Signed-off-by: Wallbreazzz <110282866+Wallbreazzz@users.noreply.github.com>
…ect#5428)

Signed-off-by: Yash Jain <yashjainjain1704@gmail.com>
…project#4480 Phase 0) (vllm-project#4487)

Signed-off-by: Wijnand Suijlen <wijnand.suijlen@huawei.com>
…llm-project#4652)

Signed-off-by: Huang, Zeyu <11222265+fhfuih@users.noreply.github.com>
Signed-off-by: David Chen <530634352@qq.com>
Signed-off-by: xsmccc <247721718+xsmccc@users.noreply.github.com>
Co-authored-by: xsmccc <247721718+xsmccc@users.noreply.github.com>
Signed-off-by: chickeyton <ngton2014@gmail.com>
The proc's run_stage_core param is omni_coord_address, but the manager
passed it under key omni_coordinator_address, so it fell into **kwargs
and was forwarded into vLLM EngineCoreProc.__init__, raising TypeError.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: chickeyton <ngton2014@gmail.com>
Signed-off-by: chickeyton <ngton2014@gmail.com>
Signed-off-by: chickeyton <ngton2014@gmail.com>
Signed-off-by: chickeyton <ngton2014@gmail.com>
The stage proc/client refactor added vllm_omni/engine/stage/* as new files,
so the rebase onto main applied cleanly but silently missed main's changes
to the modules those files were derived from. Carry them over:

stage_replica_pool.py (from engine/stage_pool.py):
- replica availability tracking (_unavailable_replicas,
  is_replica_available, available_replica_ids, mark_replica_unavailable,
  release_replica_bindings) and its use in select_replica_id / pollers
- add_client(..., replica_id=...) slot restore after unregister/re-register
- remove_client keeps the addr->replica_id entry
- native generation-token count preferred over output-derived count
- output_processor.add_request rollback via remove_request on submit failure

stage_diffusion_core_proc.py (from diffusion/stage_diffusion_proc.py):
- _is_executor_dead uses DiffusionExecutor.is_dead
- _process_request consumes step_streaming() (step() is deprecated)

Also follow two symbol moves made on main:
- FinalOutputModalityType -> vllm_omni.outputs.output_metadata
- MultimodalOutputProcessor -> vllm_omni.outputs.output_processor

Signed-off-by: chickeyton <ngton2014@gmail.com>

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…ffer test

main added test_build_add_request_message_preserves_model_intermediate_buffer
asserting isinstance(request, OmniEngineCoreRequest); this branch renamed that
type to StageLLMCoreRequest. The two changes were in separate hunks so the
rebase applied cleanly but left a dangling reference (NameError at runtime).

Signed-off-by: chickeyton <ngton2014@gmail.com>

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
chickeyton and others added 30 commits August 10, 2026 10:21
… clean_stage_proc_rebase

Signed-off-by: chickeyton <ngton2014@gmail.com>

# Conflicts:
#	docs/design/architecture_overview.md
#	vllm_omni/diffusion/stage/inline_stage_diffusion_client.py
…vllm-project#5898)

Signed-off-by: wangyu <410167048@qq.com>
Co-authored-by: amy-why-3459 <wuhaiyan17@huawei.com>
)

Signed-off-by: knlnguyen1802 <knlnguyen1802@gmail.com>
Co-authored-by: Samit <285365963@qq.com>
Co-authored-by: Gao Han <hgaoaf@connect.ust.hk>
Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…it policy (vllm-project#5843)

Signed-off-by: Huang, Zeyu <11222265+fhfuih@users.noreply.github.com>
Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: bjf-frz <frz123db@gmail.com>
Co-authored-by: Alicia <115451386+congw729@users.noreply.github.com>
…rted models (vllm-project#5969)

Signed-off-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: Xiaodong Ye <xiaodong.ye@mthreads.com>
Signed-off-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…#5958)

Signed-off-by: hsliu_ustc <hsliu_ustc@noreply.gitcode.com>
Signed-off-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Co-authored-by: hsliu_ustc <hsliu_ustc@noreply.gitcode.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
… to eliminate quadratic mask materialization (vllm-project#5891)

Signed-off-by: brandneway <gyuan4892@gmail.com>
Signed-off-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…eBackend (vllm-project#5997)

Signed-off-by: brandneway <gyuan4892@gmail.com>
Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: Fan <fan@FandeMacBook-Air.local>
Co-authored-by: Fan <fan@FandeMacBook-Air.local>
…-stage death (vllm-project#4285) (vllm-project#4583)

Signed-off-by: Shenglei Fu <sfu@confluent.io>
Signed-off-by: Shenglei Fu <117230642+ShengleiFu@users.noreply.github.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Yueqian Lin <70319226+linyueqian@users.noreply.github.com>
…l, kernel caches (vllm-project#5175)

Signed-off-by: JuanPZuluaga <juanz9312@gmail.com>
Co-authored-by: Yueqian Lin <70319226+linyueqian@users.noreply.github.com>
…dio-feature length syncs (vllm-project#5067)

Signed-off-by: JuanPZuluaga <juanz9312@gmail.com>
Co-authored-by: Yueqian Lin <70319226+linyueqian@users.noreply.github.com>
Signed-off-by: boatman <109857087+sphinxkkkbc@users.noreply.github.com>
Co-authored-by: Yueqian Lin <70319226+linyueqian@users.noreply.github.com>
…H3 t2va (vllm-project#5991)

Signed-off-by: Zijun Huang <zijunhua@usc.edu>
Co-authored-by: WeiQing Chen <40507679+david6666666@users.noreply.github.com>
Signed-off-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: Zhou248 <62542847+Zhou248@users.noreply.github.com>
Signed-off-by: yiminghub2024 <482890@qq.com>
…ct#6029)

Signed-off-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…llm-project#5524)

Signed-off-by: R2-Y <ruiruyang2@gmail.com>
Signed-off-by: psv666 <2693925048@qq.com>
Co-authored-by: psv666 <2693925048@qq.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: amy-why-3459 <wuhaiyan17@huawei.com>
…ed paged KV cache (vllm-project#5550)

Signed-off-by: Acerak01-fy <wfy2003324@163.com>
Signed-off-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…#4099)

Signed-off-by: weiyan <weiyanlin117@gmail.com>
Signed-off-by: Didan Deng <33117903+wtomin@users.noreply.github.com>
Co-authored-by: Didan Deng <33117903+wtomin@users.noreply.github.com>
Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…th (vllm-project#4645)

Signed-off-by: kTorp <Kristoffer.Torp@amd.com>
Signed-off-by: Didan Deng <33117903+wtomin@users.noreply.github.com>
Co-authored-by: Didan Deng <33117903+wtomin@users.noreply.github.com>
Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
… clean_stage_proc_rebase

Signed-off-by: chickeyton <ngton2014@gmail.com>

# Conflicts:
#	vllm_omni/engine/orchestrator.py
#	vllm_omni/engine/stage/stage_replica_pool.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.