Commit Graph

722 Commits

Author SHA1 Message Date
AUTOMATIC
dc1117233e simplify xfrmers options: --xformers to enable and that's it 2022-10-08 17:02:18 +03:00
AUTOMATIC
7ff1170a2e emergency fix for xformers (continue + shared) 2022-10-08 16:33:39 +03:00
AUTOMATIC1111
48feae37ff
Merge pull request #1851 from C43H66N12O12S2/flash
xformers attention
2022-10-08 16:29:59 +03:00
C43H66N12O12S2
970de9ee68
Update sd_hijack.py 2022-10-08 16:29:43 +03:00
C43H66N12O12S2
69d0053583
update sd_hijack_opt to respect new env variables 2022-10-08 16:21:40 +03:00
C43H66N12O12S2
ddfa9a9786
add xformers_available shared variable 2022-10-08 16:20:41 +03:00
C43H66N12O12S2
26b459a379
default to split attention if cuda is available and xformers is not 2022-10-08 16:20:04 +03:00
MrCheeze
5f85a74b00 fix bug where when using prompt composition, hijack_comments generated before the final AND will be dropped 2022-10-08 15:48:04 +03:00
ddPn08
772db721a5 fix glob path in hypernetwork.py 2022-10-08 15:46:54 +03:00
AUTOMATIC
7001bffe02 fix AND broken for long prompts 2022-10-08 15:43:25 +03:00
AUTOMATIC
77f4237d1c fix bugs related to variable prompt lengths 2022-10-08 15:25:59 +03:00
AUTOMATIC
4999eb2ef9 do not let user choose his own prompt token count limit 2022-10-08 14:25:47 +03:00
Trung Ngo
00117a07ef check specifically for skipped 2022-10-08 13:40:39 +03:00
Trung Ngo
786d9f63aa Add button to skip the current iteration 2022-10-08 13:40:39 +03:00
AUTOMATIC
45cc0ce3c4 Merge remote-tracking branch 'origin/master' 2022-10-08 13:39:08 +03:00
AUTOMATIC
706d5944a0 let user choose his own prompt token count limit 2022-10-08 13:38:57 +03:00
leko
616b7218f7 fix: handles when state_dict does not exist 2022-10-08 12:38:50 +03:00
C43H66N12O12S2
91d66f5520
use new attnblock for xformers path 2022-10-08 11:56:01 +03:00
C43H66N12O12S2
76a616fa6b
Update sd_hijack_optimizations.py 2022-10-08 11:55:38 +03:00
C43H66N12O12S2
5d54f35c58
add xformers attnblock and hypernetwork support 2022-10-08 11:55:02 +03:00
brkirch
f2055cb1d4 Add hypernetwork support to split cross attention v1
* Add hypernetwork support to split_cross_attention_forward_v1
* Fix device check in esrgan_model.py to use devices.device_esrgan instead of shared.device
2022-10-08 09:39:17 +03:00
C43H66N12O12S2
b70eaeb200
delete broken and unnecessary aliases 2022-10-08 04:10:35 +03:00
C43H66N12O12S2
c9cc65b201
switch to the proper way of calling xformers 2022-10-08 04:09:18 +03:00
AUTOMATIC
12c4d5c6b5 hypernetwork training mk1 2022-10-07 23:22:22 +03:00
Greendayle
5f12e7efd9 linux test 2022-10-07 20:58:30 +02:00
Greendayle
fa2ea648db even more powerfull fix 2022-10-07 20:46:38 +02:00
Greendayle
54fa613c83 loading tf only in interrogation process 2022-10-07 20:37:43 +02:00
Greendayle
537da7a304 Merge branch 'master' into dev/deepdanbooru 2022-10-07 18:31:49 +02:00
AUTOMATIC
f7c787eb7c make it possible to use hypernetworks without opt split attention 2022-10-07 16:39:51 +03:00
AUTOMATIC
97bc0b9504 do not stop working on failed hypernetwork load 2022-10-07 13:22:50 +03:00
AUTOMATIC
d15b3ec001 support loading VAE 2022-10-07 10:40:22 +03:00
AUTOMATIC
bad7cb29ce added support for hypernetworks (???) 2022-10-07 10:17:52 +03:00
C43H66N12O12S2
5e3ff846c5
Update sd_hijack.py 2022-10-07 06:38:01 +03:00
C43H66N12O12S2
5303df2428
Update sd_hijack.py 2022-10-07 06:01:14 +03:00
C43H66N12O12S2
35d6b23162
Update sd_hijack.py 2022-10-07 05:31:53 +03:00
C43H66N12O12S2
da4ab2707b
Update shared.py 2022-10-07 05:23:06 +03:00
C43H66N12O12S2
2eb911b056
Update sd_hijack.py 2022-10-07 05:22:28 +03:00
C43H66N12O12S2
f174fb2922
add xformers attention 2022-10-07 05:21:49 +03:00
AUTOMATIC
b34b25b4c9 karras samplers for img2img? 2022-10-06 23:27:01 +03:00
Milly
405c8171d1 Prefer using Processed.sd_model_hash attribute when filename pattern 2022-10-06 20:41:23 +03:00
Milly
1cc36d170a Added job_timestamp to Processed
So `[job_timestamp]` pattern can use in saving image UI.
2022-10-06 20:41:23 +03:00
Milly
070b7d60cf Added styles to Processed
So `[styles]` pattern can use in saving image UI.
2022-10-06 20:41:23 +03:00
Milly
cf7c784fcc Removed duplicate defined models_path
Use `modules.paths.models_path` instead `modules.shared.model_path`.
2022-10-06 20:29:12 +03:00
AUTOMATIC
dbc8a4d351 add generation parameters to images shown in web ui 2022-10-06 20:27:50 +03:00
Milly
0bb458f0ca Removed duplicate image saving codes
Use `modules.images.save_image()` instead.
2022-10-06 20:15:39 +03:00
Jairo Correa
b66aa334a9 Merge branch 'master' into fix-vram 2022-10-06 13:41:37 -03:00
DepFA
fec71e4de2 Default window title progress updates on 2022-10-06 17:58:52 +03:00
DepFA
be71115b1a Update shared.py 2022-10-06 17:58:52 +03:00
AUTOMATIC
5993df24a1 integrate the new samplers PR 2022-10-06 14:12:52 +03:00
C43H66N12O12S2
3ddf80a9db add variant setting 2022-10-06 13:42:21 +03:00
C43H66N12O12S2
71901b3d3b add karras scheduling variants 2022-10-06 13:42:21 +03:00
AUTOMATIC
2d3ea42a2d workaround for a mysterious bug where prompt weights can't be matched 2022-10-06 13:21:12 +03:00
AUTOMATIC
5f24b7bcf4 option to let users select which samplers they want to hide 2022-10-06 12:08:59 +03:00
Raphael Stoeckli
4288e53fc2 removed unused import, fixed typo 2022-10-06 08:52:29 +03:00
Raphael Stoeckli
2499fb4e19 Add sanitizer for captions in Textual inversion 2022-10-06 08:52:29 +03:00
AUTOMATIC1111
0e92c36707
Merge pull request #1755 from AUTOMATIC1111/use-typing-list
use typing.list in prompt_parser.py for wider python version support
2022-10-06 08:50:06 +03:00
DepFA
55400c981b Set gradio-img2img-tool default to 'editor' 2022-10-06 08:46:32 +03:00
DepFA
af02ee1297
Merge branch 'master' into use-typing-list 2022-10-05 23:02:45 +01:00
DepFA
34c358d10d
use typing.list in prompt_parser.py for wider python version support 2022-10-05 22:11:30 +01:00
AUTOMATIC
20f8ec877a remove type annotations in new code because presumably they don't work in 3.7 2022-10-06 00:09:32 +03:00
AUTOMATIC
f8e41a96bb fix various float parsing errors 2022-10-05 23:52:05 +03:00
Greendayle
4320f386d9 removing underscores and colons 2022-10-05 22:39:32 +02:00
AUTOMATIC
c26732fbee added support for AND from https://energy-based-model.github.io/Compositional-Visual-Generation-with-Composable-Diffusion-Models/ 2022-10-05 23:16:27 +03:00
Greendayle
17a99baf0c better model search 2022-10-05 22:07:28 +02:00
Greendayle
1506fab29a removing problematic tag 2022-10-05 21:15:08 +02:00
Greendayle
59a2b9e5af deepdanbooru interrogator 2022-10-05 20:55:26 +02:00
DepFA
bbdbbd36ed shared.state.interrupt when restart is requested 2022-10-05 11:37:18 +03:00
Jairo Correa
82380d9ac1 Removing parts no longer needed to fix vram 2022-10-04 22:31:40 -03:00
Jairo Correa
1f50971fb8 Merge branch 'master' into fix-vram 2022-10-04 19:53:52 -03:00
xpscyho
ef40e4cd4d Display time taken in mins, secs when relevant
Fixes #1656
2022-10-04 23:41:42 +03:00
AUTOMATIC
b32852ef03 add editor to img2img 2022-10-04 20:49:54 +03:00
Rae Fu
90e911fd54 prompt_parser: allow spaces in schedules, add test, log/ignore errors
Only build the parser once (at import time) instead of for each step.

