Commit Graph
60 Commits
Author SHA1 Message Date
Jedrzej KosinskiandAmp fd0acd2b50 fix: update cast_bias_weight to use offloadable=True in clean_groupnorm
Use ComfyUI's updated 3-return-value cast_bias_weight API with
offloadable=True and call uncast_bias_weight after use for proper
async-offload support.

Co-authored-by: Amp <amp@ampcode.com>
Amp-Thread-ID: https://ampcode.com/threads/T-019d3bef-9580-7798-aec3-7a009a0f62a4
2026-03-29 18:37:59 -07:00
Jedrzej Kosinski afc96718fb Merge branch 'main' into multigpu 2025-01-31 04:00:44 -06:00
Jedrzej Kosinski 60a937144e Fixed BIGMAX_TENSOR to not be so big that it becomes an int64 instead of a float32, version bump 2025-01-31 03:59:05 -06:00
Jedrzej Kosinski 7fbcf03843 Values related to ad_params now obtained through transformer_options in get_control_inject, no longer requiring ADE to manually set them 2025-01-29 09:16:39 -06:00
Jedrzej Kosinski ab6526fa35 Fixed backwards compatibility for new KF scheduling behavior, changes "sigmas" to "sample_sigmas" to match incoming ComfyUI PR 2025-01-05 15:32:51 -06:00
Jedrzej Kosinski 787c841b6b Make TimestepKeyframes work consistently across separated sampling nodes/code 2024-12-30 16:59:53 -06:00
Jedrzej Kosinski dc91f47aed Add middle_mult extra via Middle Weight Extras node 2024-11-26 20:21:53 -06:00
Jedrzej Kosinski 8db35a7963 Clean up TimestepKeyframeGroup cloning so it does not keep on adding a useless default keyframe to clone each time it's called 2024-11-26 19:05:51 -06:00
Jedrzej Kosinski d255167dca Fixed soft/custom weights not affecting flux by disabling applied_to optimization when needed, fixed missing transformer_options input into default_control_actions 2024-11-26 00:02:42 -06:00
Jedrzej Kosinski 999763ce69 Add real_compression_ratio so can be adjusted to properly check for expected cond_hint size 2024-11-25 21:52:51 -06:00
Jedrzej Kosinski 72f0e6dbac Add initial CtrLoRA support, fix issue with vae not being set, add a way to disable multiplying compression_ratio by vae.downscale_ratio when not needed 2024-11-25 20:33:53 -06:00
Jedrzej Kosinski 7f84e973d6 Converted sampler_sample_wrapper to a outer_sample_wrapper so that controlnet prerun can be ran properly 2024-11-14 10:53:59 -06:00
Jedrzej Kosinski 52f8220260 Started to replace anc_sample_factory with acn_sampler_sample_wrapper WrapperHook, ReferenceCN now can respect individual conds 2024-11-14 08:12:54 -06:00
Jedrzej Kosinski f42c902fd4 Fixed checks for special preprocessor input (ReferenceCN and RGB SparseCtrl), continued work on DinkLink 2024-11-14 03:42:29 -06:00
Jedrzej Kosinski 767cbf3dcc Merge branch 'main' into rework-modelpatcher 2024-10-23 22:02:47 -05:00
Jedrzej Kosinski 95e26b9b79 Made code work with new ComfyUI changes (device var removed from ControlBase) 2024-10-23 21:57:39 -05:00
Kosinkadink f778bb2a70 Modified code to accept transformer_options to match ComfyUI's get_control change and removed need to a terribly ugly hack that was required before to get the cond_or_uncond; now can just be gotten from transformer_options 2024-09-25 20:50:20 +09:00
Jedrzej Kosinski 476da0e724 Implemented changes from ComfyUI's InstantX depth flux support commit 2024-08-30 07:09:26 -05:00
Jedrzej Kosinski 299c6d9506 Fixed flux cns not working if no soft weights attached, added ControlNet Custom Weights [Flux] node 2024-08-30 06:37:30 -05:00
Jedrzej Kosinski 9c00ec00ea Clarified Soft/Custom ControlNet SD1.5/T2I Adapter Weights nodes, deprecated old versions 2024-08-30 05:59:05 -05:00
Jedrzej Kosinski d3ceadbaba Attempted to add masking support for flux controlnet (not working yet, but logic is partway there 2024-08-29 09:57:23 -05:00
Jedrzej Kosinski 49609d318f Refactored cn weights to separate out input, middle, and output blocks, improved soft weight behavior to generalize math to be architecture agnostic (for the most part) 2024-08-24 07:31:26 -05:00
Jedrzej Kosinski 1807cd64e4 Updated ControlNetAdvanced to work with Flux controlnet, beginning of rework of weights 2024-08-24 00:43:21 -05:00
Jedrzej Kosinski d4a0a11347 Added keyframe support for ContextRef, small changes to timestep keyframe code, initial ContextRef version check 2024-08-06 05:28:06 -05:00
Jedrzej Kosinski 17b70c421a Add additional type check in len wrapper hack to prevent issues with Tensors in list 2024-08-04 21:08:43 -05:00
Jedrzej Kosinski c4aa684cb3 Fixed TimestepKeyframes being evaluated each time get_control is run instead of just once per step (technically could change results of some workflows, but now works as intended) 2024-08-04 16:23:45 -05:00
Jedrzej Kosinski ee3490d4b0 Initial working implementation of ContextRef 2024-07-27 21:08:46 -05:00
Jedrzej Kosinski cdabf60fca Automatic conversion of vanilla ControlNets to Advanced-ControlNet equivalents when context_options are detected, extracting refcn's sample wrapper to its own function, refactoring of ControlLLLite code to work without a model_optional input 2024-07-19 18:17:24 -05:00
Jedrzej Kosinski 55da9bb2d1 Initial progress on initial support of ControlNet++ model 2024-07-08 20:09:20 -05:00
Jedrzej Kosinski 3d00251fc2 modified prepare_mask_batch to work with sd3 2024-06-27 19:37:00 -05:00
Jedrzej Kosinski 96d957e9ec Fixed get_calc_pow to work the same as before (only current difference would be with SDXL T2IAdapter models with custom/soft weights), automatically resize T2IAdapter control tensors to match batch_size to make my life easier 2024-06-27 17:43:21 -05:00
Jedrzej Kosinski bc528228c7 Make 1 mask input work with T2IAdapter (some ComfyUI optimization caused feature regression at some point) 2024-06-27 12:46:06 -05:00
Jedrzej Kosinski 86e6ed301e Fixed control weights not being applied properly 2024-06-27 11:15:03 -05:00
Jedrzej Kosinski e800d52acf Made all controlnets works with upcoming ComfyUI changes, started work on making latent preprocs obsolete, still need to make control weights apply the same way as before 2024-06-27 05:03:10 -05:00
Jedrzej Kosinski 20d54c0660 Added support for weight extras, added sparse_hint_mult, sparse_nonhint_mult, and sparse_mask_strength for SparseCtrl, renamed Force Default Weights node to Default Weights 2024-05-27 18:49:28 -05:00
Jedrzej Kosinski 1f95fac964 Fixed odd behavior when context options are active and there are less condhints than latents, condhints/masks are extended (last image/mask) instead of repeated, starting to work on uncond_mask to extend uncond_multiplier feature, modified motion_strength > 1.0 behavior 2024-05-24 00:11:26 -05:00
Jedrzej Kosinski bed20c2e28 Fixed contains_uncond_multipier tailend recursion instead of returning False 2024-05-17 03:24:23 -05:00
Jedrzej Kosinski ab894722f6 Made len hack for uncond_multiplier more robust 2024-05-16 21:20:09 -05:00
Jedrzej Kosinski 86c528ddab Make uncond_multiplier work with ControlLLLite 2024-05-16 17:55:06 -05:00
Jedrzej Kosinski 4ed14e9ae0 Make T2IAdapter work with uncond_multiplier (results are not great when < 1.0, but match up exactly with auto1111 results) 2024-05-16 17:40:46 -05:00
Jedrzej Kosinski db0bf14dac Add support for uncond_multiplier in all Control Weights (identical to auto1111's 'controlnet is more important when set to 0.0) 2024-05-16 04:15:36 -05:00
Jedrzej Kosinski f61c3e2be3 Fix Timestep Keyframe Interpolation/From List nodes 2024-05-14 23:30:22 -05:00
Jedrzej Kosinski cdfbdc0bbe Refactored Timestep Keyframes to use guarantee_steps instead of guarantee_usage, Timestep Keyframes with same start_percent will no longer overwrite one another, allowing guarantee_steps to be used to schedule on a per-step basis without worrying about unique start_percents, added Timestep Keyframe Interpolation and From List nodes to ease creation of Timestep Keyframe schedules, small cleanup/upkeep 2024-05-14 04:05:18 -05:00
Jedrzej Kosinski 0556fd2265 Fixed SparseCtrl not working with lowvram 2024-04-04 14:35:28 -05:00
Jedrzej Kosinski 3bf357e662 Removed extra empty line I accidentally added 2024-04-02 23:43:49 -05:00
Jedrzej Kosinski 3e975bb841 Fix for cases where predefined weights length doesn't match expected layer lengths (will need to generalize for for ControlLora to properly do soft weights for actual layer number) 2024-04-02 23:40:48 -05:00
Jedrzej Kosinski cb309c6078 Added initial reference_adain and reference_adain+attn support 2024-04-01 03:44:11 -05:00
Jedrzej Kosinski 829d10ddc0 Fixed BIGMIN and BIGMAX to conform with javascript limits, pretty-fied deprecated node 2024-03-31 01:30:07 -05:00
Jedrzej Kosinski e5841d1759 Added latent_kf and masking support (masks don't work per-area currently, but do work per-latent) 2024-03-31 00:34:56 -05:00
Jedrzej Kosinski 111632917c Cleaned up ref cn so I can add more features 2024-03-30 04:02:44 -05:00