wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-11 23:00:51 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
987 Commits 55 Branches 107 Tags 1.3 GiB
a3b400faa4
Commit Graph

243 Commits

Author SHA1 Message Date
comfyanonymous
7c95e1a03b Xformers is now properly disabled when --cpu used. 
Added --windows-standalone-build option, currently it only opens
makes the code open up comfyui in the browser.
 2023-03-12 15:44:16 -04:00
comfyanonymous
d777b2f4a9 Add a VAEEncodeTiled node. 2023-03-11 15:28:15 -05:00
comfyanonymous
bbdc5924b4 Try to fix memory issue. 2023-03-11 15:15:13 -05:00
comfyanonymous
adabcc74fb Make tiled_scale work for downscaling. 2023-03-11 14:58:55 -05:00
comfyanonymous
77290f7110 Tiled upscaling with the upscale models. 2023-03-11 14:04:13 -05:00
comfyanonymous
66cca3659d Add locon support. 2023-03-09 21:41:24 -05:00
comfyanonymous
fa4dda2550 SD2.x controlnets now work. 2023-03-08 01:13:38 -05:00
comfyanonymous
341ebaabd8 Relative imports to test something. 2023-03-07 11:00:35 -05:00
edikius
148fe7b116 Fixed import (#44) 
* fixed import error

I had an
ImportError: cannot import name 'Protocol' from 'typing'
while trying to update so I fixed it to start an app

* Update main.py

* deleted example files
 2023-03-06 11:41:40 -05:00
comfyanonymous
339b2533eb Fix clip_skip no longer being loaded from yaml file. 2023-03-06 11:34:02 -05:00
comfyanonymous
ca7e2e3827 Add --cpu to use the cpu for inference. 2023-03-06 10:50:50 -05:00
comfyanonymous
663fa6eafd Implement support for t2i style model. 
It needs the CLIPVision model so I added CLIPVisionLoader and CLIPVisionEncode.

Put the clip vision model in models/clip_vision
Put the t2i style model in models/style_models

StyleModelLoader to load it, StyleModelApply to apply it
ConditioningAppend to append the conditioning it outputs to a positive one.
 2023-03-05 18:39:25 -05:00
comfyanonymous
f8f2ea3bb1 Make VAE use common function to get free memory. 2023-03-05 14:20:07 -05:00
comfyanonymous
ffc5c6707b Fix pytorch 2.0 cross attention not working. 2023-03-05 14:14:54 -05:00
comfyanonymous
7ee5e2d40e Add support for new colour T2I adapter model. 2023-03-03 19:13:07 -05:00
comfyanonymous
23be9a77b8 Update T2I adapter code to latest. 2023-03-03 18:46:49 -05:00
comfyanonymous
8141cd7f42 Fix issue. 2023-03-03 13:18:01 -05:00
comfyanonymous
c195dab61c Add a node to set CLIP skip. 
Use a more simple way to detect if the model is -v prediction.
 2023-03-03 13:04:36 -05:00
comfyanonymous
5608730809 To be really simple CheckpointLoaderSimple should pick the right type. 2023-03-03 11:07:10 -05:00
comfyanonymous
8a2699b47d New CheckpointLoaderSimple to load checkpoints without a config. 2023-03-03 03:37:35 -05:00
comfyanonymous
b2a7f1b32a Make some cross attention functions work on the CPU. 2023-03-03 03:27:33 -05:00
comfyanonymous
666a9e8604 Add some pytorch scaled_dot_product_attention code for testing. 
--use-pytorch-cross-attention to use it.
 2023-03-02 17:01:20 -05:00
comfyanonymous
b59b82a73b Add a way to interrupt current processing in the backend. 2023-03-02 14:42:03 -05:00
comfyanonymous
151fed3dfb Hopefully fix a strange issue with xformers + lowvram. 2023-02-28 13:48:52 -05:00
comfyanonymous
a59bb36cb8 Try to improve memory issues with del. 2023-02-28 12:27:43 -05:00
comfyanonymous
1304a8f8ad Small adjustment. 2023-02-27 20:04:18 -05:00
comfyanonymous
bddbd4bdb0 Enable highvram automatically when vram >> ram 2023-02-27 19:57:39 -05:00
comfyanonymous
14c390c0c2 Remove sample_ from some sampler names. 
Old workflows will still work.
 2023-02-27 01:43:06 -05:00
comfyanonymous
7add9fe7b3 Preparing to add another function to load checkpoints. 2023-02-26 17:29:01 -05:00
comfyanonymous
84a4b1f283 Fix uni_pc sampler not working with 1 or 2 steps. 2023-02-26 04:01:01 -05:00
comfyanonymous
084f8084ed Fix multiple controlnets not working. 2023-02-25 22:12:22 -05:00
comfyanonymous
9f1ca0847b Fixed issue when batched image was used as a controlnet input. 2023-02-25 14:57:28 -05:00
comfyanonymous
7f31625158 Fix missing variable. 2023-02-25 12:19:03 -05:00
comfyanonymous
4a31343a3d Add a T2IAdapterLoader node to load T2I-Adapter models. 
They are loaded as CONTROL_NET objects because they are similar.
 2023-02-25 01:24:56 -05:00
comfyanonymous
5cb9c83936 Prepare for t2i adapter. 2023-02-24 23:36:17 -05:00
comfyanonymous
1dfbc27fb6 Remove some useless imports 2023-02-24 12:36:55 -05:00
comfyanonymous
a4778b6a31 Added an experimental VAEDecodeTiled. 
This decodes the image with the VAE in tiles which should be faster and
use less vram.

It's in the _for_testing section so I might change/remove it or even
add the functionality to the regular VAEDecode node depending on how
well it performs which means don't depend too much on it.
 2023-02-24 02:10:10 -05:00
comfyanonymous
f1b122ba02 Add a node to load diff controlnets. 2023-02-22 23:22:03 -05:00
comfyanonymous
2e62af0a30 Implement DDIM sampler. 2023-02-22 21:10:19 -05:00
comfyanonymous
a17765cf94 Uni_PC: make max denoise behave more like other samplers. 
On the KSamplers denoise of 1.0 is the same as txt2img but there was a
small difference on UniPC.
 2023-02-22 02:21:06 -05:00
comfyanonymous
2124888a6c Remove prints that are useless when xformers is enabled. 2023-02-21 22:16:13 -05:00
comfyanonymous
00ef1aabeb Add uni_pc bh2 variant. 2023-02-21 16:11:48 -05:00
comfyanonymous
9cd0189e7e ControlNetApply now stacks. 
It can be used to apply multiple control nets at the same time.
 2023-02-21 01:18:53 -05:00
comfyanonymous
69df07177d Support old pytorch. 2023-02-19 16:59:03 -05:00
comfyanonymous
a9207a2c8e Support people putting commas after the embedding name in the prompt. 2023-02-19 02:50:48 -05:00
comfyanonymous
0f13853bd2 Add: --highvram for when you want models to stay on the vram. 2023-02-17 21:27:02 -05:00
comfyanonymous
273a3ebc67 Fix an OOM issue. 2023-02-17 16:21:01 -05:00
comfyanonymous
7dd65e43dd Low vram mode for controlnets. 2023-02-17 15:48:16 -05:00
comfyanonymous
7010bf9e60 Use fp16 for fp16 control nets. 2023-02-17 15:31:38 -05:00
comfyanonymous
9999b1e198 Add a way to control controlnet strength. 2023-02-16 18:08:01 -05:00
comfyanonymous
b5b68268ee Add ControlNet support. 2023-02-16 10:38:08 -05:00
comfyanonymous
6d0f92bcb2 Use inpaint models the proper way by using VAEEncodeForInpaint. 2023-02-15 20:44:51 -05:00
comfyanonymous
886b269d42 Support for inpaint models. 2023-02-15 16:38:20 -05:00
comfyanonymous
ce4e2f2955 Add masks to samplers code for inpainting. 2023-02-15 13:16:38 -05:00
comfyanonymous
e3451cea4f uni_pc now works with KSamplerAdvanced return_with_leftover_noise. 2023-02-13 12:29:21 -05:00
comfyanonymous
f542f248f1 Show the right amount of steps in the progress bar for uni_pc. 
The extra step doesn't actually call the unet so it doesn't belong in
the progress bar.
 2023-02-11 14:59:42 -05:00
comfyanonymous
f10b8948c3 768-v support for uni_pc sampler. 2023-02-11 04:34:58 -05:00
comfyanonymous
ce0aeb109e Remove print. 2023-02-11 03:41:40 -05:00
comfyanonymous
5489d5af04 Add uni_pc sampler to KSampler* nodes. 2023-02-11 03:34:09 -05:00
comfyanonymous
1a4edd19cd Fix overflow issue with inplace softmax. 2023-02-10 11:47:41 -05:00
comfyanonymous
509c7dfc6d Use real softmax in split op to fix issue with some images. 2023-02-10 03:13:49 -05:00
comfyanonymous
7e1e193f39 Automatically enable lowvram mode if vram is less than 4GB. 
Use: --normalvram to disable it.
 2023-02-10 00:47:56 -05:00
comfyanonymous
324273fff2 Fix embedding not working when on new line. 2023-02-09 14:12:02 -05:00
comfyanonymous
1f6a467e92 Update ldm dir with latest upstream stable diffusion changes. 2023-02-09 13:47:36 -05:00
comfyanonymous
773cdabfce Same thing but for the other places where it's used. 2023-02-09 12:43:29 -05:00
comfyanonymous
df40d4f3bf torch.cuda.OutOfMemoryError is not present on older pytorch versions. 2023-02-09 12:33:27 -05:00
comfyanonymous
e8c499ddd4 Split optimization for VAE attention block. 2023-02-08 22:04:20 -05:00
comfyanonymous
5b4e312749 Use inplace operations for less OOM issues. 2023-02-08 22:04:13 -05:00
comfyanonymous
3fd87cbd21 Slightly smarter batching behaviour. 
Try to keep batch sizes more consistent which seems to improve things on
AMD GPUs.
 2023-02-08 17:28:43 -05:00
comfyanonymous
bbdcf0b737 Use relative imports for k_diffusion. 2023-02-08 16:51:19 -05:00
comfyanonymous
708138c77d Remove print. 2023-02-08 14:51:18 -05:00
comfyanonymous
047775615b Lower the chances of an OOM. 2023-02-08 14:24:27 -05:00
comfyanonymous
853e96ada3 Increase it/s by batching together some stuff sent to unet. 2023-02-08 14:24:00 -05:00
comfyanonymous
c92633eaa2 Auto calculate amount of memory to use for --lowvram 2023-02-08 11:42:37 -05:00
comfyanonymous
534736b924 Add some low vram modes: --lowvram and --novram 2023-02-08 11:37:10 -05:00
comfyanonymous
a84cd0d1ad Don't unload/reload model from CPU uselessly. 2023-02-08 03:40:43 -05:00
comfyanonymous
b1a7c9ebf6 Embeddings/textual inversion support for SD2.x 2023-02-05 15:49:03 -05:00
comfyanonymous
1de5aa6a59 Add a CLIPLoader node to load standalone clip weights. 
Put them in models/clip
 2023-02-05 15:20:18 -05:00
comfyanonymous
56d802e1f3 Use transformers CLIP instead of open_clip for SD2.x 
This should make things a bit cleaner.
 2023-02-05 14:36:28 -05:00
comfyanonymous
bf9ccffb17 Small fix for SD2.x loras. 2023-02-05 11:38:25 -05:00
comfyanonymous
678105fade SD2.x CLIP support for Loras. 2023-02-05 01:54:09 -05:00
comfyanonymous
ef90e9c376 Add a LoraLoader node to apply loras to models and clip. 
The models are modified in place before being used and unpatched after.
I think this is better than monkeypatching since it might make it easier
to use faster non pytorch unet inference in the future.
 2023-02-03 02:46:24 -05:00
comfyanonymous
69df7eba94 Add KSamplerAdvanced node. 
This node exposes more sampling options and makes it possible for example
to sample the first few steps on the latent image, do some operations on it
 and then do the rest of the sampling steps. This can be achieved using the
start_at_step and end_at_step options.
 2023-01-31 03:09:38 -05:00
comfyanonymous
1daccf3678 Run softmax in place if it OOMs. 2023-01-30 19:55:01 -05:00
comfyanonymous
f73e57d881 Add support for textual inversion embedding for SD1.x CLIP. 2023-01-29 18:46:44 -05:00
comfyanonymous
50db297cf6 Try to fix OOM issues with cards that have less vram than mine. 2023-01-29 00:50:46 -05:00
comfyanonymous
73f60740c8 Slightly cleaner code. 2023-01-28 02:14:22 -05:00
comfyanonymous
0108616b77 Fix issue with some models. 2023-01-28 01:38:42 -05:00
comfyanonymous
2973ff24c5 Round CLIP position ids to fix float issues in some checkpoints. 2023-01-28 00:19:33 -05:00
comfyanonymous
c4b02059d0 Add ConditioningSetArea node. 
to apply conditioning/prompts only to a specific area of the image.

Add ConditioningCombine node.
so that multiple conditioning/prompts can be applied to the image at the
same time
 2023-01-26 12:06:48 -05:00
comfyanonymous
acdc6f42e0 Fix loading some malformed checkpoints? 2023-01-25 15:20:55 -05:00
comfyanonymous
051f472e8f Fix sub quadratic attention for SD2 and make it the default optimization. 2023-01-25 01:22:43 -05:00
comfyanonymous
220afe3310 Initial commit. 2023-01-16 22:37:14 -05:00