Skip to content

Commit a9ca3de

Browse files
Merge branch 'main' into HunyuanImage3IntergrationGPU
2 parents 703d750 + 9af6fb9 commit a9ca3de

File tree

102 files changed

+6577
-1687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+6577
-1687
lines changed

.buildkite/pipeline.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,7 @@ steps:
2020
- label: "Simple Unit Test"
2121
depends_on: image-build
2222
commands:
23-
- |
24-
pytest -v -s \
25-
tests/entrypoints/ \
26-
tests/diffusion/cache/ \
27-
tests/diffusion/lora/ \
28-
tests/model_executor/models/qwen2_5_omni/test_audio_length.py \
29-
tests/worker/ \
30-
tests/distributed/omni_connectors/test_kv_flow.py \
31-
--cov=vllm_omni \
32-
--cov-branch \
33-
--cov-report=term-missing \
34-
--cov-report=html \
35-
--cov-report=xml
23+
- "pytest -v -s -m 'core_model and cpu' --cov=vllm_omni --cov-branch --cov-report=term-missing --cov-report=html --cov-report=xml"
3624
agents:
3725
queue: "gpu_1_queue"
3826
plugins:
@@ -118,7 +106,7 @@ steps:
118106
timeout_in_minutes: 15
119107
depends_on: image-build
120108
commands:
121-
- pytest -s -v tests/e2e/offline_inference/test_cache_dit.py tests/e2e/offline_inference/test_teacache.py
109+
- pytest -s -v -m 'core_model and cache and diffusion and not distributed_cuda and L4'
122110
agents:
123111
queue: "gpu_1_queue" # g6.4xlarge instance on AWS, has 1 L4 GPU
124112
plugins:

.buildkite/test-amd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ steps:
4444
- export GPU_ARCHS=gfx942
4545
- export VLLM_LOGGING_LEVEL=DEBUG
4646
- export VLLM_WORKER_MULTIPROC_METHOD=spawn
47-
- pytest -s -v tests/e2e/offline_inference/test_cache_dit.py tests/e2e/offline_inference/test_teacache.py
47+
- pytest -s -v -m 'core_model and cache and diffusion and not distributed_rocm and MI325'
4848

4949
- label: "Diffusion Sequence Parallelism Test"
5050
timeout_in_minutes: 20

.buildkite/test-nightly.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ steps:
1212
- label: "Omni Model Test with H100"
1313
timeout_in_minutes: 180
1414
depends_on: image-build
15+
if: build.env("NIGHTLY") == "1"
1516
commands:
1617
- export VLLM_WORKER_MULTIPROC_METHOD=spawn
1718
- pytest -s -v tests/e2e/online_serving/test_qwen3_omni_expansion.py

.github/workflows/build_wheel.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
paths-ignore:
88
- 'docs/**'
99
- 'examples/**'
10+
- 'apps/**'
1011
- '.github/**'
1112
- '.buildkite/**'
1213
- '**.md'
@@ -20,6 +21,7 @@ on:
2021
paths-ignore:
2122
- 'docs/**'
2223
- 'examples/**'
24+
- 'apps/**'
2325
- '.github/**'
2426
- '.buildkite/**'
2527
- '*.yml'
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: ComfyUI Integration -- Publish to Comfy registry
2+
on:
3+
workflow_dispatch:
4+
push:
5+
tags:
6+
- "*"
7+
paths:
8+
- "apps/ComfyUI-vLLM-Omni/**"
9+
10+
permissions:
11+
issues: write
12+
13+
defaults:
14+
run:
15+
working-directory: apps/ComfyUI-vLLM-Omni
16+
17+
jobs:
18+
publish-node:
19+
name: Publish Custom Node to registry
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: ♻️ Check out code
23+
uses: actions/checkout@v4
24+
- name: 📦 Publish Custom Node
25+
uses: Comfy-Org/publish-node-action@main
26+
with:
27+
personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: ComfyUI Integration -- Validate backwards compatibility
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
- main
8+
paths:
9+
- "apps/ComfyUI-vLLM-Omni/**"
10+
11+
defaults:
12+
run:
13+
working-directory: apps/ComfyUI-vLLM-Omni
14+
15+
jobs:
16+
check-base-path:
17+
runs-on: ubuntu-latest
18+
outputs:
19+
exists: ${{ steps.check.outputs.exists }}
20+
defaults:
21+
run:
22+
working-directory: .
23+
steps:
24+
- uses: actions/checkout@v4
25+
with:
26+
ref: ${{ github.event.pull_request.base.sha }}
27+
fetch-depth: 1
28+
- id: check
29+
run: |
30+
if [ -d "apps/ComfyUI-vLLM-Omni" ]; then
31+
echo "exists=true" >> "$GITHUB_OUTPUT"
32+
else
33+
echo "exists=false" >> "$GITHUB_OUTPUT"
34+
fi
35+
validate:
36+
needs: check-base-path
37+
if: needs.check-base-path.outputs.exists == 'true'
38+
runs-on: ubuntu-latest
39+
steps:
40+
- uses: comfy-org/node-diff@main

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,14 @@ dmypy.json
153153
# Cython debug symbols
154154
cython_debug/
155155

