nodes/Kosinkadink-ComfyUI-Advanced-ControlNet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
398 Commits 12 Branches 0 Tags
main
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jedrzej Kosinski 27a67fee80 Merge pull request #258 from Kosinkadink/chore/bump-version-1.6.0 
Bump version to 1.6.0
 2026-07-28 04:39:29 -07:00
Jedrzej KosinskiandAmp d5c6a5ec8f Bump version to 1.6.0 
Amp-Thread-ID: https://ampcode.com/threads/T-019fa859-4259-74d5-ac32-0e4101490f8f
Co-authored-by: Amp <amp@ampcode.com>
 2026-07-28 04:39:02 -07:00
Jedrzej Kosinski 516906affe Merge pull request #257 from Kosinkadink/fix/advanced-inpaint-control 
Add modern ControlNet inpainting support
 2026-07-28 04:35:32 -07:00
Jedrzej Kosinski ff45185d3b Use standard Apply nodes for inpainting 2026-07-28 04:30:35 -07:00
Jedrzej Kosinski ffa6350020 Merge remote-tracking branch 'origin/main' into fix/advanced-inpaint-control 2026-07-18 00:08:06 -07:00
Jedrzej Kosinski 9e60d8a9c8 Merge pull request #256 from Kosinkadink/fix/control-regressions 
Fix LLLite masks and control scheduling regressions
 2026-07-18 00:07:42 -07:00
Jedrzej Kosinski b5764c344f Skip controls with zero effect masks 2026-07-17 23:48:35 -07:00
Jedrzej Kosinski 42cdfe6c88 Fix T2I Adapter sliding context hints 2026-07-17 23:41:20 -07:00
Jedrzej Kosinski 2f9dd25d93 Fix Flux effect masks for odd latent sizes 2026-07-17 22:53:08 -07:00
Jedrzej Kosinski 0e70221a05 Add modern ControlNet inpainting support 2026-07-17 22:20:27 -07:00
Jedrzej Kosinski a4f01ba9cc Fix control scheduling regressions 2026-07-17 21:19:49 -07:00
Jedrzej Kosinski d25dbc8fc3 Merge pull request #255 from Kosinkadink/refactor/v3-node-api 
Migrate all nodes to the ComfyUI V3 API
 2026-07-17 20:40:57 -07:00
Jedrzej Kosinski 0a0c10b25b Migrate all nodes to the V3 API 2026-07-17 19:06:02 -07:00
Jedrzej Kosinski 4b37dbd421 Merge pull request #254 from Kosinkadink/cleanup/remove-obsolete-frontend 
Remove obsolete frontend extensions
 2026-07-17 18:13:20 -07:00
Jedrzej Kosinski 84cbeab2e6 Remove obsolete frontend extensions 2026-07-17 16:11:14 -07:00
Jedrzej Kosinski d508fe9027 Merge pull request #253 from Kosinkadink/feature/anima-lllite-v2 
Support Anima LLLite v2 models
 2026-07-17 15:58:53 -07:00
Jedrzej KosinskiandAmp f900f14b0b Support Anima LLLite v2 models 
Amp-Thread-ID: https://ampcode.com/threads/T-019f7088-85bf-7703-87c3-f9c0ca5d711d
Co-authored-by: Amp <amp@ampcode.com>
 2026-07-17 15:44:56 -07:00
Jedrzej Kosinski e701735c50 Merge pull request #252 from Kosinkadink/chore/bump-version-1.5.8 
Bump version to 1.5.8
 2026-07-17 06:25:13 -07:00
Jedrzej Kosinski a0563a3fa0 Bump version to 1.5.8 2026-07-17 06:23:44 -07:00
Jedrzej Kosinski ba0795aaaa Merge pull request #249 from Kosinkadink/fix/sparsectrl-svd-dtype 
Fix dtype mismatch for SparseCtrl and SVD-ControlNet models
 2026-06-04 15:30:54 -07:00
Jedrzej KosinskiandAmp 9538b054cd Cast SparseCtrl/SVD control models to unet dtype after loading 
Setting controlnet_config["dtype"] alone is not enough: comfy's lazy/zero-copy
state_dict loading (Windows + aimdo path in disable_weight_init) assigns the
on-disk fp32 tensors directly as parameters and ignores the configured dtype.
With the disable_weight_init ops (no runtime weight casting), the control model
then runs fp32 weights against fp16 activations, raising "mat1 and mat2 must have
the same dtype, but got Half and Float" at the first time_embed Linear.