doctest is run by simply executing modules/prompt_parser.py
2022-10-04 20:26:15 +03:00
AUTOMATIC
1eb588cbf1 remove functools.cache as some people are having issues with it 2022-10-04 18:02:01 +03:00
AUTOMATIC
e1b128d8e4 do not touch p.seed/p.subseed during processing #1181 2022-10-04 17:36:39 +03:00
AUTOMATIC
957e29a8e9 option to not show images in web ui 2022-10-04 17:23:48 +03:00
AUTOMATIC
52cef36f6b emergency fix for img2img 2022-10-04 16:54:31 +03:00
AUTOMATIC1111
e6cbef785a
Merge pull request #1550 from RnDMonkey/#1484_fix_empty_styles_pattern
#1484 fix empty styles pattern
2022-10-04 15:26:48 +03:00
Milly
eec1b39bd5 Apply prompt pattern last 2022-10-04 15:22:49 +03:00
Justin Riddiough
ea6b0d98a6 Remove pycharm note, fix typo 2022-10-04 15:21:34 +03:00
Justin Riddiough
accd00d6b8 Explain how to use second progress bar in pycharm 2022-10-04 15:21:34 +03:00
brkirch
e9e2a7ec9a
Merge branch 'master' into cpu-cmdline-opt 2022-10-04 07:42:53 -04:00
AUTOMATIC
d5bba20a58 ignore errors in parse for purposes of token counting for #1564 2022-10-04 14:35:12 +03:00
AUTOMATIC
b7f3996982 Merge remote-tracking branch 'origin/master' 2022-10-04 14:23:29 +03:00
AUTOMATIC
6165246124 support interrupting after the previous change 2022-10-04 14:23:22 +03:00
dan
2f1b61d979 Allow nested structures inside schedules 2022-10-04 14:22:41 +03:00
AUTOMATIC
6c6ae28bf5 send all three of GFPGAN's and codeformer's models to CPU memory instead of just one for #1283 2022-10-04 12:32:22 +03:00
brkirch
dc9c5a9774 Modify --add-cpu description 2022-10-04 05:22:50 -04:00
brkirch
27ddc24fde Add BSRGAN to --add-cpu 2022-10-04 05:18:17 -04:00
brkirch
2adb249740 Merge branch 'cpu-cmdline-opt' of https://github.com/brkirch/stable-diffusion-webui into cpu-cmdline-opt 2022-10-04 04:26:54 -04:00
brkirch
35a00b0130
Merge branch 'AUTOMATIC1111:master' into cpu-cmdline-opt 2022-10-04 04:25:27 -04:00
brkirch
eeab7aedf5 Add --use-cpu command line option
Remove MPS detection to use CPU for GFPGAN / CodeFormer and add a --use-cpu command line option.
2022-10-04 04:24:35 -04:00
AUTOMATIC
5ef0baf5ea add support for gelbooru tags in filenames for textual inversion 2022-10-04 08:52:27 +03:00
brkirch
b88e4ea7d6
Merge branch 'master' into master 2022-10-04 01:04:19 -04:00
AUTOMATIC
2865ef4b9a fix broken date in TI 2022-10-03 13:10:03 +03:00
AUTOMATIC
43a74fa595 batch processing for img2img with an empty output directory, by request 2022-10-03 11:48:19 +03:00
AUTOMATIC
d15c125db7 Merge remote-tracking branch 'origin/master' 2022-10-03 08:54:06 +03:00
AUTOMATIC
6491b09c24 use existing function for gfpgan 2022-10-03 08:53:52 +03:00
RnDMonkey
80c418c0d3
Merge branch 'AUTOMATIC1111:master' into #1484_fix_empty_styles_pattern 2022-10-02 22:22:14 -07:00
RnDMonkey
36ea4ac0f5 moved no-style return outside join function 2022-10-02 22:21:16 -07:00
hentailord85ez
34c638142e Fixed when eta = 0
Unexpected behavior when using eta = 0 in something like XY, but your default eta was set to something not 0.
2022-10-03 08:20:19 +03:00
Hanusz Leszek
e615d4f9d1 Convert folder icon surrogate pair to valid utf8 2022-10-03 07:59:13 +03:00
AUTOMATIC
2cd6a00f37 Merge remote-tracking branch 'origin/master' 2022-10-03 07:58:06 +03:00
AUTOMATIC
138662734c use dropdown instead of radio for img2img upscaler selection 2022-10-03 07:57:59 +03:00
AUTOMATIC1111
3fac3764b3
Merge branch 'master' into #1484_fix_empty_styles_pattern 2022-10-03 07:54:57 +03:00
Jairo Correa
ad0cc85d1f Merge branch 'master' into stable 2022-10-02 18:31:19 -03:00
AUTOMATIC
166283653c remove LDSR warning 2022-10-02 23:18:13 +03:00
AUTOMATIC
6785331e22 keep textual inversion dataset latents in CPU memory to save a bit of VRAM 2022-10-02 22:59:01 +03:00
AUTOMATIC
c7543d4940 preprocessing for textual inversion added 2022-10-02 22:41:21 +03:00
AUTOMATIC
c4445225f7 change wording for options 2022-10-02 21:50:14 +03:00
Lopyter
91f327f22b make save to dirs optional for imgs saved from ui 2022-10-02 21:47:52 +03:00
AUTOMATIC1111
688c4a914a
Merge branch 'master' into 1404-script-reload-without-restart 2022-10-02 21:33:22 +03:00
DepFA
e808096cf6
correct indent 2022-10-02 19:26:06 +01:00
AUTOMATIC
852fd90c0d emergency fix for disabling SD model download after multiple complaints 2022-10-02 21:22:20 +03:00
AUTOMATIC
0a435f0988 Merge remote-tracking branch 'origin/master' 2022-10-02 21:21:10 +03:00
AUTOMATIC1111
0b94fc5033
Merge pull request #1324 from liamkerr/token_updates
Fixing Bugs with Token Counter
2022-10-02 21:20:05 +03:00
AUTOMATIC
a1cde7e646 disabled SD model download after multiple complaints 2022-10-02 21:09:10 +03:00
d8ahazard
6365a41f59 Update esrgan_model.py
Use alternate ESRGAN Model download path.
2022-10-02 21:02:03 +03:00
AUTOMATIC
3ff0de2c59 added --disable-console-progressbars to disable progressbars in console
disabled printing prompts to console by default, enabled by --enable-console-prompts
2022-10-02 20:23:40 +03:00
AUTOMATIC
4ec4af6e0b add checkpoint info to saved embeddings 2022-10-02 20:15:25 +03:00
AUTOMATIC
71fe7fa49f fix using aaaa-100 embedding when the prompt has aaaa-10000 and you have both aaaa-100 and aaaa-10000 in the directory with embeddings. 2022-10-02 19:56:37 +03:00
AUTOMATIC
88ec0cf557 fix for incorrect embedding token length calculation (will break seeds that use embeddings, you're welcome!)
add option to input initialization text for embeddings
2022-10-02 19:40:51 +03:00
AUTOMATIC1111
6e063124ac
Merge pull request #1403 from d8ahazard/ScuNET
Add ScuNET Denoiser/Upscaler, Fix some Model Loader issues
2022-10-02 17:39:34 +03:00
liamkerr
a32a068ed1
Merge branch 'master' into token_updates 2022-10-02 10:26:20 -04:00
AUTOMATIC
f34e2293d0 Merge remote-tracking branch 'origin/master' 2022-10-02 17:25:28 +03:00
AUTOMATIC
0758f6e641 fix --ckpt option breaking model selection 2022-10-02 17:24:50 +03:00
AUTOMATIC1111
a9d7eb722f
Merge branch 'master' into saving 2022-10-02 17:03:01 +03:00
liamkerr
7308aeefd9
Merge branch 'master' into token_updates 2022-10-02 10:02:38 -04:00
d8ahazard
5d26ba2b4b
Merge branch 'master' into ScuNET 2022-10-02 07:56:22 -05:00
AUTOMATIC
5f561ee95d Merge remote-tracking branch 'origin/master' 2022-10-02 15:49:59 +03:00
AUTOMATIC
0114057ad6 fix incorrect use of glob in modelloader for #1410 2022-10-02 15:49:42 +03:00
AUTOMATIC
820f1dc96b initial support for training textual inversion 2022-10-02 15:03:39 +03:00
RnDMonkey
32edf1732f os.path.normpath wasn't working, reverting to manual strip 2022-10-01 21:37:14 -07:00
RnDMonkey
70f5267047 use os.path.normpath for better safety checking 2022-10-01 21:18:15 -07:00
RnDMonkey
3cf1a96006 added safety for blank directory naming patterns 2022-10-01 21:11:03 -07:00
DepFA
2deea86781
Put reload buttons in row and add secondary style 2022-10-02 01:36:30 +01:00
DepFA
07e40ad7f2
add custom script body only refresh option 2022-10-02 01:19:55 +01:00
DepFA
cf33268d68
add script body only refresh 2022-10-02 01:18:42 +01:00
DepFA
0aa354bd5e
remove styling from python side 2022-10-02 00:13:47 +01:00
DepFA
027c5aae55
update reloading message style 2022-10-01 23:29:26 +01:00
DepFA
6048002dad
Add scope warning to refresh button 2022-10-01 23:10:07 +01:00
DepFA
afaa03c5fd
add redefinition guard to gradio_routes_templates_response 2022-10-01 22:43:45 +01:00
Alexandre Simard
121ed7d36f Add progress bar for SwinIR in cmd
I do not know how to add them to the UI...
2022-10-01 14:04:20 -04:00
DepFA
4f8490cd56
add restart button 2022-10-01 18:33:31 +01:00
DepFA
4c2478a68a
add script reload method 2022-10-01 18:30:53 +01:00
DepFA
bc38c80cfc add sampler_noise_scheduler_override switch 2022-10-01 08:08:50 +03:00
DepFA
9de1e56e2d add sampler_noise_scheduler_override property 2022-10-01 08:08:50 +03:00
brkirch
bdaa36c844 When device is MPS, use CPU for GFPGAN instead
GFPGAN will not work if the device is MPS, so default to CPU instead.
2022-09-30 23:53:25 -04:00
Liam
3c6a049fc3 consolidated token counter functions 2022-09-30 18:22:50 -04:00
Liam
ff8dc1908a fixed token counter for prompt editing 2022-09-30 18:22:50 -04:00
Liam
abdbf1de64 token counters now update when roll artist and style buttons are pressed https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/1194#issuecomment-1261203893 2022-09-30 18:22:40 -04:00