Commit Graph
377 Commits
Author SHA1 Message Date
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
German Chaverri f980ae7c7b Apply fix for ControlNet conditioning to match changes from ComfyUI 140ffc7fdc53e810030f060e421c1f528c2d2ab9 2025-08-05 11:00:08 -06: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
snomiao 3a4d998002 chore(publish): update GitHub Actions workflow for node publishing
- Add permissions for issue writing
- Update action version to v1 for publish-node-action
- Add condition to run job only for 'Kosinkadink' repository owner
2025-01-20 21:27:13 +00: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
LynnHo 008538346c Fix CtrLoRA preprocessor 2025-01-09 22:13:28 +08: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