soaska/my-sd
soaska/my-sd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity
4,016 Commits 1 Branch 0 Tags 45 MiB
5c66fedb64
Commit Graph

2553 Commits

Author SHA1 Message Date
AUTOMATIC
668d7e9b9a make it possible to load SD1 checkpoints without CLIP 2023-02-05 11:21:00 +03:00
techneconn
5a1b62e9f8 Add prompt_hash option for file/dir name pattern 2023-02-05 15:48:51 +09:00
Alex "mcmonkey" Goodwin
88a46e8427 fix symlinks in extra networks ui 
'absolute' and 'resolve' are equivalent, but 'resolve' resolves symlinks (which is an obscure specialty behavior usually not wanted) whereas 'absolute' treats symlinks as folders (which is the expected behavior). This commit allows you to symlink folders within your models/embeddings/etc. dirs and have preview images load as expected without issue.
 2023-02-04 09:10:00 -08:00
spezialspezial
6524478850
Update modelloader.py 
os.path.getmtime(filename) throws exception later in codepath when meeting broken symlink. For now catch it here early but more checks could be added for robustness.
 2023-02-04 16:52:15 +01:00
AUTOMATIC
3e0f9a7543 fix issue with switching back to checkpoint that had its checksum calculated during runtime mentioned in #7506 2023-02-04 15:23:16 +03:00
AUTOMATIC
40e51fd6ef add margin parameter to draw_grid_annotations 2023-02-04 13:29:04 +03:00
AUTOMATIC1111
21593c8082
Merge pull request #7466 from ctwrs/master 
Add .jpg to allowed thumb formats
 2023-02-04 12:07:45 +03:00
AUTOMATIC1111
c0e0b5844d
Merge pull request #7470 from cbrownstein-lambda/update-error-message-no-checkpoint 
Update error message WRT missing checkpoint file
 2023-02-04 12:07:12 +03:00
AUTOMATIC
81823407d9 add --no-hashing 2023-02-04 11:38:56 +03:00
AUTOMATIC1111
30228c67ca
Merge pull request #7461 from brkirch/mac-fixes 
Move Mac related code to separate file
 2023-02-04 11:22:52 +03:00
AUTOMATIC
c4b9ed1a27 make Image CFG Scale only show if instrutpix2pix model is loaded 2023-02-04 11:18:44 +03:00
AUTOMATIC
72dd5785d9 merge CFGDenoiserEdit and CFGDenoiser into single object 2023-02-04 11:06:17 +03:00
brkirch
4306659c4d Remove unused code 2023-02-04 01:22:06 -05:00
Kyle
ba6a4e7e94 Use original CFGDenoiser if image_cfg_scale = 1 
If image_cfg_scale is =1 then the original image is not used for the output. We can then use the original CFGDenoiser to get the same result to support AND functionality.

Maybe in the future AND can be supported with "Image CFG Scale"
 2023-02-03 19:46:13 -05:00
Kyle
c27c0de0f7 txt2img Hires Fix 2023-02-03 19:15:32 -05:00
Kyle
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
Kyle
3b2ad20ac1 Processing only, no CFGDenoiser change 
Allows instruct-pix2pix
 2023-02-02 19:19:45 -05:00
Kyle
cf0cfefe91 Revert "instruct-pix2pix support" 
This reverts commit 269833067d.
 2023-02-02 19:15:38 -05:00
Kyle
269833067d instruct-pix2pix support 2023-02-02 09:37:01 -05:00
Cody Brownstein
fb97acef63 Update error message WRT missing checkpoint file 
The Safetensors format is also supported.
 2023-02-01 14:51:06 -08:00
ctwrs
92bae77b88 Add .jpg to allowed thumb formats 2023-02-01 22:28:39 +01:00
brkirch
1b8af15f13 Refactor Mac specific code to a separate file 
Move most Mac related code to a separate file, don't even load it unless web UI is run under macOS.
 2023-02-01 14:05:56 -05:00
AUTOMATIC1111
07edf57409
Merge pull request #7357 from EllangoK/btn-fix 
Fixes switch height/width btn unbound error
 2023-02-01 16:29:58 +03:00
AUTOMATIC1111
30a64504b1
Merge pull request #7414 from joecodecreations/master 
Changes use_original_name_batch to default to True
 2023-02-01 16:22:16 +03:00
