Commit Graph

1261 Commits

Author SHA1 Message Date
AUTOMATIC
7fd90128eb added a guard for hypernet training that will stop early if weights are getting no gradients 2022-10-22 14:48:43 +03:00
AUTOMATIC
1cd3ed7def fix for extensions without style.css 2022-10-22 14:28:56 +03:00
discus0434
dcb45dfecf Merge branch 'master' of upstream 2022-10-22 11:14:46 +00:00
discus0434
0e8ca8e7af add dropout 2022-10-22 11:07:00 +00:00
AUTOMATIC
50b5504401 remove parsing command line from devices.py 2022-10-22 14:04:14 +03:00
AUTOMATIC1111
1fa53dab2c
Merge branch 'master' into cuda-device-id-selection 2022-10-22 13:57:20 +03:00
AUTOMATIC
6398dc9b10 further support for extensions 2022-10-22 13:34:49 +03:00
AUTOMATIC
2b91251637 removed aesthetic gradients as built-in
added support for extensions
2022-10-22 12:23:58 +03:00
yfszzx
67b78f0ea6 inspiration perfected 2022-10-22 10:29:23 +08:00
yfszzx
d93ea5cdeb inspiration perfected 2022-10-22 10:21:21 +08:00
yfszzx
40ddb6df61 inspiration perfected 2022-10-22 10:16:22 +08:00
Extraltodeus
29bfacd63c
implement CUDA device selection, --device-id arg 2022-10-22 00:12:46 +02:00
Extraltodeus
57eb54b838
implement CUDA device selection by ID 2022-10-22 00:11:07 +02:00
yfszzx
bb0f1a2cda inspiration finished 2022-10-22 01:23:00 +08:00
AUTOMATIC
26d1073745 Merge remote-tracking branch 'historytab/master' 2022-10-21 18:49:56 +03:00
AUTOMATIC
f49c08ea56 prevent error spam when processing images without txt files for captions 2022-10-21 18:46:02 +03:00
AUTOMATIC1111
5e9afa5c8a
Merge branch 'master' into fix/train-preprocess-keep-ratio 2022-10-21 18:36:29 +03:00
AUTOMATIC
ac0aa2b18e loading SD VAE, see PR #3303 2022-10-21 17:35:51 +03:00
AUTOMATIC
704036ff07 make aspect ratio overlay work regardless of selected localization 2022-10-21 17:11:42 +03:00
Rcmcpe
02e4d4694d Change option description of unload_models_when_training 2022-10-21 16:53:06 +03:00
timntorres
272fa527bb Remove unused variable. 2022-10-21 16:52:24 +03:00
timntorres
fccad18a59 Refer to Hypernet's name, sensibly, by its name variable. 2022-10-21 16:52:24 +03:00
timntorres
19818f023c Match hypernet name with filename in all cases. 2022-10-21 16:52:24 +03:00
timntorres
51e3dc9cca Sanitize hypernet name input. 2022-10-21 16:52:24 +03:00
DepFA
306e2ff6ab Update image_embedding.py 2022-10-21 16:47:37 +03:00
DepFA
d0ea471b0c Use opts in textual_inversion image_embedding.py for dynamic fonts 2022-10-21 16:47:37 +03:00
AUTOMATIC
9286fe53de make aestetic embedding ciompatible with prompts longer than 75 tokens 2022-10-21 16:38:06 +03:00
AUTOMATIC
df57064093 do not load aesthetic clip model until it's needed
add refresh button for aesthetic embeddings
add aesthetic params to images' infotext
2022-10-21 16:10:51 +03:00
AUTOMATIC
7d6b388d71 Merge branch 'ae' 2022-10-21 13:35:01 +03:00
AUTOMATIC
bf30673f51 Fix Hypernet infotext string split bug for PR #3283 2022-10-21 10:19:25 +03:00
AUTOMATIC
03a1e288c4 turns out LayerNorm also has weight and bias and needs to be pre-multiplied and trained for hypernets 2022-10-21 10:13:24 +03:00
AUTOMATIC1111
0c5522ea21
Merge branch 'master' into training-help-text 2022-10-21 09:57:55 +03:00
timntorres
2273e752fb Remove redundant try/except. 2022-10-21 09:55:00 +03:00
timntorres
4ff274e1e3 Revise comments. 2022-10-21 09:55:00 +03:00
timntorres
6014fb8afb Do nothing if image file already exists. 2022-10-21 09:55:00 +03:00
timntorres
5245c7a493 Issue #2921-Give PNG info to Hypernet previews. 2022-10-21 09:55:00 +03:00
guaneec
b69c37d25e Allow datasets with only 1 image in TI 2022-10-21 09:54:09 +03:00
Patryk Wychowaniec
7157e5d064 interrogate: Fix CLIP-interrogation on CPU
Currently, trying to perform CLIP interrogation on a CPU fails, saying:

