Commit Graph

276 Commits

Author SHA1 Message Date
comfyanonymous
8359d8589b Merge branch 'master' of https://github.com/BlenderNeko/ComfyUI 2023-05-25 14:44:16 -04:00
comfyanonymous
4a2e5b0950 Support old pytorch versions that don't have weights_only. 2023-05-25 13:30:59 -04:00
BlenderNeko
0ea63a0aeb vecorized bislerp 2023-05-25 19:23:47 +02:00
comfyanonymous
30152c282e Various improvements to bislerp. 2023-05-23 11:40:24 -04:00
comfyanonymous
f166739922 Add experimental bislerp algorithm for latent upscaling.
It's like bilinear but with slerp.
2023-05-23 03:12:56 -04:00
comfyanonymous
ab51137f21 Auto transpose images from exif data. 2023-05-22 00:22:24 -04:00
comfyanonymous
8781b6a542 sample_dpmpp_2m_sde no longer crashes when step == 1. 2023-05-21 11:34:29 -04:00
comfyanonymous
6dd63b638e Add DPM-Solver++(2M) SDE and exponential scheduler.
exponential scheduler is the one recommended with this sampler.
2023-05-21 01:46:03 -04:00
comfyanonymous
c0a5444d1b Make scaled_dot_product switch to sliced attention on OOM. 2023-05-20 16:01:02 -04:00
comfyanonymous
e33cb62d1b Simplify and improve some vae attention code. 2023-05-20 15:07:21 -04:00
comfyanonymous
8035000551 Switch default scheduler to normal. 2023-05-15 00:29:56 -04:00
comfyanonymous
18f2a99ea2 Merge branch 'tiled_sampler' of https://github.com/BlenderNeko/ComfyUI 2023-05-14 15:39:39 -04:00
comfyanonymous
8c539fa5bc Print the torch device that is used on startup. 2023-05-13 17:11:27 -04:00
BlenderNeko
dd1be4e992 Make nodes map over input lists (#579)
* allow nodes to map over lists

* make work with IS_CHANGED and VALIDATE_INPUTS

* give list outputs distinct socket shape

* add rebatch node

* add batch index logic

* add repeat latent batch

* deal with noise mask edge cases in latentfrombatch
2023-05-13 11:15:45 -04:00
BlenderNeko
3cbb3ef058 comment out annoying print statement 2023-05-12 23:57:40 +02:00
BlenderNeko
2e2c17131b minor changes for tiled sampler 2023-05-12 23:49:09 +02:00
comfyanonymous
ffa3282218 Auto batching improvements.
Try batching when cond sizes don't match with smart padding.
2023-05-10 13:59:24 -04:00
comfyanonymous
9102a82f07 Not needed anymore because sampling works with any latent size. 2023-05-09 12:18:18 -04:00
comfyanonymous
9110a44cc3 Make t2i adapter work with any latent resolution. 2023-05-08 18:15:19 -04:00
comfyanonymous
bdb5f4ff03 Merge branch 'autostart' of https://github.com/EllangoK/ComfyUI 2023-05-07 17:19:03 -04:00
comfyanonymous
f7e427c557 Make maximum_batch_area take into account python2.0 attention function.
More conservative xformers maximum_batch_area.
2023-05-06 19:58:54 -04:00
comfyanonymous
57f35b3d16 maximum_batch_area for xformers.
Remove useless code.
2023-05-06 19:28:46 -04:00
EllangoK
0e90bee158 auto-launch cli arg 2023-05-06 16:59:40 -04:00
comfyanonymous
b877fefbb3 Lowvram mode for gligen and fix some lowvram issues. 2023-05-05 18:11:41 -04:00
comfyanonymous
a6d2a9487d Search recursively in subfolders for embeddings. 2023-05-05 01:28:48 -04:00
comfyanonymous
93fc8c1ea9 Fix import. 2023-05-05 00:19:35 -04:00
comfyanonymous
2edaaba3c2 Fix imports. 2023-05-04 18:10:29 -04:00
comfyanonymous
10ff210ffb Refactor. 2023-05-03 17:48:35 -04:00
comfyanonymous
bf7c588c68 Merge branch 'tiled-progress' of https://github.com/pythongosssss/ComfyUI 2023-05-03 16:24:56 -04:00
pythongosssss
eaeac55c0d remove unused import 2023-05-03 18:21:23 +01:00
pythongosssss
d8017626fb use comfy progress bar 2023-05-03 18:19:22 +01:00
comfyanonymous
ad56cfe814 Add a total_steps value to sampler callback. 2023-05-03 12:58:10 -04:00
pythongosssss
f6154607f9 Merge remote-tracking branch 'origin/master' into tiled-progress 2023-05-03 17:33:42 +01:00
pythongosssss
8160309db9 reduce duplication 2023-05-03 17:33:19 +01:00
comfyanonymous
df01203955 Use sampler callback instead of tqdm hook for progress bar. 2023-05-02 23:00:49 -04:00
pythongosssss
33b0ba6464 added progress to encode + upscale 2023-05-02 19:18:07 +01:00
comfyanonymous
71b4d08e65 Change latent resolution step to 8. 2023-05-02 14:17:51 -04:00
comfyanonymous
76730ed9ff Make unet work with any input shape. 2023-05-02 13:31:43 -04:00
comfyanonymous
55236dc812 LoKR support. 2023-05-01 18:18:23 -04:00
comfyanonymous
f5982afcfa Properly disable all progress bars when disable_pbar=True 2023-05-01 15:52:17 -04:00
BlenderNeko
de72c5f581 allow disabling of progress bar when sampling 2023-04-30 18:59:58 +02:00
comfyanonymous
54d388428a Mask strength should be separate from area strength. 2023-04-29 20:06:53 -04:00
comfyanonymous
ade1b2244e Merge branch 'condition_by_mask_node' of https://github.com/guill/ComfyUI 2023-04-29 15:05:18 -04:00
Jacob Segal
f7dd560777 Default to sampling entire image
By default, when applying a mask to a condition, the entire image will
still be used for sampling. The new "set_area_to_bounds" option on the
node will allow the user to automatically limit conditioning to the
bounds of the mask.

I've also removed the dependency on torchvision for calculating bounding
boxes. I've taken the opportunity to fix some frustrating details in the
other version:
1. An all-0 mask will no longer cause an error
2. Indices are returned as integers instead of floats so they can be
   used to index into tensors.
2023-04-29 00:16:58 -07:00
comfyanonymous
806786ed1d Don't try to get vram from xpu or cuda when directml is enabled. 2023-04-29 00:28:48 -04:00
comfyanonymous
e7ae3bc44c You can now select the device index with: --directml id
Like this for example: --directml 1
2023-04-28 16:51:35 -04:00
comfyanonymous
c2afcad2a5 Basic torch_directml support. Use --directml to use it. 2023-04-28 14:28:57 -04:00
Jacob Segal
6bfd8b6b1a Add Condition by Mask node
This PR adds support for a Condition by Mask node. This node allows
conditioning to be limited to a non-rectangle area.
2023-04-27 20:03:27 -07:00
comfyanonymous
a9e0b4177d Add callback to sampler function.
Callback format is: callback(step, x0, x)
2023-04-27 04:38:44 -04:00
comfyanonymous
d95ef10342 Some fixes to the batch masks PR. 2023-04-25 01:12:40 -04:00
comfyanonymous
288c72fe9f Refactor more code to sample.py 2023-04-24 23:25:51 -04:00
comfyanonymous
112d4ab7d7 This is cleaner this way. 2023-04-24 22:45:35 -04:00
BlenderNeko
d556513e2a gligen tuple 2023-04-24 21:47:57 +02:00
pythongosssss
51a069805b Add progress to vae decode tiled 2023-04-24 11:55:44 +01:00
BlenderNeko
7db702ecd0 made sample functions more explicit 2023-04-24 12:53:10 +02:00
BlenderNeko
ac6686d523 add docstrings 2023-04-23 20:09:09 +02:00
BlenderNeko
1e9a5097e1 Merge branch 'master' of https://github.com/BlenderNeko/ComfyUI 2023-04-23 20:02:18 +02:00
BlenderNeko
3e6b963e46 refactor/split various bits of code for sampling 2023-04-23 20:02:08 +02:00
comfyanonymous
e6771d0986 Implement Linear hypernetworks.
Add a HypernetworkLoader node to use hypernetworks.
2023-04-23 12:35:25 -04:00
comfyanonymous
0d66023475 This makes pytorch2.0 attention perform a bit faster. 2023-04-22 14:30:39 -04:00
comfyanonymous
ed4d73d4fd Remove some useless code. 2023-04-20 23:58:25 -04:00
comfyanonymous
a86c06e8da Don't pass adm to model when it doesn't support it. 2023-04-19 21:11:38 -04:00
comfyanonymous
6c156642e4 Add support for GLIGEN textbox model. 2023-04-19 11:06:32 -04:00
comfyanonymous
3fe1252a35 Add a way for nodes to set a custom CFG function. 2023-04-17 11:05:15 -04:00
comfyanonymous
4df70d0f62 Fix model_management import so it doesn't get executed twice. 2023-04-15 19:04:33 -04:00
comfyanonymous
f089d4abc7 Some refactoring: from_tokens -> encode_from_tokens 2023-04-15 18:46:58 -04:00
comfyanonymous
1b821e4d57 Merge branch 'master' of https://github.com/BlenderNeko/ComfyUI 2023-04-15 14:16:50 -04:00
BlenderNeko
e550f2f84f fixed improper padding 2023-04-15 19:38:21 +02:00
comfyanonymous
3b9a2f504d Move code to empty gpu cache to model_management.py 2023-04-15 11:19:07 -04:00
comfyanonymous
0ecef1b4e8 Safely load pickled embeds that don't load with weights_only=True. 2023-04-14 15:33:43 -04:00
BlenderNeko
47b2d342a8 ensure backwards compat with optional args 2023-04-14 21:16:55 +02:00
BlenderNeko
779bed1a43 align behavior with old tokenize function 2023-04-14 21:02:45 +02:00
comfyanonymous
4d8a84520f Don't stop workflow if loading embedding fails. 2023-04-14 13:54:00 -04:00
BlenderNeko
928cb6b2c7 split tokenizer from encoder 2023-04-13 22:06:50 +02:00
BlenderNeko
02f7bf6cb8 add unique ID per word/embedding for tokenizer 2023-04-13 22:01:01 +02:00
comfyanonymous
9c2869e012 Fix for new transformers version. 2023-04-09 15:55:21 -04:00
comfyanonymous
4861dbb2e2 Print xformers version and warning about 0.0.18 2023-04-09 01:31:47 -04:00
comfyanonymous
7f1c54adeb Clarify what --windows-standalone-build does. 2023-04-07 15:52:56 -04:00
comfyanonymous
88e5ccb415 Cleanup. 2023-04-07 02:31:46 -04:00
comfyanonymous
d4301d49d3 Fix loading SD1.5 diffusers checkpoint. 2023-04-07 01:30:33 -04:00
comfyanonymous
8aebe865f2 Merge branch 'master' of https://github.com/sALTaccount/ComfyUI 2023-04-07 01:03:43 -04:00
comfyanonymous
d35efcbcb2 Add a --force-fp32 argument to force fp32 for debugging. 2023-04-07 00:27:54 -04:00
comfyanonymous
55a48f27db Small refactor. 2023-04-06 23:53:54 -04:00
comfyanonymous
69bc45aac3 Merge branch 'ipex' of https://github.com/kwaa/ComfyUI-IPEX 2023-04-06 23:45:29 -04:00
藍+85CD
3adedd52d3 Merge branch 'master' into ipex 2023-04-07 09:11:30 +08:00
EllangoK
b12efcd7b4 fixes lack of support for multi configs
also adds some metavars to argarse
2023-04-06 19:06:39 -04:00
comfyanonymous
f2ca0a15ee Rename the cors parameter to something more verbose. 2023-04-06 15:24:55 -04:00
EllangoK
405685ce89 makes cors a cli parameter 2023-04-06 15:06:22 -04:00
EllangoK
1992795f88 set listen flag to listen on all if specifed 2023-04-06 13:19:00 -04:00
藍+85CD
01c0951a73 Fix auto lowvram detection on CUDA 2023-04-06 15:44:05 +08:00
sALTaccount
671feba9e6 diffusers loader 2023-04-05 23:57:31 -07:00
藍+85CD
23fd4abad1 Use separate variables instead of vram_state 2023-04-06 14:24:47 +08:00
藍+85CD
772741f218 Import intel_extension_for_pytorch as ipex 2023-04-06 12:27:22 +08:00
EllangoK
cd00b46465 seperates out arg parser and imports args 2023-04-05 23:41:23 -04:00
藍+85CD
16f4d42aa0 Add basic XPU device support
closed #387
2023-04-05 21:22:14 +08:00
comfyanonymous
7597a5d83e Disable xformers in VAE when xformers == 0.0.18 2023-04-04 22:22:02 -04:00
comfyanonymous
76a6b372da Ignore embeddings when sizes don't match and print a WARNING. 2023-04-04 11:49:29 -04:00
comfyanonymous
d96fde8103 Remove print. 2023-04-03 22:58:54 -04:00
comfyanonymous
0d1c6a3934 Pull latest tomesd code from upstream. 2023-04-03 15:49:28 -04:00
comfyanonymous
0e06be56ad Add noise augmentation setting to unCLIPConditioning. 2023-04-03 13:50:29 -04:00