69 Commits

Author	SHA1	Message	Date
Ryan Dick	6d7314ac0a	Consolidate the LayerPatching patching modes into a single implementation.	2024-12-24 15:57:54 +00:00
Ryan Dick	80db9537ff	Rename model_patcher.py -> layer_patcher.py.	2024-12-24 15:57:54 +00:00
Ryan Dick	61253b91f1	Enable LoRAPatcher.apply_smart_lora_patches(...) throughout the stack.	2024-12-24 15:57:54 +00:00
Mary Hipp	c154d833b9	raise error if control lora used with schnell	2024-12-18 10:19:28 -05:00
Ryan Dick	dd09509dbd	Rename ModelPatcher -> LayerPatcher to avoid conflicts with another ModelPatcher definition.	2024-12-17 13:20:19 +00:00
Ryan Dick	7fad4c9491	Rename LoRAModelRaw to ModelPatchRaw.	2024-12-17 13:20:19 +00:00
Ryan Dick	b820862eab	Rename ModelPatcher methods to reflect that they are general model patching methods and are not LoRA-specific.	2024-12-17 13:20:19 +00:00
Ryan Dick	c604a0956e	Rename LoRAPatcher -> ModelPatcher.	2024-12-17 13:20:19 +00:00
Ryan Dick	41664f88db	Rename backend/patches/conversions/ to backend/patches/lora_conversions/	2024-12-17 13:20:19 +00:00
Ryan Dick	42f8d6aa11	Rename backend/lora/ to backend/patches	2024-12-17 13:20:19 +00:00
Ryan Dick	a4bed7aee3	Minor tidy of FLUX control LoRA implementation. (mostly documentation)	2024-12-17 07:28:45 -05:00
Ryan Dick	d84adfd39f	Clean up FLUX control LoRA pre-processing logic.	2024-12-17 07:28:45 -05:00
Brandon Rising	046d19446c	Rename Structural Lora to Control Lora	2024-12-17 07:28:45 -05:00
Brandon Rising	f53da60b84	Lots of updates centered around using the lora patcher rather than changing the modules in the transformer model	2024-12-17 07:28:45 -05:00
Brandon Rising	5a035dd19f	Support bnb quantized nf4 flux models, Use controlnet vae, only support 1 structural lora per transformer. various other refractors and bugfixes	2024-12-17 07:28:45 -05:00
Brandon Rising	f3b253987f	Initial setup for flux tools control loras	2024-12-17 07:28:45 -05:00
Jonathan	bb0ed5dc8a	Update flux_denoise.py ... Updated node version for FLUX Denoise.	2024-11-30 08:29:21 -05:00
Ryan Dick	53abdde242	Update Flux RegionalPromptingExtension to prepare both a mask with restricted image self-attention and a mask with unrestricted image self attention.	2024-11-25 22:04:23 +00:00
Ryan Dick	3741a6f5e0	Fix device handling for regional masks and apply the attention mask in the FLUX double stream block.	2024-11-25 16:02:03 +00:00
Ryan Dick	20356c0746	Fixup the logic for preparing FLUX regional prompt attention masks.	2024-11-21 22:46:25 +00:00
Ryan Dick	fda7aaa7ca	Pass RegionalPromptingExtension down to the CustomDoubleStreamBlockProcessor in FLUX.	2024-11-20 19:48:04 +00:00
Ryan Dick	85c616fa34	WIP - Pass prompt masks to FLUX model during denoising.	2024-11-20 18:51:43 +00:00
Jonathan	2f6b035138	Update flux_denoise.py ... Added a bool to allow the node user to add noise in to initial latents (default) or to leave them alone.	2024-11-07 08:44:10 -05:00
psychedelicious	61496fdcbc	fix(nodes): load IP Adapter images as RGB ... FLUX IP Adapter only works with RGB. Did the same for non-FLUX to be safe & consistent, though I don't think it's strictly necessary.	2024-10-23 08:34:15 +10:00
Ryan Dick	5cbe89afdd	Merge branch 'main' into ryan/flux-ip-adapter-cfg-2	2024-10-22 21:17:36 +00:00
Ryan Dick	d20b894a61	Add cfg_scale_start_step and cfg_scale_end_step to FLUX Denoise node.	2024-10-23 07:59:48 +11:00
Ryan Dick	20362448b9	Make negative_text_conditioning nullable on FLUX Denoise invocation.	2024-10-23 07:59:48 +11:00
Ryan Dick	5df10cc494	Add support for cfg_scale list on FLUX Denoise node.	2024-10-23 07:59:48 +11:00
Ryan Dick	da171114ea	Naive implementation of CFG for FLUX.	2024-10-23 07:59:48 +11:00
Ryan Dick	e48cab0276	Only allow a single image prompt for FLUX IP-Adapters (haven't really looked into this much, but punting on it for now).	2024-10-22 16:32:01 +00:00
psychedelicious	d1bb4c2c70	fix(nodes): FluxDenoiseInvocation.controlnet_vae missing default=None	2024-10-22 10:54:15 +11:00
Ryan Dick	73bbb12f7a	Use a black image as the negative IP prompt for parity with X-Labs implementation.	2024-10-21 15:47:22 +00:00
Ryan Dick	dde54740c5	Test out IP-Adapter with CFG.	2024-10-21 15:47:17 +00:00
Ryan Dick	31ffd73423	Initial draft of integrating FLUX IP-Adapter inference support.	2024-10-21 15:42:56 +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	683f9a70e7	Restore instantx_control_mode field on FLUX ControlNet invocation.	2024-10-10 15:25:30 +00:00
Ryan Dick	4aace24f1f	Reduce peak memory utilization when preparing FLUX controlnet inputs.	2024-10-10 00:18:46 +00:00
Ryan Dick	b1567fe0e4	Make FLUX controlnet node API more like SD API and get it working with linear UI.	2024-10-09 23:38:31 +00:00
Ryan Dick	3953e60a4f	Remove instantx_control_mode from FLUX ControlNet node.	2024-10-09 22:00:54 +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	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	a24581ede2	Create flux/extensions directory.	2024-10-09 14:17:42 +00:00
Ryan Dick	d1a0e99701	Rename ControlNetFlux -> XLabsControlNetFlux	2024-10-09 14:17:42 +00:00