```
RuntimeError: "slow_conv2d_cpu" not implemented for 'Half'
```

This merge request fixes this issue by detecting whether the target
device is CPU and, if so, force-enabling `--no-half` and passing
`device="cpu"` to `clip.load()` (which then does some extra tricks to
ensure it works correctly on CPU).
2022-10-21 09:52:12 +03:00
AUTOMATIC1111
d6bd6a425d
Merge branch 'master' into master 2022-10-21 09:49:32 +03:00
AUTOMATIC
c23f666dba a more strict check for activation type and a more reasonable check for type of layer in hypernets 2022-10-21 09:47:43 +03:00
AUTOMATIC1111
a26fc2834c
Merge pull request #3199 from discus0434/master
Add features to insert activation functions to hypernetworks
2022-10-21 09:34:45 +03:00
winterspringsummer
9d71eef02e sort file list in alphabetical ordering in extras 2022-10-21 09:00:46 +03:00
winterspringsummer
a13c3bed3c Fixed path issue while extras batch processing 2022-10-21 09:00:46 +03:00
winterspringsummer
fb5a8cf0d9 Added try except to extras batch from directory 2022-10-21 09:00:45 +03:00
winterspringsummer
60872c5b40 Fixed path issue while extras batch processing 2022-10-21 09:00:45 +03:00
AUTOMATIC
74088c2a06 allow float sizes for hypernet's layer_structure 2022-10-21 09:00:45 +03:00
AUTOMATIC
4587218190 updated readme and some small stylistic changes to code 2022-10-21 09:00:39 +03:00
random_thoughtss
49533eed9e XY grid correctly re-assignes model when config changes 2022-10-20 16:01:27 -07:00
Vladimir Repin
d23a46ceaa Different approach to skip/interrupt with highres fix 2022-10-20 23:49:14 +03:00
random_thoughtss
708c3a7bd8 Added PLMS hijack and made sure to always replace methods 2022-10-20 13:28:43 -07:00
Vladimir Repin
d1cb08bfb2 fix skip and interrupt for highres. fix option 2022-10-20 22:49:06 +03:00
random_thoughtss
92a17a7a4a Made dummy latents smaller. Minor code cleanups 2022-10-20 09:45:03 -07:00
aria1th
f89829ec3a Revert "fix bugs and optimizations"
This reverts commit 108be15500.
2022-10-21 01:37:11 +09:00
不会画画的中医不是好程序员
dc66540629
Merge branch 'AUTOMATIC1111:master' into Inspiron 2022-10-21 00:07:31 +08:00
AngelBottomless
108be15500
fix bugs and optimizations 2022-10-21 01:00:41 +09:00
yfszzx
d07cb46f34 inspiration pull request 2022-10-20 23:58:52 +08:00
AngelBottomless
a71e021236
only linear 2022-10-20 23:48:52 +09:00
AngelBottomless
d8acd34f66
generalized some functions and option for ignoring first layer 2022-10-20 23:43:03 +09:00
Milly
85dd62c4c7 train: ui: added Split image threshold and Split image overlap ratio to preprocess 2022-10-20 23:35:01 +09:00
Milly
9681419e42 train: fixed preprocess image ratio 2022-10-20 23:32:41 +09:00
discus0434
f8733ad08b add linear as a act func (option for doin nothing) 2022-10-20 11:07:37 +00:00
discus0434
6b38c2c19c
Merge branch 'AUTOMATIC1111:master' into master 2022-10-20 18:51:12 +09:00
captin411
0ddaf8d202
improve face detection a lot 2022-10-20 00:34:55 -07:00
AUTOMATIC
7f8ab1ee8f Merge remote-tracking branch 'origin/master' 2022-10-20 08:18:19 +03:00
AUTOMATIC
930b4c64f7 allow float sizes for hypernet's layer_structure 2022-10-20 08:18:02 +03:00
random_thoughtss
aa7ff2a197 Fixed non-square highres fix generation 2022-10-19 21:46:13 -07:00
DepFA
858462f719
do caption copy for both flips 2022-10-20 02:57:18 +01:00
captin411
59ed744383
face detection algo, configurability, reusability
Try to move the crop in the direction of a face if it is present

