Lincoln Stein
5354122094
Merge branch 'main' into refactor-pngwriter-2
2022-08-31 01:24:17 -04:00
spezialspezial
64444025a9
Update simplet2i.py ( #228 )
...
Typo causing bug when preinitializing the model. Unsupported Sampler: klms, Defaulting to plms
2022-08-31 01:08:46 -04:00
Kevin Gibbons
d566ee092a
move make_grid into image_utils
2022-08-30 22:03:53 -07:00
Kevin Gibbons
b983d61e93
tweak format of "result" event in web ui
2022-08-30 22:03:53 -07:00
Kevin Gibbons
153c93bdd4
refactor pngwriter
2022-08-30 22:03:51 -07:00
Lincoln Stein
3be1cee17c
avoid crash due to dangling batch_size reference
2022-08-31 00:56:12 -04:00
Lincoln Stein
bdb0651eb2
add support for Apple hardware using MPS acceleration
2022-08-31 00:33:23 -04:00
blessedcoolant
1480ef84dc
Add Resolution Checker
2022-08-31 14:54:16 +12:00
Kevin Gibbons
1714816fe2
remove support for batch_size from dream.py ( #227 )
...
* remove dream.py support for batch_size
* expect to get a single image
2022-08-30 22:30:12 -04:00
Kevin Gibbons
8ca4d6542d
support progress for img2img ( #215 )
...
WebGUI shows progress bar when an initial image is provided.
2022-08-30 15:36:12 -04:00
Lincoln Stein
a51e18ea98
resize initial image to match requested width and height, preserving aspect ratio. Closes #210 . Closes #207 ( #214 )
2022-08-30 15:26:02 -04:00
Kevin Gibbons
5d13207aa6
webui: support cancelation
2022-08-30 08:55:40 -07:00
Lincoln Stein
186d0f9d10
Merge branch 'sw-drop' of https://github.com/bakkot/stable-diffusion into bakkot-sw-drop
2022-08-30 09:17:07 -04:00
Lincoln Stein
19e4298cf9
Merge branch 'BlueAmulet-prompt_as_dir' into main
...
This adds the frequently-requested feature of naming the output
directory after the text prompt.
2022-08-29 22:34:48 -04:00
Lincoln Stein
42ffcd7204
add the recently added commands to the readline command-line-completion list; fix command-line documentation bug, closing issue #188
2022-08-29 22:34:09 -04:00
Kevin Gibbons
18597ad1d9
fix bug in pngwriter
2022-08-29 16:33:32 -07:00
Kevin Gibbons
0173d3a8fc
stream images
2022-08-29 16:33:31 -07:00
Kevin Gibbons
a7a62d39d4
webui: hide gfpgan if not installed
2022-08-29 16:27:44 -07:00
Lincoln Stein
24ce56b3db
Merge branch 'webui-sampler-fix' into main
2022-08-29 19:25:49 -04:00
Lincoln Stein
81ad239197
Merge pull request #192 from david-ford/working-branch
...
Fix case sensitive check to be case insensitive
2022-08-29 17:48:12 -04:00
David Ford
ed38c97ed8
Removed unrelated changes and updated based on recommendation
...
Removed the changes to the index.html and .gitattributes for this PR. Will add them in separate PRs.
Applied recommended change for resolving the case issue.
2022-08-29 16:43:34 -05:00
Lincoln Stein
7fe7cdc8c9
Merge pull request #176 from xraxra/show-tokenization
...
Print out tokenization data during image generation, allowing truncated prompts to be visible.
2022-08-29 15:36:10 -04:00
Lincoln Stein
6fb2f1ed6e
fixes WebUI so that the selected sampler is actually applied
2022-08-29 14:06:18 -04:00
Lincoln Stein
38701a6d7b
Fix IndexError when generating grid; --grid option can now be passed on shell command line
2022-08-29 13:52:44 -04:00
David Ford
31fa92a83f
Fix case sensitive check to be case insensitive
...
Case sensitivity between os.getcwd and os.realpath can fail due to different drive letter casing. C:\ vs c:\. This change addresses that by normalizing the strings before comparing.
2022-08-29 12:46:24 -05:00
Lincoln Stein
0abfc3cac6
Merge branch 'main' of github.com:lstein/stable-diffusion into main
...
This fixes issue with grid generation.
2022-08-29 13:39:59 -04:00
Lincoln Stein
d483fcb53a
Merge pull request #166 from SMUsamaShah/patch-1
...
Bug fix in grid
2022-08-29 13:39:50 -04:00
Lincoln Stein
c7db038c96
grid is broken, needs the grid-fix PR#166 to fix
2022-08-29 13:39:20 -04:00
Lincoln Stein
4acfb76be6
correctly handle upscaling in webUI, including displaying status messages during GFPGAN/ESRGAN postprocessing
2022-08-29 12:08:18 -04:00
Lincoln Stein
fd13526454
Merge pull request #175 from bakkot/unicode
...
read/write plain text files in utf-8, not ascii
2022-08-29 07:03:55 -04:00
Lincoln Stein
7718af041c
Merge pull request #178 from lstein/dream-web-upscaling
...
FEAT: Dream web upscaling
2022-08-29 06:59:21 -04:00
tesseractcat
070795a3b4
webui: stream progress events to page
2022-08-28 21:54:10 -07:00
Lincoln Stein
46464ac677
remove unused metadatastr variable
2022-08-28 23:45:50 -04:00
Lincoln Stein
03d8eb19e0
when no callback used, modify results list so that upscaled/face-fixed image replaces the old one
2022-08-28 23:40:04 -04:00
xra
fef632e0e1
tokenization logging (take 2)
...
This adds an option -t argument that will print out color-coded tokenization, SD has a maximum of 77 tokens, it silently discards tokens over the limit if your prompt is too long.
By using -t you can see how your prompt is being tokenized which helps prompt crafting.
2022-08-29 12:28:49 +09:00
Lincoln Stein
05061a70b3
report errors on non-cuda systems rather than failing silently
2022-08-28 23:13:23 -04:00
Lincoln Stein
617a029ae7
pass outdir from txt2img() and img2img() to prompt2img() correctly
2022-08-28 23:12:49 -04:00
Kevin Gibbons
7ae79b350e
write log files in utf-8, not ascii
2022-08-28 20:00:11 -07:00
Lincoln Stein
18899be4ae
working, but there is a bug in underlying txt2png() call that is preventing upscaled images from being returned
2022-08-28 22:42:31 -04:00
blessedcoolant
41b26e0520
Merge pull request #171 from blessedcoolant/sampler-bug-fix
...
Fix sampler changer not working.
2022-08-29 13:06:30 +12:00
blessedcoolant
b6053108c1
Merge pull request #168 from blessedcoolant/bug-fixes
...
Fixed grid image not saving
2022-08-29 13:05:53 +12:00
blessedcoolant
f0e2fa781f
Grid image not saving after recent changes has been fixed.
2022-08-29 11:29:45 +12:00
blessedcoolant
87b7446228
Fix unique filename bug
2022-08-29 11:28:16 +12:00
blessedcoolant
8a517fdc17
Fix sampler changer not working.
2022-08-29 11:26:19 +12:00
Lincoln Stein
373a2d9c32
Merge branch 'main' of github.com:lstein/stable-diffusion into main
2022-08-28 19:03:45 -04:00
Lincoln Stein
b85773f332
resolved conflicts and write properly-formatted prompt string (with sampler & upscaling) into image file
2022-08-28 19:01:45 -04:00
Lincoln Stein
ddc0e9b4d8
Merge pull request #133 from bakkot/dir-traversal
...
prevent directory traversal in the web UI
2022-08-28 18:32:12 -04:00
Lincoln Stein
8bbe7936bd
close Issue #165
2022-08-28 18:21:20 -04:00
Kevin Gibbons
9e7865704a
prevent directory traversal in the web UI
2022-08-28 14:33:30 -07:00
Lincoln Stein
ac02a775e4
moved server.py into right location
2022-08-28 17:27:43 -04:00
Lincoln Stein
7c485a1a4a
adjusted -U upscaling argument so that it defaults to upscaling strength 0.75 if the second argument is not given
2022-08-28 17:26:39 -04:00
Lincoln Stein
ea2ee33be8
cosmetic fixup to how the outputs are reported
2022-08-28 17:06:33 -04:00
Lincoln Stein
7dfca3dcb5
moved scripts/dream_server.py into ldm/dream/server.py
2022-08-28 16:37:27 -04:00
blessedcoolant
6e49c070bb
Optimize and Improve GFPGAN and Real-ESRGAN Pipeline
2022-08-29 08:14:29 +12:00
Lincoln Stein
a7ac93a899
Merge pull request #110 from sajattack/half-precision-embeddings
...
Support full-precision embeddings in half precision inference mode
2022-08-28 15:36:26 -04:00
Lincoln Stein
3b2569ebdd
Merge branch 'yunsaki-main' into main
2022-08-28 14:20:48 -04:00
Lincoln Stein
8b9a520c5c
adjusted handling of from_file
2022-08-28 14:20:34 -04:00
Lincoln Stein
ba03289c14
print current and max VRAM usage stats after each round of generation
2022-08-28 13:05:01 -04:00
blessedcoolant
d1551b1bd4
Enable users to set sampler using prompts
2022-08-29 04:27:54 +12:00
Muhammad Usama
59be6c815d
bug fix in grid
...
In case of 6 images 3rd image was also copied to 4th box missing the last image in the grid.
2022-08-28 15:39:09 +01:00
Lincoln Stein
800132970e
Merge pull request #105 from shusso/select-device
...
Move torch.device selection to it's own function
2022-08-26 12:23:21 -04:00
Paul Sajna
555f13e469
Merge branch 'main' into half-precision-embeddings
2022-08-26 08:33:46 -07:00
Paul Sajna
9b5101cd8d
support full-precision embeddings in half precision mode
2022-08-26 08:30:58 -07:00
yun saki
5129f256a3
simplet2i: changed image file handling to work as stated in the [docs]( https://pillow.readthedocs.io/en/stable/reference/open_files.html )
2022-08-26 14:13:16 +02:00
Samuel Husso
ed72ff3268
Move torch.device selection to it's own function
2022-08-26 14:43:18 +03:00
Sean McLellan
f3fad22cb6
Fix
2022-08-26 05:27:34 -04:00
Sean McLellan
7bf0bc5208
fix comment
2022-08-26 04:08:18 -04:00
Sean McLellan
4e5aa7e714
fix comment
2022-08-26 04:07:01 -04:00
Sean McLellan
46a223f229
Double check for null and 0, and add a comment to indicate intent
2022-08-26 04:05:09 -04:00
Lincoln Stein
4f02b72c9c
prettified all the code using "blue" at the urging of @tildebyte
2022-08-26 03:15:42 -04:00
Lincoln Stein
dd670200bb
documentation tweaks for installation and running of the GFPGAN extension; now you have the ability to specify the previous image's seed with -S -1, the one before that with -S -2, and so forth
2022-08-26 02:17:14 -04:00
Lincoln Stein
8f89a2456a
something is not quite right; when providing -G1 option on one prompt, and then omitting it on the next, I see a "images do not match" error from GFPGAN
2022-08-26 01:20:01 -04:00
Sean McLellan
407d70a987
Fix backwards logic
2022-08-26 00:49:12 -04:00
Sean McLellan
f1ffb5b51b
Fix blend if the target image has been upscaled
2022-08-26 00:45:19 -04:00
Sean McLellan
4f1664ec4f
remove params
2022-08-26 00:41:41 -04:00
Sean McLellan
fcdd95b652
Refactor so that behavior is consolidated at top level
2022-08-26 00:39:57 -04:00
Sean McLellan
470a62dbbe
Merge branch 'main' of https://github.com/BaristaLabs/stable-diffusion-dream into add-gfpgan-option
2022-08-26 00:26:03 -04:00
Sean McLellan
cb86b9ae6e
Remove the redundancy, better logging
2022-08-25 23:48:35 -04:00
Sean McLellan
dbb9132f4d
Merge branch 'main' of https://github.com/BaristaLabs/stable-diffusion-dream into add-gfpgan-option
2022-08-25 23:19:17 -04:00
Sean McLellan
5711b6d611
Add optional GFPGAN support
2022-08-25 22:57:30 -04:00
Lincoln Stein
f1bed52530
moved dream utilities into their own subfolder
2022-08-25 22:49:15 -04:00
Lincoln Stein
c38b6964b4
improved inline error messages slightly
2022-08-25 22:19:12 -04:00
Kevin Gibbons
797de3257c
fix batch_size
2022-08-25 17:28:52 -07:00
Kevin Gibbons
31b22e057d
switch to generators
2022-08-25 17:06:06 -07:00
Kevin Gibbons
078859207d
factor out loop
2022-08-25 16:51:39 -07:00
Kevin Gibbons
a10baf5808
factor out exception handler
2022-08-25 15:13:07 -07:00
Lincoln Stein
19fa222810
refactoring complete; please test carefully!
2022-08-25 17:30:08 -04:00
Lincoln Stein
b3e3b0e861
feature complete; looks like ready for merge
2022-08-25 17:26:48 -04:00
Lincoln Stein
650ae3eb13
Merge pull request #89 from BlueAmulet/remove-accelerate
...
Remove accelerate library
2022-08-25 13:48:48 -04:00
BlueAmulet
b7735b3788
Fix attribution
2022-08-25 11:13:12 -06:00
BlueAmulet
39b55ae016
Remove accelerate library
...
This library is not required to use k-diffusion
Make k-diffusion wrapper closer to the other samplers
2022-08-25 11:04:57 -06:00
JigenD
e82c5eba18
PR revision: replace cuda call with dynamic type
2022-08-25 12:18:35 -04:00
Lincoln Stein
49247b4aa4
fix performance regression; closes issue #42
2022-08-25 09:41:12 -04:00
JigenD
eb58276a2c
fix VRAM utilization
2022-08-25 08:34:51 -04:00
Lincoln Stein
0b4459b707
mostly back to full functionality; just missing grid generation code
2022-08-25 00:42:37 -04:00
Lincoln Stein
b978536385
code is reorganized and mostly functional. Grid needs to be brought back online, as well as naming of img2img variants (currently the variants get written but not logged)
2022-08-24 19:47:59 -04:00
Lincoln Stein
9133087850
first draft at big refactoring; will be broken
2022-08-24 17:52:34 -04:00
Lincoln Stein
1eec6b776b
tweaked documentation and comments slightly
2022-08-24 15:25:52 -04:00
Sean McLellan
feea5fb063
Merge branch 'main' of https://github.com/BaristaLabs/stable-diffusion-dream into add-simple-variant-mechanism
2022-08-24 13:16:15 -04:00
Sean McLellan
b5cdbd3b0b
Fixes issue with cuda/current mismatch
2022-08-24 13:14:08 -04:00
