Commit Graph

1127 Commits

Author SHA1 Message Date
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
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
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
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
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