-
Notifications
You must be signed in to change notification settings - Fork 454
[model]Add UltraFlux-v1-image support #611
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
Open
erfgss
wants to merge
58
commits into
vllm-project:main
Choose a base branch
from
erfgss:feat/UltraFlux-v1-image
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,974
−6
Open
Changes from all commits
Commits
Show all changes
58 commits
Select commit
Hold shift + click to select a range
7a69c19
feat/UltraFlux-v1-image
erfgss 0818688
feat/UltraFlux-v1-image
erfgss d117835
feat/UltraFlux-v1-image
erfgss 159fba2
[Bugfix] Raise ValueError when joint_strategy='rear' and causal=True …
mxuax f130723
[Feat] add vllm-omni version collection (#740)
sihyeonn 060bb48
feat/UltraFlux-v1-image
erfgss cc50071
feat/UltraFlux-v1-image
erfgss 793ad0d
feat/UltraFlux-v1-image
erfgss 098473c
feat/UltraFlux-v1-image
erfgss 789930c
feat/UltraFlux-v1-image
erfgss 059ec13
feat/UltraFlux-v1-image
erfgss 3adc8db
feat/UltraFlux-v1-image
erfgss bb0618f
feat/UltraFlux-v1-image
erfgss 074cb93
[Doc] refactor diffusion doc (#753)
ZJY0516 cc733a1
feat/UltraFlux-v1-image
erfgss 31c245f
[Bugfix] Fix stable diffusion3 compatibility error (#772)
iwzbi 2bab2c0
[Feature] Support Qwen3 Omni talker mtp batch inference (#722)
ZeldaHuang 35b5a7a
[BugFix]Remove duplicate error handling for request results (#781)
liuyuhanalex 28a5793
[CI] Add pytest markers in config files. (#719)
congw729 63febde
[Doc] Fix mkdocs. (#785)
congw729 5213905
[Bugfix] Fix generation artifacts of Qwen-Image-Edit-2511 and update …
SamitHuang 91de0c4
[bugfix] Fix Wan2.2 I2V warmup failure by adding support_image_input …
linyueqian 00b2e6c
[Misc] add wechat group and star history on README (#801)
david6666666 473643b
[BugFix] Fix incorrect mrope positions under cuda graph (#803)
ZeldaHuang ae12cc8
[BugFix] Qwen2.5-omni supress end token and won't stop (#773)
yinpeiqi cc0e014
[Feature] Flash Attention to Support Attention Mask (#760)
wtomin 99f3c80
feat/UltraFlux-v1-image
erfgss 848ac69
feat/UltraFlux-v1-image
erfgss 4dfc48d
feat/UltraFlux-v1-image
erfgss 54b57f8
[bugfix] use unipc scheduler for Wan 2.2 (#804)
linyueqian 2be4577
[Test] Add full test for Qwen3-Omni-30B-A3B-Instruct (#720)
yenuo26 102d114
[Bagel] Support Cache-Dit (#736)
princepride ed9fb0a
[Perf] Optimize the Qwen2.5-Omni Model thinker-to-talker-proj with nn…
kechengliu97 2c43fe8
[Core]Add GPU Diffusion Runner (#822)
princepride bf5d081
feat/UltraFlux-v1-image
erfgss 5042c97
feat/UltraFlux-v1-image
erfgss e45994c
[Model] add flux2 klein (#809)
erfgss b04bf98
feat/UltraFlux-v1-image
erfgss 67a48fb
feat/UltraFlux-v1-image
erfgss 47fd0c6
Merge branch 'main' into feat/UltraFlux-v1-image
erfgss 3cc5cfb
feat/UltraFlux-v1-image
erfgss 21e2132
feat/UltraFlux-v1-image
erfgss f626c02
feat/UltraFlux-v1-image
erfgss 8ee88ae
feat/UltraFlux-v1-image
erfgss efacd5e
Merge branch 'main' into feat/UltraFlux-v1-image
erfgss c0c5ace
Merge branch 'main' into feat/UltraFlux-v1-image
erfgss c088962
feat/UltraFlux-v1-image
erfgss 32fe65d
feat/UltraFlux-v1-image
erfgss f085fe3
feat/UltraFlux-v1-image
erfgss e643b8b
feat/UltraFlux-v1-image
erfgss 781a16a
feat/UltraFlux-v1-image
erfgss f58a207
feat/UltraFlux-v1-image
erfgss 43eab3a
feat/UltraFlux-v1-image
erfgss d8a81e5
Merge branch 'main' into feat/UltraFlux-v1-image
erfgss 7346450
Merge branch 'main' into feat/UltraFlux-v1-image
erfgss 7ac98e2
Merge branch 'main' into feat/UltraFlux-v1-image
erfgss d24ca44
Merge branch 'main' into feat/UltraFlux-v1-image
erfgss 3d8dfb3
Merge branch 'main' into feat/UltraFlux-v1-image
erfgss File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -346,6 +346,55 @@ def refresh_cache_context(pipeline: Any, num_inference_steps: int, verbose: bool | |
| return refresh_cache_context | ||
|
|
||
|
|
||
| def enable_cache_for_ultraflux(pipeline: Any, cache_config: Any) -> Callable[[int], None]: | ||
| db_cache_config = _build_db_cache_config(cache_config) | ||
|
|
||
| calibrator = None | ||
| if cache_config.enable_taylorseer: | ||
| taylorseer_order = cache_config.taylorseer_order | ||
| calibrator = TaylorSeerCalibratorConfig(taylorseer_order=taylorseer_order) | ||
| logger.info(f"TaylorSeer enabled with order={taylorseer_order}") | ||
|
|
||
| modifier = ParamsModifier(cache_config=db_cache_config, calibrator_config=calibrator) | ||
|
|
||
| logger.info( | ||
| "Enabling cache-dit on Flux transformer blocks with BlockAdapter: " | ||
| f"Fn={db_cache_config.Fn_compute_blocks}, " | ||
| f"Bn={db_cache_config.Bn_compute_blocks}, " | ||
| f"W={db_cache_config.max_warmup_steps}, " | ||
| ) | ||
|
|
||
| transformer = pipeline.transformer | ||
| cache_dit.enable_cache( | ||
| BlockAdapter( | ||
| transformer=transformer, | ||
| blocks=[transformer.transformer_blocks, transformer.single_transformer_blocks], | ||
| forward_pattern=[ForwardPattern.Pattern_1, ForwardPattern.Pattern_1], | ||
| params_modifiers=[modifier], | ||
| ), | ||
| cache_config=db_cache_config, | ||
| ) | ||
|
|
||
| def refresh_cache_context(pipeline: Any, num_inference_steps: int, verbose: bool = True) -> None: | ||
| if cache_config.scm_steps_mask_policy is None: | ||
| cache_dit.refresh_context(pipeline.transformer, num_inference_steps=num_inference_steps, verbose=verbose) | ||
| else: | ||
| cache_dit.refresh_context( | ||
| pipeline.transformer, | ||
| cache_config=DBCacheConfig().reset( | ||
| num_inference_steps=num_inference_steps, | ||
| steps_computation_mask=cache_dit.steps_mask( | ||
| mask_policy=cache_config.scm_steps_mask_policy, | ||
| total_steps=num_inference_steps, | ||
| ), | ||
| steps_computation_policy=cache_config.scm_steps_policy, | ||
| ), | ||
| verbose=verbose, | ||
| ) | ||
|
|
||
| return refresh_cache_context | ||
|
|
||
|
|
||
| def enable_cache_for_sd3(pipeline: Any, cache_config: Any) -> Callable[[int], None]: | ||
| """Enable cache-dit for StableDiffusion3Pipeline. | ||
|
|
||
|
|
@@ -859,8 +908,9 @@ def refresh_cache_context(pipeline: Any, num_inference_steps: int, verbose: bool | |
| "Wan22I2VPipeline": enable_cache_for_wan22, | ||
| "Wan22TI2VPipeline": enable_cache_for_wan22, | ||
| "FluxPipeline": enable_cache_for_flux, | ||
| "LongCatImagePipeline": enable_cache_for_longcat_image, | ||
| "LongCatImageEditPipeline": enable_cache_for_longcat_image, | ||
| "UltraFluxPipeline": enable_cache_for_ultraflux, | ||
| "LongcatImagePipeline": enable_cache_for_longcat_image, | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
| "LongcatImageEditPipeline": enable_cache_for_longcat_image, | ||
| "StableDiffusion3Pipeline": enable_cache_for_sd3, | ||
| "BagelPipeline": enable_cache_for_bagel, | ||
| } | ||
|
|
@@ -978,4 +1028,5 @@ def may_enable_cache_dit(pipeline: Any, od_config: OmniDiffusionConfig) -> Optio | |
|
|
||
| backend = CacheDiTBackend(od_config.cache_config) | ||
| backend.enable(pipeline) | ||
|
|
||
| return backend if backend.is_enabled() else None | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # UltraFlux diffusion model integration for vLLM-Omni | ||
|
|
||
| from .pipeline_ultraflux import UltraFluxPipeline | ||
|
|
||
| __all__ = [ | ||
| "UltraFluxPipeline", | ||
| ] |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Looks like this diff might have accidentally removed the three Qwen3-TTS entries — probably a rebase artifact? The UltraFlux line should be added alongside them.