Merge upstream/main into moriio branch#1
Merge upstream/main into moriio branch#1knitcapcat-amd wants to merge 542 commits intoinkcherry:mainfrom
moriio branch#1Conversation
…m_start><im_end>` bug (vllm-project#2381) Signed-off-by: princepride <wangzhipeng628@gmail.com>
…ct#2021) Signed-off-by: Lancer <maruixiang6688@gmail.com>
vllm-project#2378) Signed-off-by: Fattysand <fattysand@users.noreply.github.com>
…videos/sync for benchmark test (vllm-project#2049) Signed-off-by: samithuang <285365963@qq.com>
Signed-off-by: david6666666 <david6666666@users.noreply.github.com> Co-authored-by: david6666666 <david6666666@users.noreply.github.com>
Signed-off-by: Alicia <115451386+congw729@users.noreply.github.com>
…1751) Signed-off-by: Ding Zuhao <e1583181@u.nus.edu>
…vllm-project#2367) Signed-off-by: daixinning <daixinning@163.com> Co-authored-by: daixinning <daixinning@163.com>
…/v1/chat/completions (vllm-project#2398) Signed-off-by: natureofnature <wzliu@connect.hku.hk>
Signed-off-by: jader <yjader@foxmail.com> Signed-off-by: asukaqaq-s <1311722138@qq.com> Co-authored-by: jader <yjader@foxmail.com>
…lm-project#2397) Signed-off-by: princepride <wangzhipeng628@gmail.com>
…#2337) Signed-off-by: Xiaodong Ye <yeahdongcn@gmail.com>
Signed-off-by: tjtanaa <tunjian.tan@embeddedllm.com>
…roject#2029) Signed-off-by: Lancer <maruixiang6688@gmail.com>
…bagel_img2img error) (vllm-project#2422) Signed-off-by: natureofnature <wzliu@connect.hku.hk>
Signed-off-by: Yuanheng Zhao <jonathan.zhaoyh@gmail.com>
…llm-project#1844) Signed-off-by: yenuo26 <410167048@qq.com> Signed-off-by: wangyu <410167048@qq.com> Signed-off-by: wangyu <53896905+yenuo26@users.noreply.github.com>
Signed-off-by: Didan Deng <33117903+wtomin@users.noreply.github.com>
…ect#2411) Signed-off-by: Jiahui Sun <jhsun2020@gmail.com>
…-project#2251) Signed-off-by: Alicia <115451386+congw729@users.noreply.github.com>
…#1777) Signed-off-by: yiliu30 <yi4.liu@intel.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: gcanlin <canlinguosdu@gmail.com>
…ct#1885) Signed-off-by: Binh Tang <tangbinhna@gmail.com> Signed-off-by: Binh Tang <binht@netflix.com> Signed-off-by: Didan Deng <33117903+wtomin@users.noreply.github.com> Co-authored-by: Binh Tang <binht@netflix.com> Co-authored-by: Didan Deng <33117903+wtomin@users.noreply.github.com>
Signed-off-by: Rein Yang <ruiruyang2@gmail.com>
Signed-off-by: CHEN <116010019@link.cuhk.edu.cn> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: vraiti <vraiti@redhat.com> Co-authored-by: Canlin Guo <canlinguosdu@gmail.com>
Signed-off-by: gcanlin <canlinguosdu@gmail.com>
Signed-off-by: bjf-frz <frz123db@gmail.com>
…ect#2691) Signed-off-by: Alex Brooks <albrooks@redhat.com> Co-authored-by: lengrongfu <lenronfu@gmail.com>
Signed-off-by: Alex Brooks <albrooks@redhat.com> Co-authored-by: Didan Deng <33117903+wtomin@users.noreply.github.com>
…_generates_video[wan22_i2v_usp2_hsdp2] (vllm-project#2883) Signed-off-by: wangyu <410167048@qq.com>
Signed-off-by: Lancer <maruixiang6688@gmail.com>
…t#2343) Signed-off-by: Nick Cao <ncao@redhat.com> Co-authored-by: Claude <noreply@anthropic.com>
…ures (vllm-project#1837) Signed-off-by: CHEN <116010019@link.cuhk.edu.cn> Signed-off-by: Yueqian Lin <70319226+linyueqian@users.noreply.github.com> Signed-off-by: linyueqian <linyueqian@outlook.com> Co-authored-by: Yueqian Lin <70319226+linyueqian@users.noreply.github.com> Co-authored-by: linyueqian <linyueqian@outlook.com>
Signed-off-by: Joshna Medisetty <joshna.medisetty@intel.com> Signed-off-by: Joshna-Medisetty <joshna.medisetty@intel.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: Alex Brooks <albrooks@redhat.com>
Signed-off-by: hsliuustc0106 <liuhongsheng4@huawei.com> Signed-off-by: hsliu <liuhongsheng4@huawei.com> Signed-off-by: Hongsheng Liu <liuhongsheng4@huawei.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: david6666666 <david6666666@users.noreply.github.com> Co-authored-by: david6666666 <david6666666@users.noreply.github.com>
Signed-off-by: Nick Cao <ncao@redhat.com>
…t#2581) Signed-off-by: CHEN <116010019@link.cuhk.edu.cn>
Signed-off-by: princepride <wangzhipeng628@gmail.com> Signed-off-by: 汪志鹏 <wangzhipeng628@gmail.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
Signed-off-by: CHEN <116010019@link.cuhk.edu.cn>
Signed-off-by: Lancer <maruixiang6688@gmail.com> Co-authored-by: Samit <285365963@qq.com>
Signed-off-by: gcanlin <canlinguosdu@gmail.com>
…pt (vllm-project#2894) Signed-off-by: Sy03 <1370724210@qq.com>
…2383) Signed-off-by: lishunyang <lishunyang12@163.com> Signed-off-by: reidliu41 <reid201711@gmail.com> Signed-off-by: Alex Brooks <albrooks@redhat.com> Co-authored-by: reidliu41 <reid201711@gmail.com> Co-authored-by: xiaohajiayou <75477391+xiaohajiayou@users.noreply.github.com> Co-authored-by: Alex Brooks <albrooks@redhat.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
…+decode batches (vllm-project#2903) Signed-off-by: Sy03 <1370724210@qq.com>
…memory (vllm-project#2474) Signed-off-by: willamhou <willamhou@ceresman.com> Co-authored-by: willamhou <willamhou@ceresman.com>
Signed-off-by: xiaohajiayou <923390377@qq.com> Signed-off-by: Samit <285365963@qq.com> Co-authored-by: Samit <285365963@qq.com> Co-authored-by: SYLAR <125541396+lishunyang12@users.noreply.github.com>
…m-project#2018) Signed-off-by: Yuanheng Zhao <jonathan.zhaoyh@gmail.com> Signed-off-by: yuanheng <jonathan.zhaoyh@gmail.com> Co-authored-by: Didan Deng <33117903+wtomin@users.noreply.github.com>
Signed-off-by: lishunyang <lishunyang12@163.com>
…2852) Signed-off-by: fan2956 <zhoufan53@huawei.com>
Signed-off-by: Rein Yang <ruiruyang2@gmail.com>
…m-project#2934) Signed-off-by: amy-why-3459 <wuhaiyan17@huawei.com>
Signed-off-by: Zejian Wang <zejianwang@sjtu.edu.cn>
There was a problem hiding this comment.
Code Review
This pull request overhauls the CI/CD infrastructure, documentation, and benchmarking suite. It introduces Intel XPU test pipelines, refactors Buildkite configurations to support dynamic uploads and docs-only skip logic, and adds a nightly wheel release process. The ComfyUI extension is updated with video generation and LoRA support, and new accuracy benchmarks are added for diffusion and VoxCPM models. Documentation is extensively updated to reflect new features and design patterns. Review feedback identifies several critical improvements, including fixing shell command substitution bugs in bootstrap scripts, ensuring proper file handle closure in benchmark clients, and implementing cleanup for temporary synthetic images. Additionally, suggestions were made to avoid in-place file modifications and runtime package installations within CI scripts to improve reliability and maintainability.
| $(git add .) | ||
| echo $(git diff --name-only --diff-filter=ACMDR $(git merge-base origin/main HEAD)) |
There was a problem hiding this comment.
The command substitution $(git add .) is a bug. It executes git add ., which returns nothing, and then the shell attempts to execute an empty string as a command. It should be a standalone command. Additionally, echo $(git diff ...) is redundant as git diff already outputs to stdout. If the intention is to include all changes in the diff, consider using git add . as a standalone command, but generally CI should only diff against committed changes.
| $(git add .) | |
| echo $(git diff --name-only --diff-filter=ACMDR $(git merge-base origin/main HEAD)) | |
| git add . | |
| git diff --name-only --diff-filter=ACMDR $(git merge-base origin/main HEAD) |
| $(git add .) | ||
| echo $(git diff --name-only --diff-filter=ACMDR HEAD~1) |
|
|
||
| # HACK: we do not need regex module here, but it is required by pre-commit hook | ||
| # To avoid any external dependency, we simply replace it back to the stdlib re module | ||
| sed -i.bak 's/import regex as re/import re/g' .buildkite/scripts/generate-nightly-index.py && rm -f .buildkite/scripts/generate-nightly-index.py.bak |
There was a problem hiding this comment.
| bash -c ' | ||
| set -e | ||
| echo $ZE_AFFINITY_MASK | ||
| pip install tblib==3.1.0 |
| data.add_field( | ||
| "audio_sample", | ||
| open(audio_path, "rb"), | ||
| filename=os.path.basename(audio_path), | ||
| content_type="audio/wav", | ||
| ) | ||
|
|
||
| async with aiohttp.ClientSession() as session: | ||
| async with session.post(url, data=data) as resp: | ||
| result = await resp.json() | ||
| print(f" Upload response ({resp.status}): {json.dumps(result, indent=2)}") | ||
| return result |
There was a problem hiding this comment.
The file opened with open(audio_path, "rb") is not explicitly closed. It is recommended to use a context manager to ensure the file handle is released after the request is completed.
| data.add_field( | |
| "audio_sample", | |
| open(audio_path, "rb"), | |
| filename=os.path.basename(audio_path), | |
| content_type="audio/wav", | |
| ) | |
| async with aiohttp.ClientSession() as session: | |
| async with session.post(url, data=data) as resp: | |
| result = await resp.json() | |
| print(f" Upload response ({resp.status}): {json.dumps(result, indent=2)}") | |
| return result | |
| if ref_text: | |
| data.add_field("ref_text", ref_text) | |
| with open(audio_path, "rb") as audio_file: | |
| data.add_field( | |
| "audio_sample", | |
| audio_file, | |
| filename=os.path.basename(audio_path), | |
| content_type="audio/wav", | |
| ) | |
| async with aiohttp.ClientSession() as session: | |
| async with session.post(url, data=data) as resp: | |
| result = await resp.json() | |
| print(f" Upload response ({resp.status}): {json.dumps(result, indent=2)}") | |
| return result |
| for image_idx in range(self.num_input_images): | ||
| img = Image.new("RGB", (512, 512), (255, 255, 255)) | ||
| image_path = os.path.join( | ||
| tempfile.gettempdir(), | ||
| f"diffusion_benchmark_random_image_{image_idx}.png", | ||
| ) | ||
| img.save(image_path) |
There was a problem hiding this comment.
Summary
Fix for vllm-project#1742:
moriiobranchvllm_omni/engine/async_omni_engine.py: keep both the morireceiver_connectorsattachment and upstream'spd_config = self._detect_pd_config(); pass bothconnectors=andpd_config=toOrchestratorvllm_omni/engine/orchestrator.py: keep both mori connector field/parameter/PUT logic and upstream's PD disaggregation state init / mm_features_ms == "thinker"filteringvllm_omni/model_executor/stage_configs/qwen2_5_omni_multiconnector.yaml: drop (qwen2_5_omni configs were moved tovllm_omni/deploy/by upstream refactor [Config Refactor 2.5/N] Centralize pipeline registry vllm-project/vllm-omni#2915; themori_connectorregistration is preserved inqwen2_5_omni_mori_intranode.yaml)