1c9d1b0ee0
simplify self.extra_network_data
2023-06-04 05:19:34 +09:00
f098e726d3
fix conds caching with extra network
2023-06-04 04:24:44 +09:00
51864790fd
Simplify a bunch of `len(x) > 0`/`len(x) == 0` style expressions
2023-06-02 15:07:10 +03:00
a9674359ca
revert the erroneous change for model setting added in df02498d
2023-06-01 19:52:04 +03:00
c63d46ceb8
Merge pull request #10804 from AUTOMATIC1111/fix-xyz-clip
...
Fix get_conds_with_caching()
2023-05-31 22:54:51 +03:00
df02498d03
add an option to show selected setting in main txt2img/img2img UI
...
split some code from ui.py into ui_settings.py ui_gradio_edxtensions.py
add before_process callback for scripts
add ability for alwayson scripts to specify section and let user reorder those sections
2023-05-31 22:40:09 +03:00
52b8752e62
Merge branch 'dev' into report-error
2023-05-31 19:15:21 +03:00
4a449375a2
fix get_conds_with_caching()
2023-05-30 01:07:35 +09:00
00dfe27f59
Add & use modules.errors.print_error where currently printing exception info by hand
2023-05-29 09:17:30 +03:00
339b531570
custom unet support
2023-05-27 15:47:33 +03:00
ff0e17174f
rework hires prompts/sampler code to among other things support different extra networks in first/second pass
...
rework quoting for infotext items that have commas in them to use json (should be backwards compatible except for cases where it didn't work previously)
add some locals from processing function into the Processing class as fields
2023-05-18 20:16:09 +03:00
5ec2c294ee
Merge remote-tracking branch 'InvincibleDude/improved-hr-conflict-test' into hires-fix-ext
2023-05-18 17:57:16 +03:00
44c37f94e1
add messages about Loras that failed to load to UI
2023-05-18 16:36:30 +03:00
9fd6c1e343
move some settings to the new Optimization page
...
add slider for token merging for img2img
rework StableDiffusionProcessing to have the token_merging_ratio field
fix a bug with applying png optimizations for live previews when they shouldn't be applied
2023-05-17 20:22:54 +03:00
315f109427
Copy s_min_uncond to Processed
...
Should fix #10416
2023-05-17 10:26:32 +03:00
a61cbef02c
add second_order field to sampler config
2023-05-16 12:36:15 +03:00
cdac5ace14
suppress ENSD infotext for samplers that don't use it
2023-05-16 11:54:02 +03:00
c2fdb44880
fix for img2img
2023-05-13 11:11:02 -05:00
ac83627a31
heavily simplify
2023-05-13 10:23:42 -05:00
55e52c878a
remove command line option
2023-05-13 09:24:56 -05:00
75b3692920
Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into tomesd
2023-05-11 22:40:17 -05:00
49a55b410b
Autofix Ruff W (not W605) (mostly whitespace)
2023-05-11 20:29:11 +03:00
f741a98bac
imports cleanup for ruff
2023-05-10 08:43:42 +03:00
96d6ca4199
manual fixes for ruff
2023-05-10 08:25:25 +03:00
3ba6c3c83c
Fix up string formatting/concatenation to f-strings where feasible
2023-05-09 22:25:39 +03:00
ab4ab4e595
add version to infotext, footer and console output when starting
2023-05-08 15:23:49 +03:00
e960781511
fix maximum downsampling option
2023-05-03 13:12:43 -05:00
f08ae96115
resolve merge conflicts and swap to dev branch for now
2023-05-03 02:21:50 -05:00
0d1ef296b9
checkpoint override enhancement
2023-05-01 05:22:53 +09:00
e7d624574d
Merge branch 'dev' into master
2023-04-29 16:41:01 +03:00
7428fb5176
add is_hr_pass field for processing
2023-04-29 16:28:51 +03:00
1d11e89698
rework Negative Guidance minimum sigma to work with AND, add infotext and copypaste parameters support
2023-04-29 15:57:09 +03:00
3591eefedf
Merge pull request #9177 from devNegative-asm/master
...
(Optimization) Option to remove negative conditioning at low sigma values
2023-04-29 14:38:25 +03:00
32c3b97669
Merge pull request #9628 from catboxanon/patch/9092
...
Fix image mask/composite for weird resolutions
2023-04-29 13:21:32 +03:00
d6a3988b86
Merge pull request #9669 from catboxanon/patch/sampler-schedule-fix
...
Fix prompt schedule for second order samplers
2023-04-29 12:56:57 +03:00
5fe0dd79be
rename CPU RNG to RNG source in settings, add infotext and parameters copypaste support to RNG source
2023-04-29 11:29:37 +03:00
9de7298898
Update processing.py
2023-04-16 21:06:37 -04:00
4d0c816303
Modify step multiplier flow
2023-04-16 20:39:45 -04:00
56f8a6b081
Fix sampler schedules with step multiplier
2023-04-16 20:34:52 -04:00
fbab3fc6d1
Only handle image mask if any option enabled
2023-04-14 17:24:55 -04:00
3af152d488
Fix image mask composite for weird resolutions
2023-04-14 17:17:14 -04:00
1c11062603
add token merging options to infotext when necessary. Bump tomesd
...
version
2023-04-10 03:41:05 -05:00
d609f6030e
Add [batch_number] and [generation_number] filename patterns
2023-04-07 21:04:46 +09:00
b3593d0997
Add support for saving init images in img2img
2023-04-06 19:42:26 +03:00
5c8e53d5e9
Allow different merge ratios to be used for each pass. Make toggle cmd flag work again. Remove ratio flag. Remove warning about controlnet being incompatible
2023-04-04 02:26:44 -05:00
c707b7df95
remove excess condition
2023-04-01 23:47:10 -05:00
a609bd56b4
Transition to using settings through UI instead of cmd line args. Added feature to only apply to hr-fix. Install package using requirements_versions.txt
2023-04-01 22:18:35 -05:00
42082e8a32
performance increase
2023-03-28 20:56:01 -04:00
433b3ab701
Revert "Merge pull request #7931 from space-nuko/img2img-enhance"
...
This reverts commit 42687593701b63afbedc
2023-03-28 20:36:57 +03:00
4268759370
Merge pull request #7931 from space-nuko/img2img-enhance
...
Add `Upscale by` and `Upscaler` options to img2img
2023-03-28 20:21:25 +03:00
f1db987e6a
Merge pull request #8958 from MrCheeze/variations-model
...
Add support for the unclip (Variations) models, unclip-h and unclip-l
2023-03-28 19:39:20 +03:00
8a34671fe9
Add support for the Variations models (unclip-h and unclip-l)
2023-03-25 21:03:07 -04:00
7ea5d395c4
Add upscaler to img2img
2023-03-25 12:52:43 -04:00
68999d0b15
Add upscale slider to img2img
2023-03-25 12:52:35 -04:00
caf84e8233
Expose inpainting mask and composite
...
For inpainting, this exposes the mask and masked composite and gives
the user the ability to display these in the web UI,
save to disk, or both.
2023-03-22 17:51:40 +00:00
f5e4436453
Merge branch 'master' into improved-hr-conflict-test
2023-03-14 16:55:59 +03:00
4d26c7da57
initialize extra_network_data before use
2023-03-13 17:37:29 +02:00
da3f942ab2
Merge pull request #8017 from space-nuko/before-process-batch
...
Add `before_process_batch` script callback
2023-03-11 14:33:38 +03:00
ac38ad7e60
Merge remote-tracking branch 'origin/master' into unipc
2023-03-10 19:42:46 -05:00
f6e2737840
Negative prompt fix
2023-03-10 12:13:55 +00:00
b9fdb9f701
Fix crash when hr is disabled
2023-03-04 18:09:05 +00:00
e97b83bdbb
Merge branch 'master' into improved-hr-conflict-test
2023-03-03 19:49:24 +03:00
51f81efb02
Image processing changes
...
Image processing changes
2023-03-03 19:45:33 +03:00
a2d635ad13
Add before_process_batch script callback
2023-02-22 01:52:53 -08:00
15f4b217b1
fix the a merge conflict resolve i did that entirely breaks image generation
2023-02-19 09:50:14 +03:00
6911deb242
Merge branch 'master' into fix-save-params-2
2023-02-19 09:15:45 +03:00
b20737815a
Fix params.txt saving for infotexts modified by process_batch
2023-02-16 21:44:46 -08:00
0a4917ac40
Apply extra networks per-batch instead of per-session (fixes wildcards)
2023-02-13 03:33:28 -08:00
fb274229b2
bug fix
2023-02-10 14:30:35 -08:00
c88dcc20d4
UniPC does not support img2img (for now)
2023-02-10 05:00:54 -08:00
1253199889
Working UniPC (for batch size 1)
2023-02-10 03:30:20 -08:00
c3bd113a0b
Image info fix
2023-02-05 15:24:41 +00:00
f4b78e73a4
Merge branch 'AUTOMATIC1111:master' into improved-hr-conflict-test
2023-02-05 18:02:44 +03:00
c27c0de0f7
txt2img Hires Fix
2023-02-03 19:15:32 -05:00
6c6c6636bb
Image CFG Added (Full Implementation)
...
Uses separate denoiser for edit (instruct-pix2pix) models
No impact to txt2img or regular img2img
"Image CFG Scale" will only apply to instruct-pix2pix models and metadata will only be added if using such model
2023-02-03 18:19:56 -05:00
3b2ad20ac1
Processing only, no CFGDenoiser change
...
Allows instruct-pix2pix
2023-02-02 19:19:45 -05:00
cf0cfefe91
Revert "instruct-pix2pix support"
...
This reverts commit 269833067d
2023-02-02 19:15:38 -05:00
269833067d
instruct-pix2pix support
2023-02-02 09:37:01 -05:00
3ec2eb8bf1
Merge branch 'master' into improved-hr-conflict-test
2023-01-30 15:35:13 +03:00
040ec7a80e
make the program read Eta and Eta DDIM from generation parameters
2023-01-30 10:47:09 +03:00
425eab3464
Extra network in hr abomination fix
2023-01-29 19:26:31 +03:00
9beeef6267
Extra networks loading fix
2023-01-29 19:16:17 +03:00
6127d2ff1b
Extra networks loading fix
2023-01-29 19:13:27 +03:00
c92ec3a925
Extra networks loading fix
2023-01-29 19:07:00 +03:00
ee3d63b6be
Merge branch 'master' into master
2023-01-29 14:36:10 +03:00
00dab8f10d
remove Batch size and Batch pos from textinfo (goodbye)
2023-01-29 11:53:24 +03:00
fecb990deb
Merge pull request #7309 from brkirch/fix-embeddings
...
Fix embeddings, upscalers, and refactor `--upcast-sampling`
2023-01-28 18:44:36 +03:00
ada17dbd7c
Refactor conditional casting, fix upscalers
2023-01-28 04:16:25 -05:00
5eee2ac398
add data-dir flag and set all user data directories based on it
2023-01-27 14:44:30 +01:00
7a14c8ab45
add an option to enable sections from extras tab in txt2img/img2img
...
fix some style inconsistenices
2023-01-26 23:31:32 +03:00
10421f93c3
Fix full previews, --no-half-vae
2023-01-26 01:43:35 -05:00
d1d6ce2983
add edit_image_conditioning from my earlier edits in case there's an attempt to inegrate pix2pix properly
...
this allows to use pix2pix model in img2img though it won't work well this way
2023-01-25 23:25:25 +03:00
1574e96729
Merge pull request #6510 from brkirch/unet16-upcast-precision
...
Add upcast options, full precision sampling from float16 UNet and upcasting attention for inference using SD 2.1 models without --no-half
2023-01-25 19:12:29 +03:00
57c1baa774
change to code for live preview fix on OSX to be bit more obvious
2023-01-25 18:56:23 +03:00
e3b53fd295
Add UI setting for upcasting attention to float32
...
Adds "Upcast cross attention layer to float32" option in Stable Diffusion settings. This allows for generating images using SD 2.1 models without --no-half or xFormers.
In order to make upcasting cross attention layer optimizations possible it is necessary to indent several sections of code in sd_hijack_optimizations.py so that a context manager can be used to disable autocast. Also, even though Stable Diffusion (and Diffusers) only upcast q and k, unfortunately my findings were that most of the cross attention layer optimizations could not function unless v is upcast also.
2023-01-25 01:13:04 -05:00
84d9ce30cb
Add option for float32 sampling with float16 UNet
...
This also handles type casting so that ROCm and MPS torch devices work correctly without --no-half. One cast is required for deepbooru in deepbooru_model.py, some explicit casting is required for img2img and inpainting. depth_model can't be converted to float16 or it won't work correctly on some systems (it's known to have issues on MPS) so in sd_models.py model.depth_model is removed for model.half().
2023-01-25 01:13:02 -05:00
44c0e6b993
Merge branch 'AUTOMATIC1111:master' into master
2023-01-24 15:44:09 +03:00
f64af77adc
Fix different first gen with Approx NN previews
...
The loading of the model for approx nn live previews can change the internal state of PyTorch, resulting in a different image. This can be avoided by preloading the approx nn model in advance.
2023-01-23 22:49:20 -05:00
3bc8ee998d
Gen params paste improvement
2023-01-22 16:35:42 +03:00
7f62300f7d
Gen params paste improvement
2023-01-22 16:29:08 +03:00
a5c2b5ed89
UI and PNG info improvements
2023-01-22 15:50:20 +03:00
bbb1e35ea2
UI and PNG info improvements
2023-01-22 15:44:59 +03:00
34f6d66742
hr conditioning
2023-01-22 15:32:47 +03:00
125d5c8d96
hr conditioning
2023-01-22 15:31:11 +03:00
2ab2bce74d
hr conditioning
2023-01-22 15:28:38 +03:00
c5d4c87c02
hr conditioning
2023-01-22 15:17:43 +03:00
4e0cf7d4ed
hr conditioning
2023-01-22 15:15:08 +03:00
a9f0e7d536
hr conditioning
2023-01-22 15:12:00 +03:00
f774a8d24e
Hr-fix separate prompt experimentation
2023-01-22 14:52:01 +03:00
81e0723d65
Logging for debugging
2023-01-22 14:41:41 +03:00
b331ca784a
Fix
2023-01-22 14:35:34 +03:00
8114959e7e
Hr separate prompt test
2023-01-22 14:28:53 +03:00
0f6862ef30
PLMS edge-case handling fix 5
2023-01-22 00:11:05 +03:00
6cd7bf9f86
PLMS edge-case handling fix 3
2023-01-22 00:08:58 +03:00
3ffe2e768b
PLMS edge-case handling fix 2
2023-01-22 00:07:46 +03:00
9e1f49c4e5
PLMS edge-case handling fix
2023-01-22 00:03:16 +03:00
78f59a4e01
enable compact view for train tab
...
prevent previews from ruining hypernetwork training
2023-01-22 00:02:51 +03:00
6c0566f937
Type mismatch fix
2023-01-21 23:25:36 +03:00
3bd898b6ce
First test of different sampler for hi-res fix
2023-01-21 23:14:59 +03:00
3deea34135
extract extra network data from prompt earlier
2023-01-21 19:36:08 +03:00
92fb1096db
make it so that extra networks are not removed from infotext
2023-01-21 16:41:25 +03:00
40ff6db532
extra networks UI
...
rework of hypernets: rather than via settings, hypernets are added directly to prompt as <hypernet:name:weight>
2023-01-21 08:36:07 +03:00
a8322ad75b
Merge pull request #6854 from EllangoK/master
...
Saves Extra Generation Parameters to params.txt
2023-01-18 23:25:56 +03:00
b186d44dcd
use DDIM in hires fix is the sampler is PLMS
2023-01-18 23:20:23 +03:00
5e15a0b422
Changed params.txt save to after manual init call
2023-01-17 11:42:44 -05:00
e0e8005009
make StableDiffusionProcessing class not hold a reference to shared.sd_model object
2023-01-16 23:09:08 +03:00
9991967f40
Add a check and explanation for tensor with all NaNs.
2023-01-16 22:59:46 +03:00
f9ac3352cb
change hypernets to use sha256 hashes
2023-01-14 10:25:37 +03:00
88416ab5ff
Fix extension parameters not being saved to last used parameters
2023-01-12 13:46:59 -08:00
d4fd2418ef
add an option to use old hiresfix width/height behavior
...
add a visual effect to inactive hires fix elements
2023-01-09 14:57:47 +03:00
50e2536279
Merge branch 'AUTOMATIC1111:master' into img2img-api-scripts
2023-01-07 14:18:09 +00:00
1a5b86ad65
rework hires fix preview for #6437 : movie it to where it takes less place, make it actually account for all relevant sliders and calculate dimensions correctly
2023-01-07 09:56:37 +03:00
b5253f0dab
allow img2img api to run scripts
2023-01-05 21:21:48 +00:00
847f869c67
experimental optimization
2023-01-05 21:00:52 +03:00
2e30997450
move sd_model assignment to the place where we change the sd_model
2023-01-05 10:21:17 +03:00
83ca8dd0c9
Merge branch 'AUTOMATIC1111:master' into fix-sd-arch-switch-in-override-settings
2023-01-05 05:00:58 +01:00
99b67cff0b
make hires fix not do anything if the user chooses the second pass resolution to be the same as first pass resolution
2023-01-05 01:25:52 +03:00
bc43293c64
fix incorrect display/calculation for number of steps for hires fix in progress bars
2023-01-04 23:56:43 +03:00
8149078094
added the option to specify target resolution with possibility of truncating for hires fix; also sampling steps
2023-01-04 22:04:40 +03:00
097a90b88b
add XY plot parameters to grid image and do not add them to individual images
2023-01-04 19:19:11 +03:00
525cea9245
use shared function from processing for creating dummy mask when training inpainting model
2023-01-04 17:58:07 +03:00
4d66bf2c0d
add infotext to "-before-highres-fix" images
2023-01-04 17:24:46 +03:00
6281c1bdb4
Merge pull request #6299 from stysmmaker/feat/latent-upscale-modes
...
Add more latent upscale modes
2023-01-04 13:47:36 +03:00
15fd0b8bc4
Update processing.py
2023-01-04 05:12:54 -05:00
e5b7ee910e
fix: Save full res of intermediate step
2023-01-04 04:22:01 -05:00
e9fb9bb0c2
fix hires fix not working in API when user does not specify upscaler
2023-01-03 17:40:20 +03:00
ef27a18b6b
Hires fix rework
2023-01-02 19:42:10 +03:00
f4535f6e4f
make it so that memory/embeddings info is displayed in a separate UI element from generation parameters, and is preserved when you change the displayed infotext by clicking on gallery images
2022-12-31 23:40:55 +03:00
4af3ca5393
make it so that blank ENSD does not break image generation
2022-12-26 10:11:28 +03:00
fa931733f6
fix(api): assign sd_model after settings change
2022-12-25 20:17:49 +11:00
w-e-w