Commit Graph

1274 Commits

Author SHA1 Message Date
Jedrzej Kosinski 26ccd3b5f9 Merge branch 'master' into patch_hooks_improved_memory 2024-11-24 15:46:25 -06:00
Jedrzej Kosinski ac5a3bde6a Add changes manually from 'master' so merge conflict resolution goes more smoothly 2024-11-24 15:40:06 -06:00
Jedrzej Kosinski 602c12b515 Make discard_model_sampling True by default 2024-11-24 14:58:36 -06:00
Jedrzej Kosinski 8b2c324cf6 Made patch_hook_weight_to_device respect set_func and convert_func 2024-11-24 13:48:30 -06:00
comfyanonymous b4526d3fc3 Skip layer guidance now works on hydit model. 2024-11-24 05:54:30 -05:00
comfyanonymous ab885b33ba Skip layer guidance node now works on LTX-Video. 2024-11-23 10:33:05 -05:00
comfyanonymous 839ed3368e Some improvements to the lowvram unloading. 2024-11-22 20:59:15 -05:00
comfyanonymous 6e8cdcd3cb Fix some tiled VAE decoding issues with LTX-Video. 2024-11-22 18:00:34 -05:00
comfyanonymous e5c3f4b87f LTXV lowvram fixes. 2024-11-22 17:17:11 -05:00
comfyanonymous bc6be6c11e Some fixes to the lowvram system. 2024-11-22 16:40:04 -05:00
Jedrzej Kosinski 815c6f36e1 Merge branch 'master' into patch_hooks_improved_memory 2024-11-22 10:13:28 -06:00
comfyanonymous 5818f6cf51 Remove print. 2024-11-22 10:49:15 -05:00
Jedrzej Kosinski 0a432c1a73 Merge branch 'master' into patch_hooks_improved_memory 2024-11-22 09:33:13 -06:00
comfyanonymous 5e16f1d24b Support Lightricks LTX-Video model. 2024-11-22 08:46:39 -05:00
comfyanonymous 2fd9c1308a Fix mask issue in some attention functions. 2024-11-22 02:10:09 -05:00
Jedrzej Kosinski 76b9ed1f2d Merge branch 'master' into patch_hooks_improved_memory 2024-11-21 17:46:25 -06:00
Jedrzej Kosinski 1c86976f8e On Cond/Cond Pair nodes, removed opt_ prefix from optional inputs 2024-11-21 15:50:10 -06:00
comfyanonymous 8f0009aad0 Support new flux model variants. 2024-11-21 08:38:23 -05:00
comfyanonymous 41444b5236 Add some new weight patching functionality.
Add a way to reshape lora weights.

Allow weight patches to all weight not just .weight and .bias

