Commit Graph
139 Commits
Author SHA1 Message Date
Jedrzej Kosinski ecbd4ff362 Added check for Advanced-ControlNet cooperation and matching errors to throw 2024-08-08 02:49:25 -05:00
Jedrzej Kosinski ee3409f30e Added support for ContextRef mode_replace and tune_replace 2024-08-07 02:36:22 -05:00
Jedrzej Kosinski 62061995c2 Merge branch 'main' into develop 2024-08-06 17:26:30 -05:00
Jedrzej Kosinski c1c3bbc583 Remove current_device param from ModelPatcher init call to match latest ComfyUI 2024-08-06 17:25:04 -05:00
Jedrzej Kosinski 0f6aa7c251 Added ContextRef Keyframes, made strength_multival for ContextRef functional, removed redundant version of NaiveReuse Keyframe node, and instead mult_multival is on the normal node 2024-08-06 05:34:16 -05:00
Jedrzej Kosinski f051ca9944 Workflows can be cancelled between context window execution, instead of only per-step 2024-08-04 22:00:10 -05:00
Jedrzej Kosinski 9dee45bc22 Remove pointless batched_conds calculations in sliding_calc_conds_batch; this is a wrapper around cond batching, so there never is any batching in this layer 2024-08-04 21:28:52 -05:00
Jedrzej Kosinski 4256412352 Add ContextRef Mode - Indexes node 2024-08-04 21:11:29 -05:00
Jedrzej Kosinski 0ba022c775 Added ContextRef Tune nodes to modify values of underlying ReferenceAdvanced ACN object 2024-08-02 17:18:00 -05:00
Jedrzej Kosinski 11252fc34f Added sliding reference window mode for ContextRef + ContextRef Mode nodes 2024-07-31 06:31:21 -05:00
Jedrzej Kosinski 1c68c56809 NaiveReuse is now functional for Uniform Context Options and relative fuse_method 2024-07-29 01:35:12 -05:00
Jedrzej Kosinski d1fc329c61 Fixed ContextRef so it keeps track of current cond/uncond idx - matching commit made to Advanced-ControlNet 2024-07-28 19:12:56 -05:00
Jedrzej Kosinski 58f914a426 Small cleanup 2024-07-27 21:06:06 -05:00
Jedrzej Kosinski b55fb0f56f Adjustments for soon-to-be ContextRef support in Advanced-ControlNet 2024-07-27 18:53:19 -05:00
Jedrzej Kosinski bd514925de Added strength_multival inputs to NaiveReuse (working) and ContextRef (no functionality at all) nodes, some scaffolding code for cleanup 2024-07-25 00:52:15 -05:00
Jedrzej Kosinski 3a8744860d Added initial work on two novel context consistency techs: NaiveReuse and ContextRef; with this commit, NaiveReuse is functional, but not mask_opt, ContextRef is totally unfunctional as will require appropriate rework of Advanced-ControlNet refcn code to be pushed out 2024-07-23 03:26:01 -05:00
Jedrzej Kosinski 7e8f521f89 Added cfg_extras to Custom CFG nodes to allow cfg patch scheduling (and stacking) 2024-07-09 20:47:16 -05:00
Jedrzej Kosinski b7104b0da2 Refactored custom_cfg code to no longer use sampler_cfg_function patch, allowing that patch to not be overridden when using Custom CFG (some stuff might fail if it expects cond_scale to be a float instead of a tensor) 2024-07-09 17:32:44 -05:00
Jedrzej Kosinski 109e07a23c Enabled cfg1 optimization for Custom CFG when current cfg is 1.0 2024-07-09 16:26:51 -05:00
Jedrzej Kosinski 5ecbd9443b Added logging for image injection 2024-06-17 06:20:51 -05:00
Jedrzej Kosinski b2d8a07696 Made ksampler_get_injections use sigmas consistent with custom_ksampler_get_injections 2024-06-17 02:17:01 -05:00
Jedrzej Kosinski 8b6c759d9e Added strength_multival to Image Injection node 2024-06-16 05:43:23 -05:00
Jedrzej Kosinski af2e29e33e Moved/renamed resize_source from Image Injection Options to resize_image on Image Injection node 2024-06-16 05:13:42 -05:00
Jedrzej Kosinski 706a98ddee Move groupnorm injection as wrapper around diffusion_model.forward function to minimize 'leaking' of groupnorm hack, remove no longer necessary mentions of groupnorm uninjector 2024-06-16 04:44:35 -05:00
Jedrzej Kosinski bde85b272e Fixed v1 motion models not working with image injection 2024-06-16 01:29:17 -05:00
Jedrzej Kosinski 947626bc0d First working implementation of Image Injection feature 2024-06-15 23:46:58 -05:00
Jedrzej Kosinski 0253cbc205 Refactored code to no longer cache pia conv_in, hopefully fixing all existing PIA issues 2024-06-08 22:33:04 -05:00
Jedrzej Kosinski 4a0e73efbc Actual fix for newest PIA issue 2024-06-08 11:45:21 -05:00
Jedrzej Kosinski 0b6cd320b8 Another attempt to fix rare issue with PIA injection 2024-06-08 11:37:00 -05:00
Jedrzej Kosinski 3863ec9dd2 Refactored groupnorm hack activation code to be less confusing 2024-06-08 02:48:08 -05:00
Jedrzej Kosinski 708ebc614c Hopefully fixed rare edge case with PIA injection throwing error 2024-06-08 01:11:58 -05:00
Jedrzej Kosinski 6ea41ba6cc Added initial PIA support 2024-06-07 09:24:14 -05:00
Jedrzej Kosinski 6c755869fd initial attempt at noised image injection; might remove later if does not pan out 2024-06-04 20:45:23 -05:00
Mario Klingemann bbb1280213 Update sampling.py
Added sigmas to get_context_weights call to allow for changing weights based on the timestep
2024-05-20 19:58:28 +02:00
Jedrzej Kosinski 565261a146 Made MotionModelPatcher handle pe's properly with lowvram 2024-05-18 02:14:57 -05:00
Jedrzej Kosinski c6d63009ca Make position_batched GLIGEN account for too few position_params_batch 2024-05-01 14:22:17 -05:00
Jedrzej Kosinski e233e4d397 Added position_batched gligen_type to support both vanilla gligen positions and special per-frame gligen positions 2024-05-01 12:49:56 -05:00
Jedrzej Kosinski 0f9fdf3fae Merge branch 'develop' of https://github.com/Kosinkadink/ComfyUI-AnimateDiff into develop 2024-05-01 11:38:55 -05:00
Jedrzej Kosinski efffc1de81 Fixed accidental mismatch of order in FunctionInjectionHolder.restore_functions 2024-05-01 11:38:47 -05:00
Jedrzej Kosinski c3cc5190f8 Merge pull request #364 from kijai/develop
Add gligen scheduling
2024-05-01 11:28:10 -05:00
Jedrzej Kosinski fccdb43ea7 Add sampler_post_cfg_function support for lora hooks 2024-04-30 02:18:03 -05:00
Jedrzej Kosinski 910475c7b2 Added LoRA Hook Keyframe support for scheduling any LoRA Hook, whether it be individual or group 2024-04-29 11:01:25 -05:00
Kijai 6cde58f519 Add gligen scheduling 2024-04-29 17:54:51 +03:00
Jedrzej Kosinski b1893ca36c Fixed default_conds behavior at CFG=1.0, start of LoRA scheduling work 2024-04-28 06:09:28 -05:00
Jedrzej Kosinski 005d49a0b2 Moved LoraHook stuff into conditioning.py from utilts_motion.py 2024-04-28 05:06:15 -05:00
Jedrzej Kosinski eaf58bc460 Fixed sliding context - accidentally indented the combining code when refactored sliding_calc_conds_batch, making the function return immediately after the first context is sampled 2024-04-26 07:41:43 -05:00
Jedrzej Kosinski 44a097d803 Added masked conditioning nodes to make masking/combining/applying hooks much easier, including Set Unmasked Conds with supporting code that makes specific conds apply to the areas where no masks were applied automatically 2024-04-25 19:08:11 -05:00
Jedrzej Kosinski 89b33022b6 Refactored sampling code to fully mirror calc_conds_batch, fixed only the top layer (last) Control object being checked if it is compatible with sliding context 2024-04-24 07:12:30 -05:00
Jedrzej Kosinski 5c86862431 Merge branch 'main' into develop 2024-04-24 03:00:37 -05:00
Jedrzej Kosinski adb296bb81 Added sliding context support for cfg_function so that PerturbedAttentionGuidance works as expected 2024-04-23 06:22:14 -05:00