156+
# Claude
157+
CLAUDE.md
158+
.claude/
159+
160+
# Codex
161+
AGENTS.md
162+
.codex/
163+
156164
# cursor
157165
.cursor/
158166

@@ -214,6 +222,7 @@ data/
214222
datasets/
215223
*.csv
216224
*.json
225+
!apps/ComfyUI-vLLM-Omni/example_workflows/*.json
217226
*.jsonl
218227
*.parquet
219228

apps/ComfyUI-vLLM-Omni/.gitignore

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# OSX useful to ignore
7+
*.DS_Store
8+
.AppleDouble
9+
.LSOverride
10+
11+
# Thumbnails
12+
._*
13+
14+
# Files that might appear in the root of a volume
15+
.DocumentRevisions-V100
16+
.fseventsd
17+
.Spotlight-V100
18+
.TemporaryItems
19+
.Trashes
20+
.VolumeIcon.icns
21+
.com.apple.timemachine.donotpresent
22+
23+
# Directories potentially created on remote AFP share
24+
.AppleDB
25+
.AppleDesktop
26+
Network Trash Folder
27+
Temporary Items
28+
.apdisk
29+
30+
# C extensions
31+
*.so
32+
33+
# Distribution / packaging
34+
.Python
35+
env/
36+
venv/
37+
build/
38+
develop-eggs/
39+
dist/
40+
downloads/
41+
eggs/
42+
.eggs/
43+
lib/
44+
lib64/
45+
parts/
46+
sdist/
47+
var/
48+
*.egg-info/
49+
.installed.cfg
50+
*.egg
51+
52+
# PyInstaller
53+
# Usually these files are written by a python script from a template
54+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
55+
*.manifest
56+
*.spec
57+
58+
# Installer logs
59+
pip-log.txt
60+
pip-delete-this-directory.txt
61+
62+
# Unit test / coverage reports
63+
htmlcov/
64+
.tox/
65+
.coverage
66+
.coverage.*
67+
.cache
68+
nosetests.xml
69+
coverage.xml
70+
*,cover
71+
.hypothesis/
72+
.pytest_cache/
73+
74+
# Translations
75+
*.mo
76+
*.pot
77+
78+
# Django stuff:
79+
*.log
80+
81+
# Sphinx documentation
82+
docs/_build/
83+
84+
# IntelliJ Idea
85+
.idea
86+
*.iml
87+
*.ipr
88+
*.iws
89+
90+
# PyBuilder
91+
target/
92+
93+
# Cookiecutter
94+
output/
95+
python_boilerplate/
96+
cookiecutter-pypackage-env/
97+
98+
# vscode settings
99+
.history/
100+
*.code-workspace
101+
102+
# Frontend extension
103+
node_modules/
104+
.env
105+
.env.local
106+
.env.development.local
107+
.env.test.local
108+
.env.production.local
109+
npm-debug.log*
110+
yarn-debug.log*
111+
yarn-error.log*
112+
node.zip
113+
.vscode/
114+
.claude/
115+
.codemate/

apps/ComfyUI-vLLM-Omni/LICENSE

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Apache Software License 2.0
2+
3+
Copyright (c) 2026, Zeyu Huang
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.

0 commit comments

Comments
 (0)