719fa0866f
Set clip vision model in eval mode so it works without inference mode.
2023-12-15 18:53:08 -05:00
574363a8a6
Implement Perp-Neg
2023-12-16 00:28:16 +05:30
a5056cfb1f
Remove useless code.
2023-12-15 01:28:16 -05:00
329c571993
Improve code legibility.
2023-12-14 11:41:49 -05:00
6c5990f7db
Fix cfg being calculated more than once if sampler_cfg_function.
2023-12-13 20:28:04 -05:00
ba04a87d10
Refactor and improve the sag node.
...
Moved all the sag related code to comfy_extras/nodes_sag.py
2023-12-13 16:11:26 -05:00
6761233e9d
Implement Self-Attention Guidance ( #2201 )
...
* First SAG test
* need to put extra options on the model instead of patcher
* no errors and results seem not-broken
* Use @ashen-uncensored formula, which works better!!!
* Fix a crash when using weird resolutions. Remove an unnecessary UNet call
* Improve comments, optimize memory in blur routine
* SAG works with sampler_cfg_function
2023-12-13 15:52:11 -05:00
b454a67bb9
Support segmind vega model.
2023-12-12 19:09:53 -05:00
824e4935f5
Add dtype parameter to VAE object.
2023-12-12 12:03:29 -05:00
32b7e7e769
Add manual cast to controlnet.
2023-12-12 11:32:42 -05:00
3152023fbc
Use inference dtype for unet memory usage estimation.
2023-12-11 23:50:38 -05:00
77755ab8db
Refactor comfy.ops
...
comfy.ops -> comfy.ops.disable_weight_init
This should make it more clear what they actually do.
Some unused code has also been removed.
2023-12-11 23:27:13 -05:00
b0aab1e4ea
Add an option --fp16-unet to force using fp16 for the unet.
2023-12-11 18:36:29 -05:00
ba07cb748e
Use faster manual cast for fp8 in unet.
2023-12-11 18:24:44 -05:00
57926635e8
Switch text encoder to manual cast.
...
Use fp16 text encoder weights for CPU inference to lower memory usage.
2023-12-10 23:00:54 -05:00
340177e6e8
Disable non blocking on mps.
2023-12-10 01:30:35 -05:00
614b7e731f
Implement GLora.
2023-12-09 18:15:26 -05:00
cb63e230b4
Make lora code a bit cleaner.
2023-12-09 14:15:09 -05:00
174eba8e95
Use own clip vision model implementation.
2023-12-09 11:56:31 -05:00
97015b6b38
Cleanup.
2023-12-08 16:02:08 -05:00
a4ec54a40d
Add linear_start and linear_end to model_config.sampling_settings
2023-12-08 02:49:30 -05:00
9ac0b487ac
Make --gpu-only put intermediate values in GPU memory instead of cpu.
2023-12-08 02:35:45 -05:00
efb704c758
Support attention masking in CLIP implementation.
2023-12-07 02:51:02 -05:00
fbdb14d4c4
Cleaner CLIP text encoder implementation.
...
Use a simple CLIP model implementation instead of the one from
transformers.
This will allow some interesting things that would too hackish to implement
using the transformers implementation.
2023-12-06 23:50:03 -05:00
2db86b4676
Slightly faster lora applying.
2023-12-06 05:13:14 -05:00
1bbd65ab30
Missed this one.
2023-12-05 12:48:41 -05:00
9b655d4fd7
Fix memory issue with control loras.
2023-12-04 21:55:19 -05:00
26b1c0a771
Fix control lora on fp8.
2023-12-04 13:47:41 -05:00
be3468ddd5
Less useless downcasting.
2023-12-04 12:53:46 -05:00
ca82ade765
Use .itemsize to get dtype size for fp8.
2023-12-04 11:52:06 -05:00
31b0f6f3d8
UNET weights can now be stored in fp8.
...
--fp8_e4m3fn-unet and --fp8_e5m2-unet are the two different formats
supported by pytorch.
2023-12-04 11:10:00 -05:00
af365e4dd1
All the unet ops with weights are now handled by comfy.ops
2023-12-04 03:12:18 -05:00
61a123a1e0
A different way of handling multiple images passed to SVD.
...
Previously when a list of 3 images [0, 1, 2] was used for a 6 frame video
they were concated like this:
[0, 1, 2, 0, 1, 2]
now they are concated like this:
[0, 0, 1, 1, 2, 2]
2023-12-03 03:31:47 -05:00
c97be4db91
Support SD2.1 turbo checkpoint.
2023-11-30 19:27:03 -05:00
983ebc5792
Use smart model management for VAE to decrease latency.
2023-11-28 04:58:51 -05:00
c45d1b9b67
Add a function to load a unet from a state dict.
2023-11-27 17:41:29 -05:00
f30b992b18
.sigma and .timestep now return tensors on the same device as the input.
2023-11-27 16:41:33 -05:00
13fdee6abf
Try to free memory for both cond+uncond before inference.
2023-11-27 14:55:40 -05:00
be71bb5e13
Tweak memory inference calculations a bit.
2023-11-27 14:04:16 -05:00
39e75862b2
Fix regression from last commit.
2023-11-26 03:43:02 -05:00
50dc39d6ec
Clean up the extra_options dict for the transformer patches.
...
Now everything in transformer_options gets put in extra_options.
2023-11-26 03:13:56 -05:00
5d6dfce548
Fix importing diffusers unets.
2023-11-24 20:35:29 -05:00
3e5ea74ad3
Make buggy xformers fall back on pytorch attention.
2023-11-24 03:55:35 -05:00
871cc20e13
Support SVD img2vid model.
2023-11-23 19:41:33 -05:00
410bf07771
Make VAE memory estimation take dtype into account.
2023-11-22 18:17:19 -05:00
32447f0c39
Add sampling_settings so models can specify specific sampling settings.
2023-11-22 17:24:00 -05:00
c3ae99a749
Allow controlling downscale and upscale methods in PatchModelAddDownscale.
2023-11-22 03:23:16 -05:00
72741105a6
Remove useless code.
2023-11-21 17:27:28 -05:00
6a491ebe27
Allow model config to preprocess the vae state dict on load.
2023-11-21 16:29:18 -05:00
cd4fc77d5f
Add taesd and taesdxl to VAELoader node.
...
They will show up if both the taesd_encoder and taesd_decoder or taesdxl
model files are present in the models/vae_approx directory.
2023-11-21 12:54:19 -05:00
ce67dcbcda
Make it easy for models to process the unet state dict on load.
2023-11-20 23:17:53 -05:00
d9d8702d8d
percent_to_sigma now returns a float instead of a tensor.
2023-11-18 23:20:29 -05:00
0cf4e86939
Add some command line arguments to store text encoder weights in fp8.
...
Pytorch supports two variants of fp8:
--fp8_e4m3fn-text-enc (the one that seems to give better results)
--fp8_e5m2-text-enc
2023-11-17 02:56:59 -05:00
107e78b1cb
Add support for loading SSD1B diffusers unet version.
...
Improve diffusers model detection.
2023-11-16 23:12:55 -05:00
7e3fe3ad28
Make deep shrink behave like it should.
2023-11-16 15:26:28 -05:00
9f00a18095
Fix potential issues.
2023-11-16 14:59:54 -05:00
7ea6bb038c
Print warning when controlnet can't be applied instead of crashing.
2023-11-16 12:57:12 -05:00
dcec1047e6
Invert the start and end percentages in the code.
...
This doesn't affect how percentages behave in the frontend but breaks
things if you relied on them in the backend.
percent_to_sigma goes from 0 to 1.0 instead of 1.0 to 0 for less confusion.
Make percent 0 return an extremely large sigma and percent 1.0 return a
zero one to fix imprecision.
2023-11-16 04:23:44 -05:00
57eea0efbb
heunpp2 sampler.
2023-11-14 23:50:55 -05:00
728613bb3e
Fix last pr.
2023-11-14 14:41:31 -05:00
ec3d0ab432
Merge branch 'master' of https://github.com/Jannchie/ComfyUI
2023-11-14 14:38:07 -05:00
c962884a5c
Make bislerp work on GPU.
2023-11-14 11:38:36 -05:00
420beeeb05
Clean up and refactor sampler code.
...
This should make it much easier to write custom nodes with kdiffusion type
samplers.
2023-11-14 00:39:34 -05:00
f2e49b1d57
fix: adaptation to older versions of pytroch
2023-11-14 14:32:05 +09:00
94cc718e9c
Add a way to add patches to the input block.
2023-11-14 00:08:12 -05:00
7339479b10
Disable xformers when it can't load properly.
2023-11-13 12:31:10 -05:00
4781819a85
Make memory estimation aware of model dtype.
2023-11-12 04:28:26 -05:00
dd4ba68b6e
Allow different models to estimate memory usage differently.
2023-11-12 04:03:52 -05:00
2c9dba8dc0
sampling_function now has the model object as the argument.
2023-11-12 03:45:10 -05:00
8d80584f6a
Remove useless argument from uni_pc sampler.
2023-11-12 01:25:33 -05:00
248aa3e563
Fix bug.
2023-11-11 12:20:16 -05:00
4a8a839b40
Add option to use in place weight updating in ModelPatcher.
2023-11-11 01:11:12 -05:00
412d3ff57d
Refactor.
2023-11-11 01:11:06 -05:00
58d5d71a93
Working RescaleCFG node.
...
This was broken because of recent changes so I fixed it and moved it from
the experiments repo.
2023-11-10 20:52:10 -05:00
3e0033ef30
Fix model merge bug.
...
Unload models before getting weights for model patching.
2023-11-10 03:19:05 -05:00
002aefa382
Support lcm models.
...
Use the "lcm" sampler to sample them, you also have to use the
ModelSamplingDiscrete node to set them as lcm models to use them properly.
2023-11-09 18:30:22 -05:00
ec12000136
Add support for full diff lora keys.
2023-11-08 22:05:31 -05:00
064d7583eb
Add a CONDConstant for passing non tensor conds to unet.
2023-11-08 01:59:09 -05:00
794dd2064d
Fix typo.
2023-11-07 23:41:55 -05:00
0a6fd49a3e
Print leftover keys when using the UNETLoader.
2023-11-07 22:15:55 -05:00
fe40109b57
Fix issue with object patches not being copied with patcher.
2023-11-07 22:15:15 -05:00
a527d0c795
Code refactor.
2023-11-07 19:33:40 -05:00
2a23ba0b8c
Fix unet ops not entirely on GPU.
2023-11-07 04:30:37 -05:00
844dbf97a7
Add: advanced->model->ModelSamplingDiscrete node.
...
This allows changing the sampling parameters of the model (eps or vpred)
or set the model to use zsnr.
2023-11-07 03:28:53 -05:00
656c0b5d90
CLIP code refactor and improvements.
...
More generic clip model class that can be used on more types of text
encoders.
Don't apply weighting algorithm when weight is 1.0
Don't compute an empty token output when it's not needed.
2023-11-06 14:17:41 -05:00
b3fcd64c6c
Make SDTokenizer class work with more types of tokenizers.
2023-11-06 01:09:18 -05:00
7e455adc07
fix unet_wrapper_function name in ModelPatcher
2023-11-05 17:11:44 +08:00
1ffa8858e7
Move model sampling code to comfy/model_sampling.py
2023-11-04 01:32:23 -04:00
ae2acfc21b
Don't convert Nan to zero.
...
Converting Nan to zero is a bad idea because it makes it hard to tell when
something went wrong.
2023-11-03 13:13:15 -04:00
d2e27b48f1
sampler_cfg_function now gets the noisy output as argument again.
...
This should make things that use sampler_cfg_function behave like before.
Added an input argument for those that want the denoised output.
This means you can calculate the x0 prediction of the model by doing:
(input - cond) for example.
2023-11-01 21:24:08 -04:00
2455aaed8a
Allow model or clip to be None in load_lora_for_models.
2023-11-01 20:27:20 -04:00
ecb80abb58
Allow ModelSamplingDiscrete to be instantiated without a model config.
2023-11-01 19:13:03 -04:00
e73ec8c4da
Not used anymore.
2023-11-01 00:01:30 -04:00
111f1b5255
Fix some issues with sampling precision.
2023-10-31 23:49:29 -04:00
7c0f255de1
Clean up percent start/end and make controlnets work with sigmas.
2023-10-31 22:14:32 -04:00
a268a574fa
Remove a bunch of useless code.
...
DDIM is the same as euler with a small difference in the inpaint code.
DDIM uses randn_like but I set a fixed seed instead.
I'm keeping it in because I'm sure if I remove it people are going to
complain.
2023-10-31 18:11:29 -04:00
1777b54d02
Sampling code changes.
...
apply_model in model_base now returns the denoised output.
This means that sampling_function now computes things on the denoised
output instead of the model output. This should make things more consistent
across current and future models.
2023-10-31 17:33:43 -04:00
c837a173fa
Fix some memory issues in sub quad attention.
2023-10-30 15:30:49 -04:00
125b03eead
Fix some OOM issues with split attention.
2023-10-30 13:14:11 -04:00
a12cc05323
Add --max-upload-size argument, the default is 100MB.
2023-10-29 03:55:46 -04:00
2a134bfab9
Fix checkpoint loader with config.
2023-10-27 22:13:55 -04:00
e60ca6929a
SD1 and SD2 clip and tokenizer code is now more similar to the SDXL one.
2023-10-27 15:54:04 -04:00
6ec3f12c6e
Support SSD1B model and make it easier to support asymmetric unets.
2023-10-27 14:45:15 -04:00
434ce25ec0
Restrict loading embeddings from embedding folders.
2023-10-27 02:54:13 -04:00
723847f6b3
Faster clip image processing.
2023-10-26 01:53:01 -04:00
a373367b0c
Fix some OOM issues with split and sub quad attention.
2023-10-25 20:17:28 -04:00
7fbb217d3a
Fix uni_pc returning noisy image when steps <= 3
2023-10-25 16:08:30 -04:00
3783cb8bfd
change 'c_adm' to 'y' in ControlNet.get_control
2023-10-25 08:24:32 -05:00
d1d2fea806
Pass extra conds directly to unet.
2023-10-25 00:07:53 -04:00
036f88c621
Refactor to make it easier to add custom conds to models.
2023-10-24 23:31:12 -04:00
3fce8881ca
Sampling code refactor to make it easier to add more conds.
2023-10-24 03:38:41 -04:00
8594c8be4d
Empty the cache when torch cache is more than 25% free mem.
2023-10-22 13:58:12 -04:00
8b65f5de54
attention_basic now works with hypertile.
2023-10-22 03:59:53 -04:00
e6bc42df46
Make sub_quad and split work with hypertile.
2023-10-22 03:51:29 -04:00
a0690f9df9
Fix t2i adapter issue.
2023-10-21 20:31:24 -04:00
9906e3efe3
Make xformers work with hypertile.
2023-10-21 13:23:03 -04:00
4185324a1d
Fix uni_pc sampler math. This changes the images this sampler produces.
2023-10-20 04:16:53 -04:00
e6962120c6
Make sure cond_concat is on the right device.
2023-10-19 01:14:25 -04:00
45c972aba8
Refactor cond_concat into conditioning.
2023-10-18 20:36:58 -04:00
430a8334c5
Fix some potential issues.
2023-10-18 19:48:36 -04:00
782a24fce6
Refactor cond_concat into model object.
2023-10-18 16:48:37 -04:00
0d45a565da
Fix memory issue related to control loras.
...
The cleanup function was not getting called.
2023-10-18 02:43:01 -04:00
d44a2de49f
Make VAE code closer to sgm.
2023-10-17 15:18:51 -04:00
23680a9155
Refactor the attention stuff in the VAE.
2023-10-17 03:19:29 -04:00
c8013f73e5
Add some Quadro cards to the list of cards with broken fp16.
2023-10-16 16:48:46 -04:00
bb064c9796
Add a separate optimized_attention_masked function.
2023-10-16 02:31:24 -04:00
fd4c5f07e7
Add a --bf16-unet to test running the unet in bf16.
2023-10-13 14:51:10 -04:00
9a55dadb4c
Refactor code so model can be a dtype other than fp32 or fp16.
2023-10-13 14:41:17 -04:00
88733c997f
pytorch_attention_enabled can now return True when xformers is enabled.
2023-10-11 21:30:57 -04:00
20d3852aa1
Pull some small changes from the other repo.
2023-10-11 20:38:48 -04:00
ac7d8cfa87
Allow attn_mask in attention_pytorch.
2023-10-11 20:38:48 -04:00
1a4bd9e9a6
Refactor the attention functions.
...
There's no reason for the whole CrossAttention object to be repeated when
only the operation in the middle changes.
2023-10-11 20:38:48 -04:00
8cc75c64ff
Let unet wrapper functions have .to attributes.
2023-10-11 01:34:38 -04:00
5e885bd9c8
Cleanup.
2023-10-10 21:46:53 -04:00
851bb87ca9
Merge branch 'taesd_safetensors' of https://github.com/mochiya98/ComfyUI
2023-10-10 21:42:35 -04:00
9eb621c95a
Supports TAESD models in safetensors format
2023-10-10 13:21:44 +09:00
d1a0abd40b
Merge branch 'input-directory' of https://github.com/jn-jairo/ComfyUI
2023-10-09 01:53:29 -04:00
72188dffc3
load_checkpoint_guess_config can now optionally output the model.
2023-10-06 13:48:18 -04:00
63e5fd1790
Option to input directory
2023-10-04 19:45:15 -03:00
9bfec2bdbf
Fix quality loss due to low precision
2023-10-04 15:40:59 +02:00
0f17993d05
fix: typo in extra sampler
2023-09-29 06:09:59 +03:00
66756de100
Add SamplerDPMPP_2M_SDE node.
2023-09-28 21:56:23 -04:00
71713888c4
Print missing VAE keys.
2023-09-28 00:54:57 -04:00
d234ca558a
Add missing samplers to KSamplerSelect.
2023-09-28 00:17:03 -04:00
1adcc4c3a2
Add a SamplerCustom Node.
...
This node takes a list of sigmas and a sampler object as input.
This lets people easily implement custom schedulers and samplers as nodes.
More nodes will be added to it in the future.
2023-09-27 22:21:18 -04:00
bf3fc2f1b7
Refactor sampling related code.
2023-09-27 16:45:22 -04:00
fff491b032
Model patches can now know which batch is positive and negative.
2023-09-27 12:04:07 -04:00
1d6dd83184
Scheduler code refactor.
2023-09-26 17:07:07 -04:00
446caf711c
Sampling code refactor.
2023-09-26 13:45:15 -04:00
76cdc809bf
Support more controlnet models.
2023-09-23 18:47:46 -04:00
comfyanonymous
Hari
Rafie Walker
Jianqi Pan
gameltb
Jedrzej Kosinski
Yukimasa Funaoka
Jairo Correa
City
badayvedat