Commit Graph

42 Commits

Author SHA1 Message Date
xra
c861d42feb Merge branch 'master' of https://github.com/xraxra/stable-diffusion-webui
# Conflicts:
#	webui.py
2022-08-25 02:54:40 +09:00
xra
f502897a06 updated weights code to match latest 2022-08-25 02:51:28 +09:00
hlky
75a7cadf3b
Revert "Merge pull request #4 from xraxra/master"
This reverts commit eae4ec82be, reversing
changes made to 5ae104bd99.
2022-08-24 18:23:52 +01:00
hlky
eae4ec82be
Merge pull request #4 from xraxra/master
weighted prompts similar to Midjourney
2022-08-24 18:15:04 +01:00
hlky
e460676043
Merge branch 'master' into master 2022-08-24 18:14:16 +01:00
hlky
56a93f37c3
Fix skip save individual images and skip grid with loopback
Fix skip save individual images and skip grid with loopback
2022-08-24 18:02:26 +01:00
xra
f2f866e67f weighted prompts similar to Midjourney
adds support for doing stuff like `a forest under night sky: by Studio Ghibli:1.8 in the style of Starry Night:2.3`

the : are treated as splits in the prompt, so the above turns into 3 prompts-
a forest under night sky 19.6%
by Studio Ghibli 35.2%
in the style of Starry Night 45.0%

the prompts are added together with torch.add using their weight as alpha
if a weight is negative it has the effect of subtracting (same result as torch.sub)

by default all values are normalized to try to add up to 1.0
If you want more control you can disable normalization, but values going far below 0 and 1 will cause artifacts
2022-08-25 01:51:22 +09:00
netcavy
b58c3038f9 added support for words in seeds 2022-08-25 02:42:29 +10:00
hlky
0f9c93808d
jpg quality 💯
jpg quality 💯 %
2022-08-24 17:36:45 +01:00
hlky
a743e60e0e
Skip grid/skip save + DDIM img2img!!
Added checkboxes for skip grid/skip individual save
+
DDIM for img2img!! (PLMS unsupported??)
2022-08-24 17:32:55 +01:00
netcavy
2137bb1ada Better crash display 2022-08-25 01:53:35 +10:00
netcavy
ae70eaeb5c Better crash display 2022-08-25 01:47:34 +10:00
netcavy
7b855f7022 Better crash display 2022-08-25 01:45:55 +10:00
hlky
60c81774da
Merge branch 'master' into master 2022-08-24 15:21:58 +01:00
netcavy
2ca56e3434 Fix img2img stats with new loopback feature 2022-08-25 00:14:23 +10:00
hlky
95423e2798
pynvml mem usage
pynvml mem usage
2022-08-24 15:12:20 +01:00
hlky
47d79b2ac9
Revert "Merge branch 'master' into master"
This reverts commit 15a700bbe5, reversing
changes made to abb83239e5.
2022-08-24 15:11:12 +01:00
ShinkoNet
accbdee516
Merge branch 'master' into master 2022-08-25 00:04:17 +10:00
netcavy
8cd893f279 Add stat handling to img2img 2022-08-24 23:59:44 +10:00
AUTOMATIC1111
15a700bbe5
Merge branch 'master' into master 2022-08-24 16:50:57 +03:00
netcavy
cd46fb54b5 Merge branch 'master' of https://github.com/ShinkoNet/stable-diffusion-webui 2022-08-24 23:47:07 +10:00
netcavy
80ad27ab1d Bugfix and statistic display 2022-08-24 23:46:39 +10:00
AUTOMATIC
32dd552883 loopback mode for img2img
commandline options for grid filetypes and max batch count
2022-08-24 16:42:22 +03:00
ShinkoNet
a60b5a8eb6
Merge branch 'master' into master 2022-08-24 23:33:41 +10:00
netcavy
878c482ee9 Added crash handling and memory tracking (bugged) 2022-08-24 23:21:29 +10:00
hlky
abb83239e5
torch_gc/empty cache after generation
added torch_gc() which calls both cuda.empty_cache() and cuda.ipc_collect()
called before and after generation
2022-08-24 14:12:33 +01:00
netcavy
a964a4c3d3 Added memory management and statistics (bugged) 2022-08-24 23:07:57 +10:00
hlky
29d0d65504 jpg grid, named grid
Grid file named with seed and prompt, output as jpg
2022-08-24 12:44:48 +01:00
AUTOMATIC
852baf422a gfpgan dir for the guide's directory names
fix a bug in image resizing
2022-08-24 13:42:21 +03:00
AUTOMATIC
1463d44faf added resizing modes
added more info into readme
2022-08-24 10:52:41 +03:00
AUTOMATIC
2a0f8afb29 remove remote image as sample for img2img (it will now use a local image if you have one, none otherwise) 2022-08-24 09:24:32 +03:00
AUTOMATIC
6efddcb279 hide gradio progressbar for about 10% speed increase on my GPU; a commandline option to prevent hiding 2022-08-24 09:06:36 +03:00
AUTOMATIC
165da39fb1 fixed a possible issue with older versions of PIL 2022-08-24 01:08:59 +03:00
AUTOMATIC
81087207bc --no-half commandline option to disable .half() 2022-08-24 00:38:53 +03:00
AUTOMATIC
7fd0f31661 added prompt verification: if it's too long, a warning is returned in the text field along with the part of prompt that has been truncated 2022-08-24 00:02:43 +03:00
AUTOMATIC
aa67540eba Added prompt matrix to img2img
refactoring: separated duplicate code from img2img and txt2img into a single function
2022-08-23 22:42:43 +03:00
AUTOMATIC
cb118c4036 Prompt matrix now draws text like in demo. 2022-08-23 18:04:13 +03:00
AUTOMATIC
61bfa6c16b additional picture for prompt matrix
proper seeds for img2img
a bit of refactoring
2022-08-23 14:07:37 +03:00
AUTOMATIC
60e95f1d8c silence the warning from transformers
add feature demonstrations to readme
2022-08-23 11:58:50 +03:00
AUTOMATIC
3395c29127 added prompt matrix feature
all images in batches now have proper seeds, not just the first one
added code to remove bad characters from filenames
added code to flag output which writes it to csv and saves images
renamed some fields in UI for clarity
2022-08-23 00:34:49 +03:00
AUTOMATIC
b63d0726cd fixed bug with images not resizing for img2img
added GFPGAN as an option for img2img
added GFPGAN as a tab
added autodetection for row counts for grids, enabled by default
removed Fixed Code sampling because no one can figure out what it does; maybe someone will be upset by removal and will tell me
2022-08-22 20:08:32 +03:00
AUTOMATIC
3324f31e84 first 2022-08-22 17:15:46 +03:00