brkirch
2217331cd1 Refactor MPS fixes to CondFunc 2023-02-01 06:36:22 -05:00
brkirch
7738c057ce MPS fix is still needed :( 
Apparently I did not test with large enough images to trigger the bug with torch.narrow on MPS
 2023-02-01 05:23:58 -05:00
Joey Sanchez
0426b34789 Adding default true to use_original_name_batch as images should by default hold the same name to help keep sequenced images in their correct order 2023-01-30 21:46:52 -05:00
AUTOMATIC
ee9fdf7f62 Add --skip-version-check to disable messages asking users to upgrade torch. 2023-01-30 14:56:28 +03:00
AUTOMATIC
ab059b6e48 make the program read Discard penultimate sigma from generation parameters 2023-01-30 10:52:15 +03:00
AUTOMATIC
040ec7a80e make the program read Eta and Eta DDIM from generation parameters 2023-01-30 10:47:09 +03:00
AUTOMATIC
4df63d2d19 split samplers into one more files for k-diffusion 2023-01-30 10:11:30 +03:00
Andrey
274474105a Split history sd_samplers.py to sd_samplers_kdiffusion.py 2023-01-30 09:51:23 +03:00
Andrey
95916e3777 Split history sd_samplers.py to sd_samplers_kdiffusion.py 2023-01-30 09:51:23 +03:00
Andrey
2db8ed32cd Split history sd_samplers.py to sd_samplers_kdiffusion.py 2023-01-30 09:51:23 +03:00
Andrey
f4d0538bf2 Split history sd_samplers.py to sd_samplers_kdiffusion.py 2023-01-30 09:51:23 +03:00
AUTOMATIC
aa54a9d416 split compvis sampler and shared sampler stuff into their own files 2023-01-30 09:51:06 +03:00
Andrey
f8fcad502e Split history sd_samplers.py to sd_samplers_common.py 2023-01-30 09:37:51 +03:00
Andrey
58ae93b954 Split history sd_samplers.py to sd_samplers_common.py 2023-01-30 09:37:50 +03:00
Andrey
6e78f6a896 Split history sd_samplers.py to sd_samplers_common.py 2023-01-30 09:37:50 +03:00
Andrey
5feae71dd2 Split history sd_samplers.py to sd_samplers_common.py 2023-01-30 09:37:50 +03:00
Andrey
449531a6c5 Split history sd_samplers.py to sd_samplers_compvis.py 2023-01-30 09:35:53 +03:00
Andrey
9b8ed7f8ec Split history sd_samplers.py to sd_samplers_compvis.py 2023-01-30 09:35:53 +03:00
Andrey
9118b08606 Split history sd_samplers.py to sd_samplers_compvis.py 2023-01-30 09:35:52 +03:00
Andrey
0c7c36a6c6 Split history sd_samplers.py to sd_samplers_compvis.py 2023-01-30 09:35:52 +03:00
AUTOMATIC
c81b52ffbd add override settings component to img2img 2023-01-30 02:40:26 +03:00
AUTOMATIC
847ceae1f7 make it possible to search checkpoint by its hash 2023-01-30 01:41:23 +03:00
AUTOMATIC
399720dac2 update prompt token counts after using the paste params button 2023-01-30 01:03:31 +03:00
AUTOMATIC
f91068f426 change disable_weights_auto_swap to true by default 2023-01-30 00:37:26 +03:00
AUTOMATIC
938578e8a9 make it so that setting options in pasted infotext (like Clip Skip and ENSD) do not get applied directly and instead are added as temporary overrides 2023-01-30 00:25:30 +03:00
AUTOMATIC
00dab8f10d remove Batch size and Batch pos from textinfo (goodbye) 2023-01-29 11:53:24 +03:00
AUTOMATIC
aa6e55e001 do not display the message for TI unless the list of loaded embeddings changed 2023-01-29 11:53:05 +03:00
EllangoK
920fe8057c fixes #7284 btn unbound error 2023-01-29 03:36:16 -05:00
AUTOMATIC
8d7382ab24 add buttons for auto-search in subdirectories for extra tabs 2023-01-29 11:34:58 +03:00
AUTOMATIC1111
e8efd2ec47
Merge pull request #7353 from EllangoK/preview-fix 
Fixes thumbnail cards not loading the preview image
 2023-01-29 10:41:36 +03:00
EllangoK
659d602dce only returns ckpt directories if they are not none 2023-01-29 02:32:53 -05:00
AUTOMATIC
f6b7768f84 support for searching subdirectory names for extra networks 2023-01-29 10:20:19 +03:00
glop102
09a142a05a Reduce grid rows if larger than number of images available 
When a set number of grid rows is specified in settings, then it leads
to situations where an entire row in the grid is empty.
The most noticable example is the processing preview when the row count
is set to 2, where it shows the preview just fine but with a black
rectangle under it.
 2023-01-28 19:25:52 -05:00
AUTOMATIC
1d8e06d542 add checkpoints tab for extra networks UI 2023-01-28 22:52:27 +03:00
AUTOMATIC1111
91c8d0dcfc
Merge pull request #7231 from EllangoK/master 
Fixes X/Y/Z Plot parameters not being restored from images
 2023-01-28 18:45:38 +03:00
AUTOMATIC1111
fecb990deb
Merge pull request #7309 from brkirch/fix-embeddings 
Fix embeddings, upscalers, and refactor `--upcast-sampling`
 2023-01-28 18:44:36 +03:00
AUTOMATIC
e2c71a4bd4 make prevent the browser from using cached version of scripts when they change 2023-01-28 18:13:03 +03:00
EllangoK
591b68e56c uses autos new regex, checks len of re_param 2023-01-28 10:04:09 -05:00
AUTOMATIC1111
cd7e8fb42b
Merge pull request #7319 from Thurion/img2img_batch_fix 
Fix error when using img2img batch without masks
 2023-01-28 17:31:39 +03:00
AUTOMATIC
b7d2af8c7f add dropdowns in settings for hypernets and loras 2023-01-28 17:18:47 +03:00
Thurion
1421e95960
allow empty mask dir 2023-01-28 14:42:24 +01:00
AUTOMATIC
5d14f282c2 fixed a bug where after switching to a checkpoint with unknown hash, you'd get empty space instead of checkpoint name in UI 
fixed a bug where if you update a selected checkpoint on disk and then restart the program, a different checkpoint loads, but the name is shown for the the old one.
 2023-01-28 16:23:49 +03:00
AUTOMATIC
f8feeaaedb add progressbar to extension update check; do not check for updates for disabled extensions 2023-01-28 15:57:56 +03:00
AUTOMATIC
d04e3e921e automatically detect v-parameterization for SD2 checkpoints 2023-01-28 15:24:41 +03:00
AUTOMATIC
4aa7f5b5b9 update image parameters regex for #7231 2023-01-28 15:24:40 +03:00
brkirch
f9edd578e9 Remove MPS fix no longer needed for PyTorch 
The torch.narrow fix was required for nightly PyTorch builds for a while to prevent a hard crash, but newer nightly builds don't have this issue.
 2023-01-28 04:16:27 -05:00
brkirch
ada17dbd7c Refactor conditional casting, fix upscalers 2023-01-28 04:16:25 -05:00
AUTOMATIC1111
bea31e849a
Merge pull request #7240 from Unstackd/master 
Allow users to convert models to Instruct-pix2pix models by supporting merging Instruct-pix2pix models with regular ones in the merge tab
 2023-01-28 10:52:28 +03:00
Mackerel
3752aad23d don't replace regular --help with new paths.py parser help 2023-01-28 02:44:12 -05:00
Ju1-js
dc25a31d1a Gradio Auth Read from External File 
Usage: `--gradio-auth-path {PATH}`
It adds the credentials to the already existing `--gradio-auth` credentials. It can also handle line breaks.
The file should look like:
`{u1}:{p1},{u2}:{p2}`
or
```
{u1}:{p1},
{u2}:{p2}
```
Will gradio handle duplicate credentials if it happens?
 2023-01-27 22:43:10 -08:00
AUTOMATIC1111
ce72af87d3
Merge pull request #7199 from maxaudron/feature/configurable-data-dir 
Add flag to store user data sepperate from source code
 2023-01-28 09:24:40 +03:00
AUTOMATIC
0834d4ce37 simplify #7284 2023-01-28 08:41:15 +03:00
AUTOMATIC1111
c99d705e57
Merge pull request #7284 from Gazzoo-byte/patch-1 
Add button to switch width and height
 2023-01-28 08:33:43 +03:00
AUTOMATIC
4c52dfe4ac make the detection for -v models less broad 2023-01-28 08:30:17 +03:00
AUTOMATIC1111
41975c375c
Merge pull request #7294 from MrCheeze/model-detection 
add v2-inpainting model detection, and broaden v-model detection to include anything with 768 in the name
 2023-01-28 08:29:01 +03:00
Andrii Skaliuk
2aac1d9778 Basic inpainting batch support 
Modifies batch UI to add optional inpainting support
 2023-01-27 17:32:31 -08:00
MrCheeze
6b82efd737 add v2-inpainting model detection, and broaden v-model detection to include anything with 768 in the name 2023-01-27 20:06:19 -05:00
AUTOMATIC
cc8c9b7474 fix broken calls to find_checkpoint_config 2023-01-27 22:43:08 +03:00
Gazzoo-byte
eafaf14167
Add button to switch width and height 
Adds a button to switch width and height, allowing quick and easy switching between landscape and portrait.
 2023-01-27 18:34:41 +00:00
Max Audron
23a9d5e273 create user extensions directory if not exists 2023-01-27 14:44:34 +01:00
Max Audron
6b3981c068 clean up unused script_path imports 2023-01-27 14:44:34 +01:00
Max Audron
14c0884fd0 use python importlib to load and execute extension modules 
previously module attributes like __file__ where not set correctly,
leading to scripts getting the directory of the stable-diffusion repo
location instead of their own script.

This causes problem when loading user data from an external location
using the --data-dir flag, as extensions would look for their own code
in the stable-diffusion repo location instead of the data dir location.

Using pythons importlib functions sets the modules specs correctly and
executes them. But this will break extensions if they build paths based
on the previously incorrect __file__ attribute.
 2023-01-27 14:44:34 +01:00
Max Audron
5eee2ac398 add data-dir flag and set all user data directories based on it 2023-01-27 14:44:30 +01:00
AUTOMATIC
9beb794e0b clarify the option to disable NaN check. 2023-01-27 13:08:00 +03:00
AUTOMATIC
6f31d2210c support detecting midas model 
fix broken api for checkpoint list
 2023-01-27 11:54:19 +03:00
AUTOMATIC
d2ac95fa7b remove the need to place configs near models 2023-01-27 11:28:12 +03:00
AUTOMATIC
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
ULTRANOX\Chris
cdc2fa209a Changed filename addition from "instrpix2pix" to the more readable ".instruct-pix2pix" for newly generated instruct pix2pix models. 2023-01-26 11:27:07 -05:00
brkirch
c4b9b07db6 Fix embeddings dtype mismatch 2023-01-26 09:00:15 -05:00
ULTRANOX\Chris
9e72dc7434 Changed all references to "pix2pix" to the more precise name "instruct pix2pix". Also changed extension to instrpix2pix at least for now. 2023-01-26 06:05:40 -05:00
ULTRANOX\Chris
f90798c6b6 Added error check for the rare case a user merges a pix2pix model with a normal model using weighted sum. Also removed bad print message that interfered with merging progress bar. 2023-01-26 04:38:04 -05:00
ULTRANOX\Chris
f4ec411f2c Allow checkpoint merger to merge pix2pix models in the same way that it currently supports inpainting models. 2023-01-26 03:45:16 -05:00
brkirch
10421f93c3 Fix full previews, --no-half-vae 2023-01-26 01:43:35 -05:00
EllangoK
4d634dc592 adds components to infotext_fields 
allows for loading script params
 2023-01-26 00:18:41 -05:00
EllangoK
e57b5f7c55 re_param captures quotes with commas properly 
and removes unnecessary regex
 2023-01-25 22:36:14 -05:00
AUTOMATIC
6cff440182 fix prompt editing break after first batch in img2img 2023-01-25 23:25:40 +03:00
AUTOMATIC
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
AUTOMATIC1111
3cead6983e
Merge pull request #7197 from mcmonkey4eva/fix-ti-symlinks 
allow symlinks in the textual inversion embeddings folder
 2023-01-25 22:59:12 +03:00
AUTOMATIC
15e89ef0f6 fix for unet hijack breaking the train tab 2023-01-25 20:11:01 +03:00
AUTOMATIC
789d47f832 make clicking extra networks button one more time close the extra networks UI 2023-01-25 19:55:31 +03:00
Alex "mcmonkey" Goodwin
e179b6098a allow symlinks in the textual inversion embeddings folder 2023-01-25 08:48:40 -08:00
AUTOMATIC1111
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
AUTOMATIC
57c1baa774 change to code for live preview fix on OSX to be bit more obvious 2023-01-25 18:56:23 +03:00
AUTOMATIC1111
23dafe6d86
Merge pull request #7151 from brkirch/fix-approx-nn 
Fix Approx NN previews changing first generation result
 2023-01-25 18:48:25 +03:00
Kyle
ee0a0da324 Add instruct-pix2pix hijack 
Allows loading instruct-pix2pix models via same method as inpainting models in sd_models.py and sd_hijack_ip2p.py

Adds ddpm_edit.py necessary for instruct-pix2pix
 2023-01-25 08:53:23 -05:00
AUTOMATIC1111
d5ce044bcd
Merge pull request #7146 from EllangoK/master 
Adds X/Y/Z Grid Script
 2023-01-25 11:56:26 +03:00
brkirch
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
brkirch
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
AUTOMATIC
5228ec8bda remove fairscale requirement, add fake fairscale to make BLIP not complain about it mk2 2023-01-24 20:30:43 +03:00
AUTOMATIC
28189985e6 remove fairscale requirement, add fake fairscale to make BLIP not complain about it 2023-01-24 20:24:27 +03:00
EllangoK
e46bfa5a9e handling sub grids and merging into one 2023-01-24 02:24:32 -05:00
AUTOMATIC
602a1864b0 also return the removed field to sdapi/v1/upscalers because someone might have relied on it existing 2023-01-24 10:09:30 +03:00
AUTOMATIC
42a70d7477 repair sdapi/v1/upscalers returning bogus results 2023-01-24 10:05:45 +03:00
brkirch
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
Vladimir Mandic
45e270dfc8
add image decod exception handling 2023-01-23 17:11:22 -05:00
AUTOMATIC
5c1cb9263f fix BLIP failing to import depending on configuration 2023-01-24 00:24:17 +03:00
AUTOMATIC1111
7ba7f4ed6e
Merge pull request #7113 from vladmandic/interrogate 
Add selector to interrogate categories
 2023-01-24 00:09:14 +03:00
AUTOMATIC
7b1c7ba87b add support for apostrophe in extra network names 2023-01-23 23:11:34 +03:00
Vladimir Mandic
04a561c11c
add option to skip interrogate categories 2023-01-23 12:29:23 -05:00
Vladimir Mandic
efa7287be0
Merge branch 'AUTOMATIC1111:master' into interrogate 2023-01-23 12:25:07 -05:00
AUTOMATIC1111
171a5b3bb9
Merge pull request #7032 from gmq/extra-network-styles 
Extra network view style
 2023-01-23 18:46:37 +03:00
Vladimir Mandic
6e1b296baf
api-image-format 2023-01-23 10:10:59 -05:00
AUTOMATIC
e8c3d03f7d a possible fix for broken image upscaling 2023-01-23 17:59:58 +03:00
Vladimir Mandic
925dd09c91
improve interrogate 2023-01-23 09:03:17 -05:00
AUTOMATIC
59146621e2 better support for xformers flash attention on older versions of torch 2023-01-23 16:40:20 +03:00
AUTOMATIC
3fa482076a Merge remote-tracking branch 'takuma104/xformers-flash-attention' 2023-01-23 16:01:53 +03:00
AUTOMATIC
194cbd065e fix open directory button failing 2023-01-23 15:50:32 +03:00
AUTOMATIC1111
663353098e
Merge pull request #7031 from EllangoK/master 
Fixes various button overflowing UI and compact checkbox
 2023-01-23 15:22:06 +03:00
AUTOMATIC1111
74608300d1
Merge pull request #7093 from Shondoit/fix-dark-mode 
Fix dark mode
 2023-01-23 15:09:26 +03:00
AUTOMATIC
41265a026d third time's the charm 2023-01-23 14:50:20 +03:00
AUTOMATIC
fabdae089e add missing import to previous commit 2023-01-23 14:42:49 +03:00
Shondoit
669dbd9725 Fix dark mode 
Fixes #7048

Co-Authored-By: J.J. Tolton <jjtolton@gmail.com>
 2023-01-23 09:54:42 +01:00
AUTOMATIC
b5230197a6 rework extras tab to use script system 2023-01-23 09:24:43 +03:00
Guillermo Moreno
f80ff3c1e4 feat(extra-networks): remove view dropdown 2023-01-22 22:01:24 -03:00
Guillermo Moreno
66eef11ce7 feat(extra-networks): add default view setting 2023-01-22 12:18:21 -03:00
Guillermo Moreno
985c0b8e9a feat(extra-networks): add thumbs view style 2023-01-22 12:18:21 -03:00
AUTOMATIC
68303c96e5 split oversize extras.py to postprocessing.py 2023-01-22 15:38:39 +03:00
Andrey
c56b367122 Split history extras.py to postprocessing.py 2023-01-22 15:26:41 +03:00
Andrey
d63340a485 Split history extras.py to postprocessing.py 2023-01-22 15:26:40 +03:00
Andrey
b238b14ee4 Split history extras.py to postprocessing.py 2023-01-22 15:26:40 +03:00
Andrey
43ac9ff205 Split history extras.py to postprocessing.py 2023-01-22 15:26:40 +03:00
AUTOMATIC
c98cb0f8ec amend previous commit to work in a proper fashion when saving previews 2023-01-22 11:04:02 +03:00
AUTOMATIC
35419b2746 add an option to reorder tabs for extra networks 2023-01-22 11:00:05 +03:00
AUTOMATIC
112416d041 add option to discard weights in checkpoint merger UI 2023-01-22 10:17:12 +03:00
AUTOMATIC
0792fae078 fix missing field for aesthetic embedding extension 2023-01-22 08:20:48 +03:00
AUTOMATIC
2621566153 attention ctrl+up/down enhancements 2023-01-22 08:07:18 +03:00
EllangoK
bf457b30fb compact checkbox and fix copy image btn overflow 
also fixes type for #tab_extensions in style.css
 2023-01-21 16:21:33 -05:00
AUTOMATIC
f2eae6127d fix broken textual inversion extras tab 2023-01-22 00:16:26 +03:00
AUTOMATIC
fe7a623e6b add a slider for default value of added extra networks 2023-01-22 00:02:52 +03:00
AUTOMATIC
78f59a4e01 enable compact view for train tab 
prevent  previews from ruining hypernetwork training
 2023-01-22 00:02:51 +03:00
AUTOMATIC1111
abf11215e0
Merge pull request #6955 from EllangoK/master 
Adds descriptions for merging methods in UI
 2023-01-21 23:17:06 +03:00
AUTOMATIC
4a8fe09652 remove the double loading text 2023-01-21 23:06:18 +03:00
AUTOMATIC
e4e0918f58 remove timestamp for js files, reformat code 2023-01-21 22:57:19 +03:00
AUTOMATIC1111
7c8852b8e7
Merge pull request #7015 from jjtolton/serve-static-js 
Compile and serve js files via `src` instead of embedded inline scripts
 2023-01-21 22:43:18 +03:00
James Tolton
035459c9a2 remove dead import 2023-01-21 14:11:13 -05:00
James Tolton
50059ea661 server individually listed javascript files vs single compiled file 2023-01-21 14:07:48 -05:00
James Tolton
17af0fb955 remove commented out lines 2023-01-21 13:27:05 -05:00
James Tolton
f726df8a2f Compile and serve js from /statica instead of inline in html 2023-01-21 12:59:05 -05:00
AUTOMATIC
f53527f778 make it run on gradio < 3.16.2 2023-01-21 20:07:14 +03:00
AUTOMATIC
3deea34135 extract extra network data from prompt earlier 2023-01-21 19:36:08 +03:00
AUTOMATIC
63b824376c add --gradio-queue option to enable gradio queue 2023-01-21 18:47:54 +03:00
AUTOMATIC
424cefe118 add search box to extra networks 2023-01-21 17:20:24 +03:00
AUTOMATIC
92fb1096db make it so that extra networks are not removed from infotext 2023-01-21 16:41:25 +03:00
AUTOMATIC
855b9e3d1c Lora support! 
update readme to reflect some recent changes
 2023-01-21 16:15:53 +03:00
Takuma Mori
3262e825cc add --xformers-flash-attention option & impl 2023-01-21 17:42:04 +09:00
AUTOMATIC
184e23eb89 relocate tool buttons next to generate button 
prevent extra network tabs from putting images into wrong prompts
prevent settings leaking into prompt
 2023-01-21 09:58:57 +03:00
AUTOMATIC
6d805b669e make CLIP interrogator download original text files if the directory does not exist 
remove random artist built-in extension (to re-added as a normal extension on demand)
remove artists.csv (but what does it mean????????????????????)
make interrogate buttons show Loading... when you click them
 2023-01-21 09:14:27 +03:00
AUTOMATIC
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
AUTOMATIC
20a59ab3b1 move token counter to the location of the prompt, add token counting for the negative prompt 2023-01-20 10:18:41 +03:00
EllangoK
98466da4bc adds descriptions for merging methods in ui 2023-01-20 00:48:15 -05:00
AUTOMATIC
6c7a50d783 remove some unnecessary logging to javascript console 2023-01-20 08:36:37 +03:00
AUTOMATIC
6073456c83 write a comment for fix_checkpoint function 2023-01-19 20:39:10 +03:00
AUTOMATIC1111
51517f3ea6
Merge pull request #6936 from EllangoK/master 
Fixes minor typos around run_modelmerger
 2023-01-19 19:58:16 +03:00
AUTOMATIC
c1928cdd61 bring back short hashes to sd checkpoint selection 2023-01-19 18:58:08 +03:00
EllangoK
f2ae252987 fixes minor typos around run_modelmerger 2023-01-19 10:24:17 -05:00
AUTOMATIC
d1ea518dea remember the list of checkpoints after you press refresh button and reload the page 2023-01-19 18:07:37 +03:00
vt-idiot
b271e22f7a
Update shared.py 
`Witdth/Height` was driving me insane. -> `Width/Height`
 2023-01-19 06:12:19 -05:00
AUTOMATIC1111
aa60fc6660
Merge pull request #6922 from brkirch/cumsum-fix 
Improve cumsum fix for MPS
 2023-01-19 13:18:34 +03:00
AUTOMATIC1111
0f9cacaa0e
Merge pull request #6844 from guaneec/crop-ui 
Add auto-sized cropping UI
 2023-01-19 13:11:05 +03:00
dan
2985b317d7 Fix of fix 2023-01-19 17:39:30 +08:00
dan
18a09c7e00 Simplification and bugfix 2023-01-19 17:36:23 +08:00
AUTOMATIC
54674674b8 allow having at half precision when there is only one checkpoint in merger tab 2023-01-19 12:12:09 +03:00
AUTOMATIC
0f5dbfffd0 allow baking in VAE in checkpoint merger tab 
do not save config if it's the default for checkpoint merger tab
change file naming scheme for checkpoint merger tab
allow just saving A without any merging for checkpoint merger tab
some stylistic changes for UI in checkpoint merger tab
 2023-01-19 10:39:51 +03:00
AUTOMATIC
c7e50425f6 add progress bar to modelmerger 2023-01-19 09:25:37 +03:00
AUTOMATIC
7cfc645030 eliminate repetition of code in #6910 2023-01-19 08:53:50 +03:00
AUTOMATIC1111
01b1061a0b
Merge pull request #6910 from EllangoK/master 
Check model name values are set before merging
 2023-01-19 08:48:27 +03:00
AUTOMATIC
308b51012a fix an unlikely division by 0 error 2023-01-19 08:41:37 +03:00
EllangoK
26a6a78b16 only lookup tertiary model if theta_func1 is set 2023-01-18 21:21:52 -05:00
EllangoK
99207bc816 check model name values are set before merging 2023-01-18 19:13:15 -05:00
AUTOMATIC
bb0978ecfd fix hires fix ui weirdness caused by gradio update 2023-01-19 00:44:51 +03:00
AUTOMATIC1111
a8322ad75b
Merge pull request #6854 from EllangoK/master 
Saves Extra Generation Parameters to params.txt
 2023-01-18 23:25:56 +03:00
AUTOMATIC1111
43fd6eaab8
Merge pull request #6851 from ddPn08/master 
Add `--vae-dir` argument
 2023-01-18 23:23:09 +03:00
AUTOMATIC
b186d44dcd use DDIM in hires fix is the sampler is PLMS 2023-01-18 23:20:23 +03:00
AUTOMATIC1111
c94abc8862
Merge pull request #6895 from mezotaken/interrogate-all-tabs 
Process interrogation on all img2img subtabs
 2023-01-18 23:07:41 +03:00
AUTOMATIC
924e222004 add option to show/hide warnings 
removed hiding warnings from LDSR
fixed/reworked few places that produced warnings
 2023-01-18 23:04:24 +03:00
Vladimir Repin
8683427bd9 Process interrogation on all img2img subtabs 2023-01-18 20:25:52 +03:00
AUTOMATIC
6faae23239 repair broken quicksettings when some form-requiring options are added to it 2023-01-18 14:33:09 +03:00
AUTOMATIC
26fd444811 bump gradio to 3.16.2 
change style selection to multiselect dropdown
 2023-01-18 13:59:45 +03:00
brkirch
a255dac4f8 Fix cumsum for MPS in newer torch 
The prior fix assumed that testing int16 was enough to determine if a fix is needed, but a recent fix for cumsum has int16 working but not bool.
 2023-01-17 20:54:18 -05:00
ddPn08
d906f87043
fix typo 2023-01-18 07:52:10 +09:00
AUTOMATIC
3a0d6b7729 make it so that PNG images with EXIF do not lose parameters in PNG info tab 2023-01-17 23:54:23 +03:00
EllangoK
5e15a0b422 Changed params.txt save to after manual init call 2023-01-17 11:42:44 -05:00
ddPn08
6e08da2c31
Add --vae-dir argument 2023-01-17 23:50:41 +09:00
AUTOMATIC
aede265f1d Fix unable to find Real-ESRGAN model info error (AttributeError: 'NoneType' object has no attribute 'data_path') #6841 #5170 2023-01-17 13:57:55 +03:00
dan
4688bfff55 Add auto-sized cropping UI 2023-01-17 17:16:43 +08:00
AUTOMATIC
c361b89026 disable the new NaN check for the CI 2023-01-17 11:05:01 +03:00
fuggy
eb2223340c
Fix typo 2023-01-16 21:50:30 -06:00
AUTOMATIC
e0e8005009 make StableDiffusionProcessing class not hold a reference to shared.sd_model object 2023-01-16 23:09:08 +03:00
AUTOMATIC
9991967f40 Add a check and explanation for tensor with all NaNs. 2023-01-16 22:59:46 +03:00
AUTOMATIC
064983c0ad return an option to hide progressbar 2023-01-16 12:56:30 +03:00
AUTOMATIC
ff6a5bcec1 bugfix for previous commit 2023-01-16 01:28:20 +03:00
AUTOMATIC
3f887f7f61 support old configs that say "auto" for ssd_vae 
change sd_vae_as_default to True by default as it's a more sensible setting
 2023-01-16 00:44:52 +03:00
AUTOMATIC
3db22e6ee4 rename masking to inpaint in UI 
make inpaint go to the right place for users who don't have it in config string
 2023-01-15 23:32:38 +03:00
AUTOMATIC1111
30cfe4ed9b
Merge pull request #6758 from Poktay/allow_reorder_masking_controls 
allow reordering of inpaint masking controls (like the other sections can be reordered)
 2023-01-15 23:24:09 +03:00
AUTOMATIC
89314e79da fix an error that happens when you send an empty image from txt2img to img2img 2023-01-15 23:23:24 +03:00
AUTOMATIC1111
f3167b10ce
Merge pull request #6780 from vladmandic/train-logging 
add fields to settings file
 2023-01-15 22:55:45 +03:00
AUTOMATIC1111
d6fa8e92ca
Merge pull request #6782 from aria1th/fix-hypernetwork-loss 
Fix tensorboard-hypernetwork integration correctly
 2023-01-15 22:55:06 +03:00
AUTOMATIC1111
4385449933
Merge pull request #6778 from pangbo13/master 
Fix unexpected behavior when show_progress_every_n_steps is set to -1
 2023-01-15 22:54:14 +03:00
AUTOMATIC
8e2aeee4a1 add BREAK keyword to end current text chunk and start the next 2023-01-15 22:29:53 +03:00
aria1th
13445738d9 Fix tensorboard related functions 2023-01-16 03:02:54 +09:00
aria1th
598f7fcd84 Fix loss_dict problem 2023-01-16 02:46:21 +09:00
Vladimir Mandic
110d1a2d59
add fields to settings file 2023-01-15 12:41:00 -05:00
AUTOMATIC
205991df78 Merge remote-tracking branch 'origin/fix-mean-loss' 2023-01-15 20:30:42 +03:00
AUTOMATIC
b6ce041cdf put interrupt and skip buttons back where they were 2023-01-15 20:29:55 +03:00
AUTOMATIC
a534bdfc80 add setting for progressbar update period 2023-01-15 20:29:55 +03:00
AngelBottomless
16f410893e
fix missing 'mean loss' for tensorboard integration 2023-01-16 02:08:47 +09:00
pangbo13
388708f7b1 fix when show_progress_every_n_steps == -1 2023-01-16 00:56:24 +08:00
AUTOMATIC1111
ce13ced5dc
Merge pull request #6772 from vladmandic/sha-calc-optimization 
increase block size
 2023-01-15 19:09:46 +03:00
AUTOMATIC1111
006997d180
Merge pull request #6770 from brkirch/approx-nn-fix 
Fix Approx NN not working on torch devices other than CUDA
 2023-01-15 19:09:06 +03:00
AUTOMATIC
d8b90ac121 big rework of progressbar/preview system to allow multiple users to prompts at the same time and do not get previews of each other 2023-01-15 18:51:04 +03:00
Vladimir Mandic
f0312565e5
increase block size 2023-01-15 09:42:34 -05:00
brkirch
eef1990a5e Fix Approx NN on devices other than CUDA 2023-01-15 08:13:33 -05:00
Josh R
9ef41df6f9 add inpaint masking controls to orderable section that the settings can order 2023-01-14 15:26:45 -08:00
Vladimir Mandic
ce9827a7c5
Merge pull request #6731 from vladmandic/state_server_start 
Add server start time to state info
 2023-01-14 16:03:29 -05:00
AUTOMATIC1111
beeec2b598
Merge pull request #6728 from bbc-mc/exclude_clip_index_from_merge_target 
Exclude clip index from merge
 2023-01-14 23:12:31 +03:00
AUTOMATIC
86359535d6 add buttons to copy images between img2img tabs 2023-01-14 22:43:01 +03:00
AUTOMATIC
f8c5124785 typo? 2023-01-14 20:00:12 +03:00
AUTOMATIC
a5bbcd2153 fix bug with "Ignore selected VAE for..." option completely disabling VAE election 
rework VAE resolving code to be more simple
 2023-01-14 19:56:09 +03:00
Vladimir Mandic
fad850fc3d
add server_start to shared.state 2023-01-14 11:18:05 -05:00
AUTOMATIC
f94a215abe add an option to choose what you want to see in live preview (Live preview subject) and moves live preview settings to its own tab 2023-01-14 16:29:23 +03:00
AUTOMATIC
08c6f009a5 load hashes from cache for checkpoints that have them 
add checkpoint hash to footer
 2023-01-14 15:55:40 +03:00
AUTOMATIC
865228a837 change style dropdowns to multiselect 2023-01-14 14:56:39 +03:00
bbc_mc
5f8685237e Exclude clip index from merge 2023-01-14 20:09:32 +09:00
AUTOMATIC
6eb72fd13f bump gradio to 3.16.1 2023-01-14 13:38:10 +03:00
AUTOMATIC
febd2b722e update key to use with checkpoints' sha256 in cache 2023-01-14 13:37:55 +03:00
AUTOMATIC
f9ac3352cb change hypernets to use sha256 hashes 2023-01-14 10:25:37 +03:00
AUTOMATIC
a95f135308 change hash to sha256 2023-01-14 09:56:59 +03:00
AUTOMATIC
82725f0ac4 fix a bug caused by merge 2023-01-13 15:04:37 +03:00
AUTOMATIC1111
9cd7716753
Merge branch 'master' into tensorboard 2023-01-13 14:57:38 +03:00
AUTOMATIC1111
544e7a233e
Merge pull request #6689 from Poktay/add_gradient_settings_to_logging_file 
add gradient settings to training settings log files
 2023-01-13 14:45:32 +03:00
AUTOMATIC1111
3ad1fdd99b
Merge pull request #6684 from space-nuko/save-extension-params-to-last-params 
Fix extension parameters not being saved to last used parameters
 2023-01-13 14:44:39 +03:00
AUTOMATIC1111
7bf3cfc427
Merge pull request #6685 from space-nuko/script-callback-fix-infotext 
Add script callback for fixing infotext parameters
 2023-01-13 14:43:42 +03:00
AUTOMATIC
a176d89487 print bucket sizes for training without resizing images #6620 
fix an error when generating a picture with embedding in it
 2023-01-13 14:32:15 +03:00
AUTOMATIC1111
486bda9b33
Merge pull request #6620 from guaneec/varsize_batch 
Enable batch_size>1 for mixed-sized training
 2023-01-13 14:03:31 +03:00
Josh R
0b262802b8 add gradient settings to training settings log files 2023-01-12 17:31:05 -08:00
space-nuko
6c88eaed4f Add script callback for fixing infotext parameters 2023-01-12 13:50:09 -08:00
space-nuko
88416ab5ff Fix extension parameters not being saved to last used parameters 2023-01-12 13:46:59 -08:00
Shondoit
d52a80f7f7 Allow creation of zero vectors for TI 2023-01-12 09:22:29 +01:00
AUTOMATIC
0b8911d883 img2img UI rework: obsolete --gradio-img2img-tool --gradio-inpaint-tool and always show all tools each in own tab 2023-01-11 20:33:24 +03:00
AUTOMATIC1111
590ff5ce5b
Merge pull request #6647 from vladmandic/update-progress-api 
add textinfo to progress api response
 2023-01-11 19:06:08 +03:00
AUTOMATIC1111
6d7f3d1072
Merge pull request #6648 from vladmandic/progress-description 
Set TQDM progress bar and state textinfo description
 2023-01-11 19:04:54 +03:00
AUTOMATIC1111
97ff69eff3
Merge pull request #6628 from catboxanon/fix/alternating-words-emphasis 
Fix prompt parser default step transformer
 2023-01-11 18:56:24 +03:00
AUTOMATIC
4bd490727e fix for an error caused by skipping initialization, for realsies this time: TypeError: expected str, bytes or os.PathLike object, not NoneType 2023-01-11 18:54:13 +03:00
Vladimir Mandic
3f43d8a966
set descriptions 2023-01-11 10:28:55 -05:00
Vladimir Mandic
39ea251945
add textinfo to progress response 2023-01-11 10:23:51 -05:00
catboxanon
0b38b72d31
Remove compat option for prompt parser 2023-01-11 09:01:37 -05:00
catboxanon
ab388d6f8b
Remove compat option check for prompt parser 2023-01-11 08:59:47 -05:00
catboxanon
035f2af050
Merge branch 'AUTOMATIC1111:master' into fix/alternating-words-emphasis 2023-01-11 08:58:43 -05:00
AUTOMATIC
1a23dc32ac possible fix for fallback for fast model creation from config, attempt 2 2023-01-11 10:34:36 +03:00
AUTOMATIC
4fdacd31e4 possible fix for fallback for fast model creation from config 2023-01-11 10:24:56 +03:00
AUTOMATIC
954091697f add an option to copy config from one of models in checkpoint merger 2023-01-11 09:10:07 +03:00
AUTOMATIC1111
3e20244b0f
Merge pull request #6625 from PlasmaPower/textual-inversion-safetensors 
Support loading textual inversion embeddings from safetensors files
 2023-01-11 08:21:22 +03:00
space-nuko
37a2301121 Expose the compiled class module of scripts to extensions 2023-01-10 20:30:09 -08:00
catboxanon
7e45fba55b
Fix prompt parser default step transformer w/ test 2023-01-10 21:47:03 -05:00
catboxanon
5830095b73
Add old prompt parser compat option 2023-01-10 21:43:24 -05:00
Lee Bousfield
f9706acf43
Support loading textual inversion embeddings from safetensors files 2023-01-10 18:40:34 -07:00
dan
6be644fa04 Enable batch_size>1 for mixed-sized training 2023-01-11 05:31:58 +08:00
AUTOMATIC
29fb532764 change color selector in settings to be part of form 2023-01-10 23:47:07 +03:00
AUTOMATIC
0f8603a559 add support for transformers==4.25.1 
add fallback for when quick model creation fails
 2023-01-10 17:46:59 +03:00
AUTOMATIC
ce3f639ec8 add more stuff to ignore when creating model from config 
prevent .vae.safetensors files from being listed as stable diffusion models
 2023-01-10 16:51:04 +03:00
AUTOMATIC
0c3feb202c disable torch weight initialization and CLIP downloading/reading checkpoint to speedup creating sd model from config 2023-01-10 14:08:29 +03:00
AUTOMATIC
ef75c98053 Split history ui.py to ui_progress.py 2023-01-10 12:29:45 +03:00
Andrey
54dd5d6634 Split history ui.py to ui_progress.py 2023-01-10 11:54:49 +03:00
Andrey
f9c2147dfb Split history ui.py to ui_progress.py 2023-01-10 11:54:49 +03:00
Andrey
27ea6949d3 Split history ui.py to ui_progress.py 2023-01-10 11:54:48 +03:00
Andrey
e9f8292a3a Split history ui.py to ui_progress.py 2023-01-10 11:54:48 +03:00
aria1th
a4a5475cfa Variable dropout rate 
Implements variable dropout rate from #4549

Fixes hypernetwork multiplier being able to modified during training, also fixes user-errors by setting multiplier value to lower values for training.

Changes function name to match torch.nn.module standard

Fixes RNG reset issue when generating previews by restoring RNG state
 2023-01-10 14:56:57 +09:00
AUTOMATIC1111
bd4587d2f5
Merge pull request #6578 from vladmandic/fix-model-load 
allow model load if previous model failed
 2023-01-10 08:22:44 +03:00
Vladimir Mandic
2275f130bf
relax reponse type check enforcement 2023-01-09 21:23:58 -05:00
Vladimir Mandic
552d7b90bf
allow model load if previous model failed 2023-01-09 18:34:26 -05:00
AUTOMATIC
3fe9e9e54d fix broken resolution detection when pasting parameters with old hires fix enabled 2023-01-10 02:17:42 +03:00
AUTOMATIC1111
b1d976dca2
Merge pull request #6466 from vladmandic/api-get-memory 
Implement API get-memory
 2023-01-10 02:02:19 +03:00
Vladimir Mandic
95727312ca
remove bytes -> gb conversion 2023-01-09 16:54:12 -05:00
AUTOMATIC
1fbb6f9ebe make a dropdown for prompt template selection 2023-01-09 23:35:40 +03:00
AUTOMATIC
43bb5190fc remove/simplify some changes from #6481 2023-01-09 22:52:23 +03:00
AUTOMATIC1111
18c001792a
Merge branch 'master' into varsize 2023-01-09 22:45:39 +03:00