Commit Graph

199 Commits

Author SHA1 Message Date
AUTOMATIC1111
d2e5b4edfa
Merge pull request #5251 from adieyal/bug/negative-prompt-infotext
Fixed incorrect negative prompt text in infotext
2022-12-03 10:21:43 +03:00
Adi Eyal
a44994e2c9 Fixed incorrect negative prompt text in infotext
Previously only the first negative prompt in all_negative_prompts was
being used for infotext. This fixes that by selecting the index-th
negative prompt
2022-11-30 15:23:53 +02:00
klimaleksus
67efee33a6
Make VAE step sequential to prevent VRAM spikes 2022-11-28 16:29:43 +05:00
AUTOMATIC
40ca34b837 fix for broken sampler selection in img2img and xy plot #4860 #4909 2022-11-27 13:17:39 +03:00
AUTOMATIC1111
828438b4a1
Merge pull request #4120 from aliencaocao/enable-override-hypernet
Enable override_settings to take effect for hypernetworks
2022-11-20 16:49:06 +03:00
AUTOMATIC
413c077969 prevent StableDiffusionProcessingImg2Img changing image_mask field as an alternative solution to #4765 2022-11-19 13:48:59 +03:00
AUTOMATIC
617c5b486f make it possible for StableDiffusionProcessing to accept multiple different negative prompts in a batch 2022-11-19 13:23:25 +03:00
AUTOMATIC1111
e35d8b493f
Merge pull request #4778 from leppie/fix_unbounded_prompt_growth
Fix unbounded prompt growth/determinism in scripts that loop
2022-11-19 12:52:55 +03:00
AUTOMATIC
0d702930b0 renamed Inpainting strength infotext to Conditional mask weight, made it only appear if using inpainting model, made it possible to read the setting from it using the blue arrow button 2022-11-19 12:47:52 +03:00
AUTOMATIC1111
ff35ae9abb
Merge pull request #4679 from Eugenii10/inpaint-strength-to-infotext
Add 'Inpainting strength' to the 'generation_params' of 'infotext' (params.txt or png chunks)
2022-11-19 12:24:44 +03:00
AUTOMATIC
cdc8020d13 change StableDiffusionProcessing to internally use sampler name instead of sampler index 2022-11-19 12:01:51 +03:00
Llewellyn Pritchard
9bbe1e3c2e Fix unbounded prompt growth scripts that loop 2022-11-16 19:19:00 +02:00
KEV
40ae95d532 Fix retrieving value for 'x/y plot' script. 2022-11-14 18:05:59 +10:00
KEV
6fa891b934 Add 'Inpainting strength' to the 'generation_params' dictionary of 'infotext' which is saved into the 'params.txt' or png chunks.
Value appears only if 'Denoising strength' appears too.
2022-11-14 00:25:38 +10:00
Billy Cao
c13e234444
Merge branch 'master' into enable-override-hypernet 2022-11-06 16:33:08 +08:00
Billy Cao
55ca040958 Resolve conflict 2022-11-06 16:31:44 +08:00
AUTOMATIC
eeb0733013 change process_one virtual function for script to process_batch, add extra args and docs 2022-11-04 11:21:40 +03:00
AUTOMATIC1111
c250d2a08f
Merge pull request #4182 from macrosoft/process_one
Process one
2022-11-04 11:07:05 +03:00
AUTOMATIC
f674c488d9 bugfix: save image for hires fix BEFORE upscaling latent space 2022-11-04 10:45:34 +03:00
AUTOMATIC
f2b69709ea move option access checking to options class out of various places scattered through code 2022-11-04 09:42:25 +03:00
random-thoughtss
243253ff4a
Merge branch 'AUTOMATIC1111:master' into master 2022-11-03 15:55:54 -07:00
Artem Zagidulin
de64146ad2 add number of itter 2022-11-02 21:30:50 +03:00
Artem Zagidulin
a9e979977a process_one 2022-11-02 19:05:01 +03:00
AUTOMATIC
eb5e82c7dd do not unnecessarily run VAE one more time when saving intermediate image with hires fix 2022-11-02 12:45:03 +03:00
timntorres
9c67408004
Allow saving "before-highres-fix. (#4150)
* Save image/s before doing highres fix.
2022-11-02 12:18:21 +03:00
Jairo Correa
c9148b2312 Release processing resources after it finishes 2022-11-01 21:56:47 -03:00
Billy Cao
bc60768606 Enable override_settings to take effect for hypernetworks 2022-11-01 23:26:55 +08:00
Jairo Correa
af758e97fa Unload sd_model before loading the other 2022-11-01 04:01:49 -03:00
random_thoughtss
71571e3f05 Replaced master branch fix with updated fix. 2022-10-30 00:35:40 -07:00
random-thoughtss
15468c9939
Merge branch 'AUTOMATIC1111:master' into master 2022-10-30 00:30:18 -07:00
AUTOMATIC
61836bd544 shorten Hypernetwork strength in infotext and omit it when it's the default value. 2022-10-30 08:48:53 +03:00
AUTOMATIC1111
470f184176
Merge pull request #3831 from timntorres/3825-save-hypernet-strength-to-info
Save Hypernetwork strength to infotext.
2022-10-30 08:47:18 +03:00
AUTOMATIC
05a657dd35 fix broken hires fix 2022-10-30 07:41:56 +03:00
timntorres
e709afb0f7 Merge commit 'e7254746bbfbff45099db44a8d4d25dd6181877d' into 3825-save-hypernet-strength-to-info 2022-10-29 14:55:30 -07:00
random_thoughtss
39f55c3c35 Re-add explicit device move 2022-10-29 14:13:02 -07:00
AUTOMATIC
9bb6b6509a add postprocess call for scripts 2022-10-29 22:20:02 +03:00
random_thoughtss
6e2ce4e735 Added image conditioning to latent upscale.
Only comuted  if the mask weight is not 1.0 to avoid extra memory.
Also includes some code cleanup.
2022-10-29 10:35:51 -07:00
random_thoughtss
44ab954fab Fix latent upscale highres fix #3888 2022-10-29 10:02:56 -07:00
timntorres
2c4d203884 Revert "Explicitly state when Hypernet is none." 2022-10-29 00:36:51 -07:00
timntorres
e98f72be33
Merge branch 'AUTOMATIC1111:master' into 3825-save-hypernet-strength-to-info 2022-10-29 00:31:23 -07:00
timntorres
c0677b3316 Explicitly state when Hypernet is none. 2022-10-27 23:31:45 -07:00
timntorres
9e465c8aa5 Add strength to textinfo. 2022-10-27 23:03:34 -07:00
random_thoughtss
26a3fd2fe9 Highres fix works with unmasked latent.
Also refactor the mask creation to make it more accesible.
2022-10-27 11:27:59 -07:00
random-thoughtss
f3f2ffd448
Merge branch 'AUTOMATIC1111:master' into master 2022-10-27 11:19:12 -07:00
AUTOMATIC
1e428238db add override_settings to API as an alternative to #3629 2022-10-26 11:47:17 +03:00
random_thoughtss
8b4f32779f Switch to a continous blend for cond. image. 2022-10-25 13:15:08 -07:00
random_thoughtss
605d27687f Added conditioning image masking to xy_grid.
Use `True` and `False` to select values.
2022-10-25 12:20:54 -07:00
random_thoughtss
f9549d1cbb Added option to use unmasked conditioning image. 2022-10-25 11:14:12 -07:00
AUTOMATIC
6cbb04f7a5 fix #3517 breaking txt2img 2022-10-24 09:15:26 +03:00
Vladimir Repin
f2cc3f32d5 fix whitespaces 2022-10-24 08:58:56 +03:00