More internal configuration options for choosing weights of each of the algorithm's findings

Move logic into its module
2022-10-19 17:19:02 -07:00
discus0434
ba469343e6 align ui.py imports with upstream 2022-10-20 00:17:04 +00:00
discus0434
ecb433b220 update 2022-10-20 00:14:16 +00:00
discus0434
6f98e89486 update 2022-10-20 00:10:45 +00:00
DepFA
55d8c6cce6
default to ignore existing captions 2022-10-20 00:53:29 +01:00
DepFA
9b65c4ecf4
pass preprocess_txt_action param 2022-10-20 00:49:23 +01:00
DepFA
ab353b141d
link existing txt option 2022-10-20 00:48:07 +01:00
DepFA
fbcce66601
add existing caption file handling 2022-10-20 00:46:54 +01:00
DepFA
4d6b9f76a5
reorder create_hypernetwork params 2022-10-20 00:27:16 +01:00
DepFA
c3835ec85c
pass overwrite old flag 2022-10-20 00:24:24 +01:00
DepFA
632e8d6602
split learn rates 2022-10-20 00:19:40 +01:00
DepFA
0087079c2d
allow overwrite old embedding 2022-10-20 00:10:59 +01:00
DepFA
166be3919b
allow overwrite old hn 2022-10-20 00:09:40 +01:00
DepFA
d6ea584137
change html output 2022-10-20 00:07:57 +01:00
random_thoughtss
c418467c03 Don't compute latent mask if were not using it. Also added support for fixed highres_fix generation. 2022-10-19 15:09:43 -07:00
random_thoughtss
dde9f96072 added support for ddim img2img 2022-10-19 14:14:24 -07:00
random_thoughtss
0719c10bf1 Fixed copying mistake 2022-10-19 13:56:26 -07:00
random_thoughtss
8e7097d06a Added support for RunwayML inpainting model 2022-10-19 13:47:45 -07:00
captin411
41e3877be2
fix entropy point calculation 2022-10-19 13:44:59 -07:00
DepFA
4d663055de
update ui with extra training options 2022-10-19 20:33:18 +01:00
DepFA
eb7ba4b713
update training header text 2022-10-19 19:50:46 +01:00
Mackerel
b748b583c0 generation_parameters_copypaste.py: fix indent 2022-10-19 21:30:32 +03:00
Vladimir Repin
46122c4ff6 Send empty prompts as valid generation parameter 2022-10-19 20:31:16 +03:00
timntorres
5e012e4dfa Infotext saves more specific hypernet name. 2022-10-19 20:20:25 +03:00
Alexandre Simard
1e4809b251 Added a bit of padding to the left 2022-10-19 20:06:41 +03:00
Alexandre Simard
57eb1a64c8 Update ui.py 2022-10-19 20:06:41 +03:00
discus0434
2ce52d32e4 fix for #3086 failing to load any previous hypernet 2022-10-19 16:31:12 +00:00
AUTOMATIC
c6e9fed500 fix for #3086 failing to load any previous hypernet 2022-10-19 19:21:16 +03:00
DepFA
019a3a88f0
Update ui.py 2022-10-19 17:15:47 +01:00
discus0434
365d4b1650
Merge branch 'AUTOMATIC1111:master' into master 2022-10-20 00:48:13 +09:00
AUTOMATIC1111
f510a2277e
Merge pull request #3086 from discus0434/master
Add settings for multi-layer structure hypernetworks
2022-10-19 18:40:53 +03:00
discus0434
3770b8d2fa enable to write layer structure of hn himself 2022-10-19 15:28:42 +00:00
discus0434
42fbda83bb layer options moves into create hnet ui 2022-10-19 14:30:33 +00:00
captin411
087609ee18
UI changes for focal point image cropping 2022-10-19 03:19:35 -07:00
captin411
abeec4b630
Add auto focal point cropping to Preprocess images
This algorithm plots a bunch of points of interest on the source
image and averages their locations to find a center.

