Commit Graph
114 Commits
Author SHA1 Message Date
Jedrzej Kosinski ce72ce674f Add single cond version of Apply Advanced ControlNet node 2024-08-30 05:04:17 -05:00
Jedrzej Kosinski a9e9ec7b92 Fix inconsistent variable name causing reference before assignment error 2024-08-30 03:28:01 -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
zhiselfly 45e56c3003 Fixed the "doesn't match the broadcast shape" issue in ControlNet++ (Multi) when there are two or more Inputs due to insufficient memory 2024-08-23 21:41:11 +08:00
Jedrzej Kosinski dd7e29e5c2 Make SparseCtrl work with new ComfyUI ModelPatcher updates 2024-08-20 05:09:30 -05:00
Jedrzej Kosinski bbb3ca56c4 Comment out logging for nodes with no documentation 2024-08-14 20:27:00 -05:00
Austin Mroz 0510ba4c42 Port documentation functionality to ACN 2024-08-14 19:00:28 -05:00
Jedrzej Kosinski 2303845a02 Added a value for future ContextRef version compatibility checks 2024-08-08 02:50:04 -05:00
Jedrzej Kosinski 800af8f69f Added support for ContextRef mode_replace and tune_replace, fixed orig_forware_timestep_embed not being properly restored for ContextRef adain, ReferenceCN options are schedulable in the backed (no nodes added yet) 2024-08-07 02:40:36 -05:00
Jedrzej Kosinski 6b77eab348 Renamed Interpolation to Interp. in node names to let the nodes be visually smaller 2024-08-06 20:06:21 -05:00
Jedrzej Kosinski 9236a91eb2 Merge branch 'main' into develop 2024-08-06 17:34:33 -05:00
Jedrzej Kosinski 47d0115912 Remove current_device from ModelPatcher init to match latest ComfyUI, fix pyproject.tomp license field 2024-08-06 17:28:56 -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 15308a39f3 Added offloading for stored cached_n value to avoid OOMs when a lot of conds are present + higher resolutions 2024-08-04 22:35:46 -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 2af647de56 Added adain support for ContextRef, fixed ref_weight less than 1.0 index error 2024-08-02 17:04:22 -05:00
Jedrzej Kosinski f25e35f1fe Fixed READ_WRITE state for ContextRef behaving like READ state instead 2024-07-31 21:04:52 -05:00
Jedrzej Kosinski f1916a4a0b Added ability to READ and WRITE ContextRef in one go, for the purposes of adding a sliding reference window 2024-07-31 06:32:21 -05:00
Jedrzej Kosinski 413c95edcc Modified ControlRef to keep track of one cond at a time - ensured by AnimateDiff-Evolved 2024-07-28 19:11:23 -05:00
Jedrzej Kosinski ee3490d4b0 Initial working implementation of ContextRef 2024-07-27 21:08:46 -05:00
Jedrzej Kosinski 7685abd592 Massive rework of ReferenceCN code to soon support ContextRef for AnimateDiff-Evolved 2024-07-27 18:54:41 -05:00
Jedrzej Kosinski cc686c21b3 Fix dtype issue when ControlLLLite models activated/deactivated in specific order 2024-07-20 00:52:40 -05:00
Jedrzej Kosinski ca5d63cb33 Fixed issues with ControlLLLite refactor 2024-07-19 19:38:37 -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 906ef7f2c6 Remove exception when ControlNet++ is detected and not using ControlNet++ nodes 2024-07-18 14:05:40 -05:00
Jedrzej Kosinski a895854a8e Fix ControlNet++ lowvram issue with task_embedding 2024-07-18 14:04:24 -05:00
Jedrzej Kosinski 82a5735596 Added autosize param to some nodes, renamed timestep_keyframe to tk_optional on Load Advanced ControlNet nodes 2024-07-15 21:37:03 -05:00
Jedrzej Kosinski 36fdc79e2c Made 'none' control_type default for Load ControlNet++ Model (Single) node 2024-07-15 02:52:51 -05:00
Jedrzej Kosinski e7434e9fa0 fixed msg typo and unfinished comment 2024-07-15 02:47:18 -05:00
Jedrzej Kosinski fa48109769 Support 'none' type in Load ControlNet++ Model (Single) node to reproduce vanilla ComfyUI results (no type is assigned), more cleanup 2024-07-15 02:42:11 -05:00
Jedrzej Kosinski 932ec9bb84 Cleaned up cn++ code 2024-07-15 01:51:27 -05:00
Jedrzej Kosinski c11df190ad ControlNet++ ProMax support, added Load ControlNet++ Model (Single) node in cases where multi-support is not needed, removed requirements.txt singe it was empty since the day ACN was created 2024-07-15 00:31:27 -05:00
Jedrzej Kosinski 3572107bda Previous progress on using vanilla ComfyUI controlnet support 2024-07-14 22:44:12 -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 4454c47707 Added sd3 support from upcoming ComfyUI update 2024-06-27 18:23:10 -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 7e7fdf0b83 Also reverse T2IAdapter's get_calc_pow 2024-06-27 13:59:43 -05:00
Jedrzej Kosinski 4646bb3a2b Reverse T2IAdapter weights to account for ComfyUI changes (means SDXL T2IAdapter softweights have breaking changes due to extra middle weight) 2024-06-27 13:51:18 -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 59e7d1a7af Make require_vae something for me to work on in the future for SparseCtrl and ReferenceCN 2024-06-27 12:24:18 -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 e6085cc111 Change what I previously called latent_format to model_latent_format to avoid conflicts with upcoming ComfyUI changes 2024-06-27 00:46:55 -05:00
Jedrzej Kosinski 2c1e9f6cdd Add workaround for outdated Steerable-Motion workflows to not throw errors (for my own peace of mind) 2024-06-13 07:54:03 -05:00
Jedrzej Kosinski b77125bdb9 Prepare for update that removes model_keys prop from ModelPatcher 2024-06-02 19:04:38 -05:00
Jedrzej Kosinski 576426a734 Renamed extras to cn_extras to differentiate from potential extras on AnimateDiff in the future (which would be called ad_extras there) 2024-05-29 01:37:56 -05:00