Lincoln Stein
1b3c7acce3
fix ambiguous naming of self.device
2022-09-01 14:18:17 -04:00
Lincoln Stein
e6b2c15fc5
Merge branch 'main' into fit-init-img
...
add a --fit option to limit the size of the initial image to the
maximum boundaries specified by width and height.
2022-09-01 14:09:46 -04:00
Lincoln Stein
01e05a98de
this fixes the inconsistent use of self.device, sometimes a str and sometimes an obj
2022-09-01 10:16:05 -04:00
Lincoln Stein
c5e95adb49
closes #273 , crash on M1 machines
2022-09-01 10:01:41 -04:00
Lincoln Stein
dc30adfbb4
closes #273 , crash on M1 machines
2022-09-01 01:09:56 -04:00
James Reynolds
70119602a0
Issue 270 fix ( #274 )
...
* check if torch.backends has mps before calling it
* Fixes issue 270
Co-authored-by: James Reynolds <magnsuviri@me.com>
2022-09-01 00:59:20 -04:00
Lincoln Stein
28fe84177e
optionally scale initial image to fit box defined by width x height
...
* This functionality is triggered by the --fit option in the CLI (default
false), and by the "fit" checkbox in the WebGUI (default True)
* In addition, this commit contains a number of whitespace changes to
make the code more readable, as well as an attempt to unify the visual
appearance of info and warning messages.
2022-09-01 00:52:43 -04:00
David Wager
ed513397b2
Allow configuration of which SD model to use ( #263 )
...
* Allow configuration of which SD model to use
Closes https://github.com/lstein/stable-diffusion/issues/49 The syntax isn't quite the same (opting for --weights over --model), although --weights is more in-line with the existing naming convention.
This method also locks us into models in the models/ldm/stable-diffusion-v1/ directory. Personally, I'm not averse to this, although a secondary solution may be necessary if we wish to supply weights from an external directory.
* Fix typo
* Allow either filename OR filepath input for arg
This approach allows both
--weights SD13
--weights C:/StableDiffusion/models/ldm/stable-diffusion-v1/SD13.ckpt
2022-08-31 14:20:28 -04:00
David Ford
58e3562652
Fix merging embeddings ( #226 )
...
Fixed merging embeddings based on the changes made in textual inversion. Tested and working. Inverted their logic to prioritize Stable Diffusion implementation over alternatives, but left the option for alternatives to still be used.
2022-08-31 11:24:11 -04:00
Kevin Gibbons
d566ee092a
move make_grid into image_utils
2022-08-30 22:03:53 -07:00
Kevin Gibbons
153c93bdd4
refactor pngwriter
2022-08-30 22:03:51 -07:00
Lincoln Stein
bdb0651eb2
add support for Apple hardware using MPS acceleration
2022-08-31 00:33:23 -04: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
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
Lincoln Stein
d48299e56c
Merge branch 'prompt_as_dir' of https://github.com/BlueAmulet/stable-diffusion into BlueAmulet-prompt_as_dir
2022-08-29 22:13:37 -04:00
BlueAmulet
2e22d9ecf1
Address bakkot review
2022-08-29 18:10:15 -06:00
BlueAmulet
4f8e7356b3
Add prompt as output directory feature
...
Based on previous code by czyz
2022-08-29 14:52:02 -06: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
63178c6a8c
Merge branch 'main' into patch-1
2022-08-29 15:12:14 -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
Lincoln Stein
c7db038c96
grid is broken, needs the grid-fix PR#166 to fix
2022-08-29 13:39:20 -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
Kevin Gibbons
7ae79b350e
write log files in utf-8, not ascii
2022-08-28 20:00:11 -07:00
Benjamin Warner
529040708b
Fix grid image saving, log to outdir path, display sampler options once
2022-08-28 19:34:55 -05: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
8bbe7936bd
close Issue #165
2022-08-28 18:21:20 -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
614974a8e8
Merge branch 'main' into gfpgan-optimization
2022-08-29 08:22:26 +12:00
blessedcoolant
6e49c070bb
Optimize and Improve GFPGAN and Real-ESRGAN Pipeline
2022-08-29 08:14:29 +12:00
Lincoln Stein
042a9043d1
got rid of the cd and pwd commands, and just allow user to specify --outdir on the command
2022-08-28 15:54:12 -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
Andy Pilate
fab9e1a423
Fix wrong help message
2022-08-28 17:11:24 +02:00
yun saki
7040995ceb
fixed variable name error
2022-08-26 14:25:49 +02:00
yun saki
89805a5239
fixed mistake in comment
2022-08-26 13:25:12 +02:00
yun saki
e00397f9ca
refactored logfile handling; minimised time spent in context managers (with open)
2022-08-26 13:22:53 +02:00
yun saki
12f59e1daa
removed log.close(); 'with open' automatically closes the file
2022-08-26 13:12:56 +02:00
yun saki
cf750f62db
refactored infile handling
2022-08-26 13:10:37 +02:00
yun saki
0f28663805
remove redundant None check (if var does the same thing)
2022-08-26 12:43:13 +02:00
Sean McLellan
eb9f0be91a
Set default to none for gfpgan_strength
2022-08-26 03:53:55 -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
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
3a30a8f2d2
Fix not being able to disable bgupscaler; update readme
2022-08-25 23:39:03 -04:00