Most points come from OpenCV.  One point comes from an
entropy model. OpenCV points account for 50% of the weight and the
entropy based point is the other 50%.

The center of all weighted points is calculated and a bounding box
is drawn as close to centered over that point as possible.
2022-10-19 03:18:26 -07:00
AUTOMATIC
f894dd552f fix for broken checkpoint merger 2022-10-19 12:45:42 +03:00
Ikko Ashimine
bb0e7232b3 Fix typo in prompt_parser.py
assoicated -> associated
2022-10-19 11:52:12 +03:00
MalumaDev
2362d5f00e
Merge branch 'master' into test_resolve_conflicts 2022-10-19 10:22:39 +02:00
AUTOMATIC1111
05315d8a23
Merge branch 'master' into hot-reload-javascript 2022-10-19 09:43:49 +03:00
Anastasius
1d4aa376e6 Predictable long operation check for time estimation 2022-10-19 09:39:28 +03:00
Anastasius
442dbedc15 Estimated time displayed if jobs take more 60 sec 2022-10-19 09:39:28 +03:00
Anastasius
bcfbb33e50 Added time left estimation 2022-10-19 09:39:28 +03:00
Cheka
2fd7935ef4 Remove wrong self reference in CUDA support for invokeai 2022-10-19 09:35:53 +03:00
discus0434
7f8670c4ef
Merge branch 'master' into master 2022-10-19 15:18:45 +09:00
Silent
da72becb13 Use training width/height when training hypernetworks. 2022-10-19 09:13:28 +03:00
discus0434
5d16f59794
Merge branch 'master' into master 2022-10-19 14:56:27 +09:00
AUTOMATIC
5daf9cbb98 Merge remote-tracking branch 'origin/api' 2022-10-19 08:44:51 +03:00
AUTOMATIC
10aca1ca3e more careful loading of model weights (eliminates some issues with checkpoints that have weird cond_stage_model layer names) 2022-10-19 08:42:22 +03:00
arcticfaded
0f0d6ab8e0 call sampler by name 2022-10-19 05:19:01 +00:00
yfszzx
538bc89c26 Image browser improved 2022-10-19 11:27:51 +08:00
arcticfaded
e7f4808505 provide sampler by name 2022-10-18 19:04:56 +00:00
discus0434
e40ba281f1 update 2022-10-19 01:03:58 +09:00
discus0434
7f2095c6c8 update 2022-10-19 01:01:22 +09:00
discus0434
a5611ea502 update 2022-10-19 01:00:01 +09:00
discus0434
6021f7a75f add options to custom hypernetwork layer structure 2022-10-19 00:51:36 +09:00
MalumaDev
c2765c9bcd
Merge branch 'master' into test_resolve_conflicts 2022-10-18 17:27:30 +02:00
AUTOMATIC
cbf15edbf9 remove dependence on TQDM for sampler progress/interrupt functionality 2022-10-18 17:23:38 +03:00
yfszzx
b7e78ef692 Image browser improve 2022-10-18 22:21:54 +08:00
AUTOMATIC
ec1924ee57 additional fix for difference model merging 2022-10-18 16:05:52 +03:00
AUTOMATIC
e20b7e30fe fix for add difference model merging 2022-10-18 15:33:32 +03:00
w-e-w
2f448d97a9 styles.csv encoding utf8 to utf-8-sig
utf-8-bom for better compatibility for some programs
2022-10-18 15:18:51 +03:00
AUTOMATIC
433a7525c1 remove shared option for update check (because it is not an argument of webui)
have launch.py examine both COMMANDLINE_ARGS as well as argv for its arguments
2022-10-18 15:18:02 +03:00
yfszzx
eb299527b1 Image browser 2022-10-18 20:14:11 +08:00
DepFA
4c605c5174 add shared option for update check 2022-10-18 15:10:09 +03:00
ふぁ
02622b1919 update scripts.py 2022-10-18 15:08:23 +03:00
ふぁ
3003438088 Add visible for dropdown 2022-10-18 15:08:23 +03:00
ふぁ
de29ec0743 Remove exception handling 2022-10-18 15:08:23 +03:00
ふぁ
97d3ba3941 Add scripts to ui-config,json 2022-10-18 15:08:23 +03:00
AUTOMATIC
d2f459c5cf clarify the comment for the new option from #2959 and move it to UI section. 2022-10-18 14:22:52 +03:00
trufty
8b02662215 Disable auto weights swap with config option 2022-10-18 14:19:06 +03:00
AUTOMATIC1111
cd9c6e0edf
Merge pull request #2984 from guaneec/D
Don't eat colons in booru tags
2022-10-18 14:18:05 +03:00
AUTOMATIC1111
f6c758d055
Merge branch 'master' into dark-mode 2022-10-18 14:04:17 +03:00
C43H66N12O12S2
c71008c741 Update sd_hijack_optimizations.py 2022-10-18 11:53:04 +03:00
C43H66N12O12S2
73b5dbf72a Update sd_hijack.py 2022-10-18 11:53:04 +03:00
C43H66N12O12S2
84823275e8 readd xformers attnblock 2022-10-18 11:53:04 +03:00
C43H66N12O12S2
2043c4a231 delete xformers attnblock 2022-10-18 11:53:04 +03:00
C43H66N12O12S2
786ed49922 use legacy attnblock 2022-10-18 11:53:04 +03:00
MalumaDev
1997ccff13
Merge branch 'master' into test_resolve_conflicts 2022-10-18 08:55:08 +02:00
arcticfaded
8d5d863a9d gradio and FastAPI 2022-10-18 06:51:53 +00:00
Mykeehu
7432b6f4d2 Fix typo "celem_id" to "elem_id" 2022-10-18 08:59:14 +03:00
Ryan Voots
1df3ff25e6 Add --nowebui as a means of disabling the webui and run on the other port 2022-10-18 08:44:50 +03:00
Ryan Voots
247aeb3aaa Put API under /sdapi/ so that routing is simpler in the future. This means that one could allow access to /sdapi/ but not the webui. 2022-10-18 08:44:50 +03:00
Ryan Voots
c3851a853d Re-use webui fastapi application rather than requiring one or the other, not both. 2022-10-18 08:44:50 +03:00
DepFA
d3338bdef1 extras extend cache key with new upscale to options 2022-10-18 08:29:52 +03:00
Jordan Hall
ab3f997c0c Fix typo in 'choices' when loading upscaler 2 config 2022-10-18 00:27:16 +03:00
arcticfaded
f29b16bad1 prevent API from saving 2022-10-17 20:36:14 +00:00
guaneec
2e28c841f4
Oops 2022-10-18 03:15:41 +08:00
arcticfaded
f80e914ac4 example API working with gradio 2022-10-17 19:10:36 +00:00
guaneec
d62ef76614
Don't eat colons in booru tags 2022-10-18 03:09:50 +08:00
AUTOMATIC
cf47d13c1e localization support 2022-10-17 21:15:32 +03:00
AUTOMATIC
695377a8b9 make modelmerger work with ui-config.json 2022-10-17 19:56:23 +03:00
Michoko
665beebc08 Use of a --theme argument for more flexibility
Added possibility to set the theme (light or dark)
2022-10-17 18:24:24 +02:00
yfszzx
2b5b62e768 fix two bug 2022-10-17 23:14:03 +08:00
yfszzx
2272cf2f35 fix two bug 2022-10-17 23:04:42 +08:00
yfszzx
c408a0b41c fix two bug 2022-10-17 22:28:43 +08:00
Michoko
8c6a981d5d Added dark mode switch
Launch the UI in dark mode with the --dark-mode switch
2022-10-17 11:05:05 +02:00
AUTOMATIC
d42125baf6 add missing requirement for api and fix some typos 2022-10-17 11:50:20 +03:00
Jonathan
71d42bb44b Update api.py 2022-10-17 11:34:22 +03:00
Jonathan
99013ba68a Update processing.py 2022-10-17 11:34:22 +03:00
Jonathan
832b490e51 Update processing.py 2022-10-17 11:34:22 +03:00
arcticfaded
9e02812afd pydantic instrumentation 2022-10-17 11:34:22 +03:00
arcticfaded
60251c9456 initial prototype by borrowing contracts 2022-10-17 11:34:22 +03:00
yfszzx
9d702b16f0 fix two little bug 2022-10-17 16:11:03 +08:00
yfszzx
2a3e7ed872 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-17 15:23:32 +08:00
yfszzx
5b1394bead speed up images history perfect 2022-10-17 15:20:16 +08:00
DepFA
62edfae257 print list of embeddings on reload 2022-10-17 08:42:17 +03:00
AUTOMATIC
b99d3cf6dd make CLIP interrogate ranks output sane values 2022-10-17 08:41:02 +03:00
AUTOMATIC
5c94aaf290 fix bug for latest model merge RAM improvement 2022-10-17 08:28:18 +03:00
DenkingOfficial
58f3ef7733 Fix CLIP Interrogator and disable ranks for it 2022-10-17 08:01:59 +03:00
AUTOMATIC
6f7b7a3dcd only read files with .py extension from the scripts dir 2022-10-17 07:56:23 +03:00
MrCheeze
0fd1307671 improve performance of 3-way merge on machines with not enough ram, by only accessing two of the models at a time 2022-10-17 07:54:36 +03:00
MalumaDev
589215df22
Merge branch 'master' into test_resolve_conflicts 2022-10-16 21:06:21 +02:00
SGKoishi
c8045c5ad4 The hide_ui_dir_config flag also restrict write attempt to path settings 2022-10-16 20:59:06 +03:00
MalumaDev
ae0fdad64a
Merge branch 'master' into test_resolve_conflicts 2022-10-16 17:55:58 +02:00
MalumaDev
9324cdaa31 ui fix, re organization of the code 2022-10-16 17:53:56 +02:00
yfszzx
a4de699e3c Images history speed up 2022-10-16 22:37:12 +08:00
DancingSnow
fc220a51cf fix dir_path in some path like D:/Pic/outputs 2022-10-16 16:40:04 +03:00
CookieHCl
adc0ea74e1 Better readablity of logs 2022-10-16 16:36:06 +03:00
CookieHCl
c9836279f5 Only make output dir when creating output 2022-10-16 16:36:06 +03:00
CookieHCl
91235d8008 Fix FileNotFoundError in history tab
Now only traverse images when directory exists
2022-10-16 16:36:06 +03:00
yfszzx
f62905fdf9 images history speed up 2022-10-16 21:22:38 +08:00
不会画画的中医不是好程序员
272d979d1c
Merge branch 'AUTOMATIC1111:master' into master 2022-10-16 21:16:08 +08:00
MalumaDev
e4f8b5f00d ui fix 2022-10-16 10:28:21 +02:00
MalumaDev
523140d780 ui fix 2022-10-16 10:23:30 +02:00
Junpeng Qiu
36a0ba357a Added Refresh Button to embedding and hypernetwork names in Train Tab
Problem
everytime I modified pt files in embedding_dir or hypernetwork_dir, I
need to restart webui to have the new files shown in the dropdown of
Train Tab

