Ryan Dick
|
dde54740c5
|
Test out IP-Adapter with CFG.
|
2024-10-21 15:47:17 +00:00 |
|
Ryan Dick
|
fdccdd52d5
|
Fixes to get XLabsIpAdapterExtension running.
|
2024-10-21 15:43:00 +00:00 |
|
Ryan Dick
|
31ffd73423
|
Initial draft of integrating FLUX IP-Adapter inference support.
|
2024-10-21 15:42:56 +00:00 |
|
Ryan Dick
|
3fa1012879
|
Add IPAdapterDoubleBlocks wrapper to tidy FLUX ip-adapter handling.
|
2024-10-21 15:38:50 +00:00 |
|
Ryan Dick
|
c2a8fbd8d6
|
(minor) Move infer_xlabs_ip_adapter_params_from_state_dict(...) to state_dict_utils.py.
|
2024-10-21 15:38:50 +00:00 |
|
Ryan Dick
|
d6643d7263
|
Add model loading code for xlabs FLUX IP-Adapter (not tested).
|
2024-10-21 15:38:50 +00:00 |
|
Ryan Dick
|
f939dbdc33
|
Add is_state_dict_xlabs_ip_adapter() utility function.
|
2024-10-21 15:38:50 +00:00 |
|
Ryan Dick
|
24a0ca86f5
|
Add logic for loading an Xlabs IP-Adapter from a state dict.
|
2024-10-21 15:38:50 +00:00 |
|
Ryan Dick
|
95c30f6a8b
|
Add initial logic for inferring FLUX IP-Adapter params from a state_dict.
|
2024-10-21 15:38:50 +00:00 |
|
Ryan Dick
|
ac7441e606
|
Fixup typing/imports for IPDoubleStreamBlockProcessor.
|
2024-10-21 15:38:50 +00:00 |
|
Ryan Dick
|
9c9af312fe
|
Copy IPDoubleStreamBlockProcessor from 47495425db/src/flux/modules/layers.py (L221).
|
2024-10-21 15:38:50 +00:00 |
|
Ryan Dick
|
32c7cdd856
|
Add cfg_scale_start_step and cfg_scale_end_step to FLUX Denoise node.
|
2024-10-21 14:52:02 +00:00 |
|
Ryan Dick
|
6df4ee5fc8
|
Make negative_text_conditioning nullable on FLUX Denoise invocation.
|
2024-10-18 20:31:27 +00:00 |
|
Ryan Dick
|
371742d8f9
|
Add support for cfg_scale list on FLUX Denoise node.
|
2024-10-18 20:14:47 +00:00 |
|
Ryan Dick
|
73d4c4d56d
|
Naive implementation of CFG for FLUX.
|
2024-10-16 16:22:35 +00:00 |
|
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 |
|