Explicitly cast the control model to unet_dtype after load_state_dict (mirroring
the motion model load and AnimateDiff-Evolved #573) so the weights always match
the activation dtype at runtime.

Verified end-to-end with v3_sd15_sparsectrl_rgb.ckpt on an fp16 SD1.5 model.

Amp-Thread-ID: https://ampcode.com/threads/T-019e947a-9fd3-76df-a847-5eb68d7f18de
Co-authored-by: Amp <amp@ampcode.com>
 2026-06-04 15:10:48 -07:00
Jedrzej KosinskiandAmp 71b536c47f Fix dtype mismatch for SparseCtrl and SVD-ControlNet models 
load_sparsectrl and load_svdcontrolnet never set controlnet_config["dtype"],
so the control model was built with dtype=None (float32) while the UNet runs
in fp16. This caused "mat1 and mat2 must have the same dtype, but got Half and
Float" at sampling time (notably for .pth/.ckpt SparseCtrl models).

Set controlnet_config["dtype"] = unet_dtype before building the model, matching
the existing ControlNet++ and CtrLoRA loaders and ComfyUI's own controlnet loader.

Fixes #574

Amp-Thread-ID: https://ampcode.com/threads/T-019e947a-9fd3-76df-a847-5eb68d7f18de
Co-authored-by: Amp <amp@ampcode.com>
 2026-06-04 14:26:17 -07:00
Jedrzej Kosinski b03791e456 Merge pull request #246 from Kosinkadink/fix/cast-bias-weight-offloadable 
fix: update cast_bias_weight to use offloadable=True in clean_groupnorm
 2026-03-29 18:39:38 -07:00
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 2bde95a468 Merge pull request #237 from Kosinkadink/develop 
Fixed device mismatch issue for ControlNet++, SparseCtrl, and SVDControlNet
 2025-08-06 13:01:11 -07:00
Jedrzej Kosinski c0b5d7378b version bump 2025-08-06 12:59:40 -07:00
Jedrzej Kosinski 79f8a8aa8b Fixed device mismatch issue for ControlNet++, SparseCtrl, and SVDControlNet 2025-08-06 12:59:25 -07:00
Jedrzej Kosinski f9a12257bd Merge pull request #236 from Kosinkadink/develop 
Fix other ControlNet types after recent ComfyUI controlnet change
 2025-08-05 13:45:35 -07:00
Jedrzej Kosinski 86bfde7eb6 version bump 2025-08-05 13:44:34 -07:00
Jedrzej Kosinski 0da13ac0e2 Updated the remaining context= controlnet code to use comfy.model_management.cast_to_device calls 2025-08-05 13:43:52 -07:00
Jedrzej Kosinski 4211b1bdc2 Merge branch 'main' into develop 2025-08-05 13:33:00 -07:00
Jedrzej Kosinski b1f358cd65 Merge pull request #235 from germanch90/main 
Apply fix for ControlNet conditioning to match changes from ComfyUI lowering VRAM usage
 2025-08-05 13:03:20 -07:00
Jedrzej Kosinski da254b700d Merge pull request #223 from Kosinkadink/multigpu 
Get context-related info from ad_params in transformer_options
 2025-03-04 20:40:13 -06:00
Jedrzej Kosinski 5d7012e8ac version bump 2025-03-04 20:38:38 -06:00
Jedrzej Kosinski afc96718fb Merge branch 'main' into multigpu 2025-01-31 04:00:44 -06:00
Jedrzej Kosinski 3270044067 Merge branch 'main' into develop 2025-01-31 04:00:29 -06:00
Jedrzej Kosinski b66cd70c98 Merge pull request #219 from Kosinkadink/floatlongfix 
Fix RuntimeError: Float did not match Long when ComfyUI is outdated
 2025-01-31 03:59:55 -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 9cf9d310ba version bump 2025-01-31 03:55:17 -06:00
Jedrzej Kosinski 6edd91bddc Merge branch 'develop' of https://github.com/Kosinkadink/ComfyUI-Advanced-ControlNet into develop 2025-01-31 03:54:51 -06:00
Jedrzej Kosinski ab5dac03c6 Fixed BIGMAX_TENSOR to not be so big that it becomes an int64 instead of a float32 2025-01-31 03:54:39 -06:00
Jedrzej Kosinski b6f420c21e Merge branch 'main' into develop 2025-01-29 09:17:17 -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 23563ece9b Merge pull request #218 from ComfyNodePRs/update-publish-yaml 
Update Github Action for Publishing to Comfy Registry
 2025-01-28 00:17:44 -06:00
Jedrzej Kosinski 534e7949c8 Merge PR #217 from Kosinkadink/develop - version bump after LynnHo's PR merged 
version bump
 2025-01-11 00:20:47 -06:00
Jedrzej Kosinski 3d5600a41a version bump 2025-01-11 00:19:53 -06:00
Jedrzej Kosinski 91aea98007 Merge PR #216 from LynnHo/main - fix CtrLoRA latents preprocessing 
Fix CtrLoRA preprocessor
 2025-01-11 00:17:35 -06:00
Jedrzej Kosinski f7a42fe6dc Merge pull request #215 from Kosinkadink/develop 
Fixed backwards compatibility for new KF scheduling behavior, changes…
 2025-01-05 15:38:32 -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 c4d9455052 Merge PR #214 from Kosinkadink/develop 
TimestepKeyframe fix
 2025-01-04 00:52:10 -06:00
Jedrzej Kosinski 52b2751025 Increment ACN DinkLink version due to need for transformer_options in prepare_current_timestep function 2025-01-04 00:36:21 -06:00
Jedrzej Kosinski b572c402a8 version bump 2024-12-30 17:01:54 -06:00
Jedrzej Kosinski b3b9a9d655 Merge branch 'main' into develop 2024-12-30 17:00:37 -06:00
Jedrzej Kosinski b4d2608cf4 Merge branch 'develop' of https://github.com/Kosinkadink/ComfyUI-Advanced-ControlNet into develop 2024-12-30 17:00:02 -06:00
Jedrzej Kosinski 787c841b6b Make TimestepKeyframes work consistently across separated sampling nodes/code 2024-12-30 16:59:53 -06:00
Jedrzej Kosinski 1d671d901b Merge PR #213 from Kosinkadink/develop 
Fix Load CtrLoRA Model node category + readme features
 2024-12-28 14:48:03 -06:00
Jedrzej Kosinski 8d230c98d2 Update README.md 2024-12-28 14:46:54 -06:00
Jedrzej Kosinski 840b3f9423 Add link to CtrLoRA repo on top of control_ctrlora.py file 2024-12-28 14:45:03 -06:00
Jedrzej Kosinski 393bca416d Fix Load CtrLoRA Model node being in the wrong category 2024-12-28 14:43:23 -06:00
Jedrzej Kosinski 9632af9dc8 Merge PR #208 from Kosinkadink/develop - Load ControlNet++ Model (Multi) fix 
Fix regression of Load ControlNet++ Model (Multi) node
 2024-12-07 05:08:21 -06:00
Jedrzej Kosinski 5900f458f8 Fix regression of Load ControlNet++ Model (Multi) node 2024-12-07 05:06:41 -06:00
Jedrzej Kosinski ba0e74ed84 Merge PR #198 from Kosinkadink/rework-modelpatcher 
Rework ModelPatcher for upcoming ComfyUI update
 2024-12-02 13:56:12 -06:00
Jedrzej Kosinski 3ad082b691 Refactored SparseCtrlAdvanced to not save a reference to the actual ModelPatcher, just in case it's messing with memory management 2024-12-01 20:35:32 -06:00
Jedrzej Kosinski 4618d8006f Just in case make sure cleanup is called on motion model for SparseCtrl 2024-12-01 20:06:38 -06:00
Jedrzej Kosinski 37b318debc Refacotr SparseCtrl to depend on AnimateDiff-Evolved for AnimateDiffModel definition/creation; allows for code to not be duplicated and any feature that works for AD can be resued/exposed for SparseCtrl 2024-12-01 19:46:47 -06:00
Jedrzej Kosinski e5f7f5a281 Refactored DinkLink acn wrapper registration to not cause circular import 2024-11-29 22:40:20 -06:00
Jedrzej Kosinski c59f99efbc Add ControlNetSD35Advanced, port over changes from vanilla ControlNet to ControlNetAdvanced to support ControlNetSD35 2024-11-27 00:52:52 -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 df899e8b7e Make forward_inject_UNetModel a built-in diffusion_model wrapper instead to fix weird issue with ContextRef + ImageInjection 2024-11-17 08:35:48 -06:00
Jedrzej Kosinski a2430fb880 Add clarifying comment so I don't accidentally cause regression in the future with new memory management system 2024-11-14 20:02:51 -06:00
Jedrzej Kosinski 285f41c809 Cleaned up some commented out code from control_lllite.py file 2024-11-14 15:20:48 -06:00
Jedrzej Kosinski 326b26ed95 Simplified ControlLLLite implementation, since transformer_options are passed into get_control with ComfyUI rework 2024-11-14 12:10:28 -06:00
Jedrzej Kosinski b9c53b79c9 Fix from_vanilla call for ControlNetAdvanced so it does not break ComfyUI memory management system; parent model patcher has to be tracked properly now 2024-11-14 11:49:56 -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 57dfa7d1ce Cleaned imports in nodes.py 2024-11-14 04:58:23 -06:00
Jedrzej Kosinski 820a591687 Replaced base Load Advanced ControlNet Model nodes with ones with cnet instead of control_net_name to leave more room for CN name 2024-11-14 04:57:12 -06:00
Jedrzej Kosinski 828c270a85 Moved autosize to hidden props instead of optional to make use of AustinMroz's revised js, fixed outdated autosize values 2024-11-14 04:13:38 -06:00
Jedrzej Kosinski 1d14382944 Updated Aoply Advanced ControlNet nodes to remove long unnecessaru model_optional fields, shifted some of the nodes.py code around to separate files to make deprecation cleaner 2024-11-14 04:04:21 -06:00
Jedrzej Kosinski 3120c14e0a Added checks for None control_net to produce more helpful error messages for users 2024-11-14 03:48:42 -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 74320a78e3 Replaced SparseModelPatcher with native ModelPatcher and callbacks 2024-11-12 18:14:21 -06:00
Jedrzej Kosinski c7aa168691 Added DinkLink scaffolding 2024-11-12 18:13:17 -06:00
Jedrzej Kosinski 048e090146 version bump 2024-11-12 16:34:06 -06:00
Jedrzej Kosinski 5505370c43 Merge branch 'main' into rework-modelpatcher 2024-10-31 18:30:14 -05:00
Jedrzej Kosinski 172543b725 Merge pull request #194 from Stability-AI/bugfix/ControlLLLiteAdvanced 
Fix for ControlLLLiteAdvanced
 2024-10-31 18:20:35 -05:00
Jedrzej Kosinski f5a0e8e77e Merge branch 'main' into rework-modelpatcher 2024-10-25 15:45:13 -05:00
Jedrzej Kosinski 1dc1b648ce Some progress on future acn_sampler_sample_wrapper 2024-10-25 15:45:00 -05:00
Jedrzej Kosinski b9c8bdc6dd Merge pull request #192 from AustinMroz/main 
Update autosizing js
 2024-10-25 15:43:25 -05:00
Jedrzej Kosinski 767cbf3dcc Merge branch 'main' into rework-modelpatcher 2024-10-23 22:02:47 -05:00
Jedrzej Kosinski dc48641c97 Merge PR #188 from Kosinkadink/comfyupdate 
Removed device var to match new ComfyUI update
 2024-10-23 22:00:26 -05:00
Jedrzej Kosinski 934f55df85 version bump 2024-10-23 21:58:20 -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
Jedrzej Kosinski 7d25e4bafb Ported ContextRef adain support to work with uuids, reorganized the ContextRef-related code in BankStyle classes 2024-10-11 09:43:06 -05:00
Jedrzej Kosinski b0044cc2b7 For ContextRef c_bank, don't cat unless needed 2024-10-08 17:37:40 -05:00
Jedrzej Kosinski ea878b462f More progress on using cond uuids for ContextRef 2024-10-08 17:23:46 -05:00