Solution
refactored create_refresh_button out of create_setting_component so we
can use this method to create button next to gr.Dropdowns of embedding
name and hypernetworks

Extra Modification
hypernetwork pt are now sorted in alphabetic order
2022-10-16 10:51:06 +03:00
CookieHCl
9258a33e37 Warn when user uses bad ui setting 2022-10-16 10:04:14 +03:00
CookieHCl
b65a3101ce Use default value when dropdown ui setting is bad
Default value is the first value of selectables.
Particually, None in styles.
2022-10-16 10:04:14 +03:00
CookieHCl
20bf99052a Make style configurable in ui-config.json 2022-10-16 10:04:14 +03:00
ddPn08
3395ba493f Allow specifying the region of ngrok. 2022-10-16 09:56:33 +03:00
AUTOMATIC
179e3ca752 honor --hide-ui-dir-config option for #2807 2022-10-16 09:51:01 +03:00
winterspringsummer
2ce27728f6 added extras batch work from directory 2022-10-16 09:47:31 +03:00
AUTOMATIC
0c5fa9a681 do not reload embeddings from disk when doing textual inversion 2022-10-16 09:09:04 +03:00
yfszzx
5d8c59eee5 Merge branch 'master' of https://github.com/yfszzx/stable-diffusion-webui-plus 2022-10-16 12:34:05 +08:00