Ryan Dick
|
bb947c6162
|
Make FLUX controlnet node API more like SD API and get it working with linear UI.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
a654dad20f
|
Remove instantx_control_mode from FLUX ControlNet node.
|
2024-10-10 07:59:29 -04:00 |
|
Mary Hipp
|
2bd44662f3
|
possibly a working FLUX controlnet graph
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
e7f9086006
|
Fix bug with InstantX input image range.
|
2024-10-10 07:59:29 -04:00 |
|
Mary Hipp
|
5141be8009
|
hide Control Mode for FLUX control net layer
|
2024-10-10 07:59:29 -04:00 |
|
Mary Hipp
|
eacdfc660b
|
ui: enable controlnet controls when FLUX is main model, update schema
|
2024-10-10 07:59:29 -04:00 |
|
maryhipp
|
5fd3c39431
|
update prepreprocessor logic to be more resilient
|
2024-10-10 07:59:29 -04:00 |
|
maryhipp
|
7daf3b7d4a
|
update starter models to include FLUX controlnets
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
908f65698d
|
Fix support for InstantX non-union models (with no single blocks).
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
63c4ac58e9
|
Support installing InstantX ControlNet models from diffusers directory format.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
8c125681ea
|
Skip tests that are failing on MacOS CI runners (for now).
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
118f0ba3bf
|
Revert "Try to fix test failures affecting MacOS CI runners."
This reverts commit 216b36c75d.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
b3b7d084d0
|
Try to fix test failures affecting MacOS CI runners.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
812940eb95
|
(minor) Add comment about future memory optimization.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
0559480dd6
|
Shift the controlnet-type-specific logic into the specific ControlNet extensions and make the FLUX model controlnet-type-agnostic.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
d99e7dd4e4
|
Add instantx_control_mode param to FLUX ControlNet invocation.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
e854181417
|
Create a dedicated FLUX ControlNet invocation.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
de414c09fd
|
Bugfixes to get InstantX ControlNet working.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
ce4624f72b
|
Update ControlNetCheckpointProbe.get_base_type() to work with InstantX.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
47c7df3476
|
Fix circular imports related to XLabsControlNetFluxOutput and InstantXControlNetFluxOutput.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
4289b5e6c3
|
Add instantx controlnet logic to FLUX model forward().
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
c8d1d14662
|
Work on integrating InstantX into denoise process.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
44c588d778
|
Rename DiffusersControlNetFlux -> InstantXControlNetFlux.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
d75ac56d00
|
Create flux/extensions directory.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
714dd5f0be
|
Update FluxControlnetModel to work with both XLabs and InstantX.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
2f4d3cb5e6
|
Add unit test to test the full flow of loading an InstantX ControlNet from a state dict.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
b76555bda9
|
Add unit test for infer_instantx_num_control_modes_from_state_dict().
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
1cdd501a0a
|
Add unit test for infer_flux_params_from_state_dict(...).
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
1125218bc5
|
Update FLUX ControlNet unit test state dicts to include shapes.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
683504bfb5
|
Add scripts/extract_sd_keys_and_shapes.py
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
03cf953398
|
First pass of utility function to infer the FluxParams from a state dict.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
24c115663d
|
Add unit test for convert_diffusers_instantx_state_dict_to_bfl_format(...) and fix a few bugs.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
a9e7ecad49
|
Finish first draft of convert_diffusers_instantx_state_dict_to_bfl_format(...).
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
76f4766324
|
WIP - implement convert_diffusers_instantx_state_dict_to_bfl_format(...).
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
3dfc242f77
|
(minor) rename other_forward() -> forward()
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
1e43389cb4
|
Add utils for detecting XLabs ControlNet vs. InstantX ControlNet from
state dict.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
cb33de34f7
|
Migrate DiffusersControlNetFlux from diffusers-style to BFL-style.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
7562ea48dc
|
Improve typing of zero_module().
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
83f4700f5a
|
Use top-level torch import for all torch stuff.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
704e7479b2
|
Remove DiffusersControlNetFlux.from_transformer(...).
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
5f44559f30
|
Fixup typing around DiffusersControlNetFluxOutput.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
7a22819100
|
Remove gradient checkpointing from DiffusersControlNetFlux.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
70495665c5
|
Remove FluxMultiControlNetModel
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
ca30acc5b4
|
Remove LoRA stuff from DiffusersCotnrolNetFlux.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
8121843d86
|
Remove logic for modifying attn processors from DiffusersControlNetFlux.
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
bc0ded0a23
|
Rename FluxControlNetModel -> DiffusersControlNetFlux
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
30f6034f88
|
Start updating imports for FluxControlNetModel
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
7d56a8ce54
|
Copy model from 99f608218c/src/diffusers/models/controlnet_flux.py
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
e7dc439006
|
Rename ControlNetFlux -> XLabsControlNetFlux
|
2024-10-10 07:59:29 -04:00 |
|
Ryan Dick
|
bce5a93eb1
|
Add InstantX FLUX ControlNet state dict for unit testing.
|
2024-10-10 07:59:29 -04:00 |
|