Add a way for a lora to set a weight to a specific value.
2024-11-21 07:19:17 -05:00
Jedrzej Kosinski d38c535771 Turn off hook patch caching when only 1 hook present in sampling, replace some current_hook = None with calls to self.patch_hooks(None) instead to avoid a potential edge case 2024-11-20 18:57:18 -06:00
comfyanonymous 07f6eeaa13 Fix mask issue with attention_xformers. 2024-11-20 17:07:46 -05:00
comfyanonymous 22535d0589 Skip layer guidance now works on stable audio model. 2024-11-20 07:33:06 -05:00
Jedrzej Kosinski 35016983fb Small cleanup of comments 2024-11-19 17:49:57 -06:00
Jedrzej Kosinski 59891b0f96 Made encode_from_tokens_scheduled work when no hooks are set on patcher 2024-11-19 17:17:01 -06:00
comfyanonymous b699a15062 Refactor inpaint/ip2p code. 2024-11-19 03:25:25 -05:00
Jedrzej Kosinski 9b2b1303b7 Removed a .to call on results of calculate_weight in patch_hook_weight_to_device that was screwing up the intermediate results for fp8 prior to being passed into stochastic_rounding call 2024-11-18 20:42:51 -06:00
Jedrzej Kosinski 9fe3db4c3a For encode_from_tokens_scheduled, allow start_percent and end_percent in add_dict to limit which scheduled conds get encoded for optimization purposes 2024-11-18 12:25:17 -06:00
Jedrzej Kosinski 365170af95 Merge branch 'master' into patch_hooks_improved_memory 2024-11-18 08:43:19 -06:00
Jedrzej Kosinski de6013ccc4 Increased MemoryCounter minimum memory to leave free by *2 until a better way to get inference memory estimate of currently loaded models exists 2024-11-18 08:08:00 -06:00
Jedrzej Kosinski 0850ae5c04 Remove unnecessary torch.no_grad calls for hook patches 2024-11-18 07:38:11 -06:00
Jedrzej Kosinski e844695292 Fixed issue with setting weights from hooks instead of copying them, added additional memory_counter check when caching hook patches 2024-11-18 07:25:53 -06:00
Jedrzej Kosinski f465004a58 Fix cached_hook_patches not respecting target_device/memory_counter results 2024-11-17 12:52:40 -06:00
comfyanonymous d9f90965c8 Support block replace patches in auraflow. 2024-11-17 08:19:59 -05:00
comfyanonymous 41886af138 Add transformer options blocks replace patch to mochi. 2024-11-16 20:48:14 -05:00
Jedrzej Kosinski a20be20ac7 Added apply_to_conds to Set CLIP Hooks, modified relevant code to allow text encoding to automatically apply hooks to output conds when apply_to_conds is set to True 2024-11-16 17:37:57 -06:00
Jedrzej Kosinski e177149ae4 Made opt_hooks append by default instead of replace, renamed comfy.hooks set functions to be more accurate 2024-11-16 16:40:45 -06:00
Jedrzej Kosinski bcc6a22178 Made WrapperHook functional, added another wrapper/callback getter, added ON_DETACH callback to ModelPatcher 2024-11-14 08:06:02 -06:00
comfyanonymous 3b9a6cf2b1 Fix issue with 3d masks. 2024-11-13 07:18:30 -05:00
Jedrzej Kosinski 96b2080971 Merge branch 'master' into patch_hooks_improved_memory 2024-11-12 16:43:30 -06:00
Jedrzej Kosinski 5909b06b2e Removed Register/Direct hook nodes since they were present only for testing, removed diff-related weight hook calculation as improved_memory removes unload_model_clones and using sample time registered hooks is less hacky 2024-11-12 09:05:19 -06:00
Jedrzej Kosinski 1766d903ad Fixed existing weight hook_patches (pre-registered) not working properly for CLIP 2024-11-12 08:12:12 -06:00
comfyanonymous 8ebf2d8831 Add block replace transformer_options to flux. 2024-11-12 08:00:39 -05:00
comfyanonymous eb476e6ea9 Allow 1D masks for 1D latents. 2024-11-11 14:44:52 -05:00
Jedrzej Kosinski 9330745f27 Merge branch 'improved_memory' into patch_hooks_improved_memory 2024-11-11 11:26:36 -06:00
Jedrzej Kosinski 4195dfb032 Merge branch 'master' into patch_hooks_improved_memory 2024-11-11 11:26:27 -06:00
Jedrzej Kosinski 66b3386ee7 Updated different hook types to reflect actual progress of implementation, initial scaffolding for working WrapperHook functionality 2024-11-11 10:13:02 -06:00
Jedrzej Kosinski b12cc83c5b Modified callbacks and wrappers so that unregistered types can be used, allowing custom_nodes to have their own unique callbacks/wrappers if desired 2024-11-11 09:05:07 -06:00
Jedrzej Kosinski 638c4086a3 Fixed inconsistency of results when schedule_clip is set to False, small renaming/typo fixing, added initial support for ControlNet extra_hooks to work in tandem with normal cond hooks, initial work on calc_cond_batch merging all subdicts in returned transformer_options 2024-11-11 08:41:08 -06:00
comfyanonymous 8b275ce5be Support auto detecting some zsnr anime checkpoints. 2024-11-11 05:34:11 -05:00
comfyanonymous 2a18e98ccf Refactor so that zsnr can be set in the sampling_settings. 2024-11-11 04:55:56 -05:00