Ryan Dick
4aace24f1f
Reduce peak memory utilization when preparing FLUX controlnet inputs.
2024-10-10 00:18:46 +00:00
Ryan Dick
3953e60a4f
Remove instantx_control_mode from FLUX ControlNet node.
2024-10-09 22:00:54 +00:00
Ryan Dick
8b1ef4b902
Fix bug with InstantX input image range.
2024-10-09 19:38:30 +00:00
Ryan Dick
859944f848
Fix support for InstantX non-union models (with no single blocks).
2024-10-09 18:51:53 +00:00
Ryan Dick
8bf8742984
(minor) Add comment about future memory optimization.
2024-10-09 16:16:04 +00:00
Ryan Dick
c78eeb1645
Shift the controlnet-type-specific logic into the specific ControlNet extensions and make the FLUX model controlnet-type-agnostic.
2024-10-09 16:12:09 +00:00
Ryan Dick
cd88723a80
Add instantx_control_mode param to FLUX ControlNet invocation.
2024-10-09 14:17:42 +00:00
Ryan Dick
dea6cbd599
Create a dedicated FLUX ControlNet invocation.
2024-10-09 14:17:42 +00:00
Ryan Dick
0dd9f1f772
Bugfixes to get InstantX ControlNet working.
2024-10-09 14:17:42 +00:00
Ryan Dick
a783539cd2
Fix circular imports related to XLabsControlNetFluxOutput and InstantXControlNetFluxOutput.
2024-10-09 14:17:42 +00:00
Ryan Dick
2f8f30b497
Add instantx controlnet logic to FLUX model forward().
2024-10-09 14:17:42 +00:00
Ryan Dick
f878e5e74e
Work on integrating InstantX into denoise process.
2024-10-09 14:17:42 +00:00
Ryan Dick
bfc460a5c6
Rename DiffusersControlNetFlux -> InstantXControlNetFlux.
2024-10-09 14:17:42 +00:00
Ryan Dick
a24581ede2
Create flux/extensions directory.
2024-10-09 14:17:42 +00:00
Ryan Dick
80bc4ebee3
Add unit test to test the full flow of loading an InstantX ControlNet from a state dict.
2024-10-09 14:17:42 +00:00
Ryan Dick
c7628945c4
Add unit test for infer_flux_params_from_state_dict(...).
2024-10-09 14:17:42 +00:00
Ryan Dick
2cd14dd066
First pass of utility function to infer the FluxParams from a state dict.
2024-10-09 14:17:42 +00:00
Ryan Dick
5872f05342
Add unit test for convert_diffusers_instantx_state_dict_to_bfl_format(...) and fix a few bugs.
2024-10-09 14:17:42 +00:00
Ryan Dick
4ad135c6ae
Finish first draft of convert_diffusers_instantx_state_dict_to_bfl_format(...).
2024-10-09 14:17:42 +00:00
Ryan Dick
c72c2770fe
WIP - implement convert_diffusers_instantx_state_dict_to_bfl_format(...).
2024-10-09 14:17:42 +00:00
Ryan Dick
e733a1f30e
(minor) rename other_forward() -> forward()
2024-10-09 14:17:42 +00:00
Ryan Dick
4be3a33744
Add utils for detecting XLabs ControlNet vs. InstantX ControlNet from
...
state dict.
2024-10-09 14:17:42 +00:00
Ryan Dick
1751c380db
Migrate DiffusersControlNetFlux from diffusers-style to BFL-style.
2024-10-09 14:17:42 +00:00
Ryan Dick
16cda33025
Improve typing of zero_module().
2024-10-09 14:17:42 +00:00
Ryan Dick
8308e7d186
Use top-level torch import for all torch stuff.
2024-10-09 14:17:42 +00:00
Ryan Dick
c0aab56d08
Remove DiffusersControlNetFlux.from_transformer(...).
2024-10-09 14:17:42 +00:00
Ryan Dick
1795f4f8a2
Fixup typing around DiffusersControlNetFluxOutput.
2024-10-09 14:17:42 +00:00
Ryan Dick
5bfd2ec6b7
Remove gradient checkpointing from DiffusersControlNetFlux.
2024-10-09 14:17:42 +00:00
Ryan Dick
a35b229a9d
Remove FluxMultiControlNetModel
2024-10-09 14:17:42 +00:00
Ryan Dick
e93da5d4b2
Remove LoRA stuff from DiffusersCotnrolNetFlux.
2024-10-09 14:17:42 +00:00
Ryan Dick
a17ea9bfad
Remove logic for modifying attn processors from DiffusersControlNetFlux.
2024-10-09 14:17:42 +00:00
Ryan Dick
3578010ba4
Rename FluxControlNetModel -> DiffusersControlNetFlux
2024-10-09 14:17:42 +00:00
Ryan Dick
459cf52043
Start updating imports for FluxControlNetModel
2024-10-09 14:17:42 +00:00
Ryan Dick
9bcb93f575
Copy model from 99f608218c/src/diffusers/models/controlnet_flux.py
2024-10-09 14:17:42 +00:00
Ryan Dick
d1a0e99701
Rename ControlNetFlux -> XLabsControlNetFlux
2024-10-09 14:17:42 +00:00
Ryan Dick
36515e1e2a
Add support for FLUX controlnet weight, begin_step_percent and end_step_percent.
2024-10-09 14:17:42 +00:00
Ryan Dick
c81bb761ed
First pass at integrating FLUX ControlNets into the FLUX Denoise invocation.
2024-10-09 14:17:42 +00:00
Ryan Dick
62d12e6468
Fix type errors and imporve docs for ControlNetFlux.
2024-10-09 14:17:41 +00:00
Ryan Dick
9541156ce5
Remove gradient checkpointing from ControlNetFlux.
2024-10-09 14:17:41 +00:00
Ryan Dick
eb5b6625ea
Remove ControlNetFlux logic related to attn processor overrides.
2024-10-09 14:17:41 +00:00
Ryan Dick
9758e5a622
Remove duplicate FluxParams class.
2024-10-09 14:17:41 +00:00
Ryan Dick
58eba8bdbd
Fix FLUX module imports for ControlNetFlux.
2024-10-09 14:17:41 +00:00
Ryan Dick
2821ba8967
Copy ControlNetFlux model from 47495425db/src/flux/controlnet.py.
2024-10-09 14:17:41 +00:00
Kent Keirsey
969f8b8e8d
ruff update
2024-10-08 08:56:26 -04:00
David Burnett
ccb5f90556
Get Flux working on MPS when torch 2.5.0 test or nightlies are installed.
2024-10-08 08:56:26 -04:00
Ryan Dick
bdeec54886
Remove FLUX TrajectoryGuidanceExtension and revert to the InpaintExtension. Keep the improved inpaint gradient mask adjustment behaviour.
2024-09-26 19:54:28 -04:00
Ryan Dick
8d50ecdfc3
Update docs explaining inpainting trajectory guidance.
2024-09-26 19:54:28 -04:00
Ryan Dick
ba07e255f5
Add support for fractional denoise start and end with FLUX.
2024-09-26 19:54:28 -04:00
Ryan Dick
fae96f3b9f
Remove trajectory_guidance_strength parameter.
2024-09-26 19:54:28 -04:00
psychedelicious
dc10197615
fix(app): step callbacks for SD, FLUX, MultiDiffusion
...
Each of these was a bit off:
- The SD callback started at `-1` and ended at `i`. Combined w/ the weird math on the previous `calc_percentage` util, this caused the progress bar to never finish.
- The MultiDiffusion callback had the same problems as SD.
- The FLUX callback didn't emit a pre-denoising step 0 image. It also reported total_steps as 1 higher than the actual step count.
Each of these now emit the expected events to the frontend:
- The initial latents at 0%
- Progress at each step, ending at 100%
2024-09-22 21:20:32 +03:00
