Commit graph

1410 commits

Author SHA1 Message Date
AUTOMATIC1111
17a2076f72
Merge pull request #3928 from R-N/validate-before-load
Optimize training a little
2022-10-30 09:51:36 +03:00
AUTOMATIC1111
3dc9a43f7e
Merge pull request #3898 from R-N/lr-comma
Allow trailing comma in learning rate
2022-10-30 09:29:29 +03:00
AUTOMATIC
149784202c rework #3722 to not introduce duplicate code 2022-10-30 09:10:22 +03:00
AUTOMATIC1111
060ee5d3a7
Merge pull request #3722 from evshiron/feat/progress-api
prototype progress api
2022-10-30 09:02:01 +03: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
evshiron
9f4f894d74 allow skip current image in progress api 2022-10-30 06:03:32 +08:00
timntorres
66d038f6a4 Read hypernet strength from PNG info. 2022-10-29 15:00:08 -07:00
timntorres
e709afb0f7 Merge commit 'e7254746bbfbff45099db44a8d4d25dd6181877d' into 3825-save-hypernet-strength-to-info 2022-10-29 14:55:30 -07:00
evshiron
9f104b53c4 preview current image when opts.show_progress_every_n_steps is enabled 2022-10-30 05:19:17 +08:00
random_thoughtss
39f55c3c35 Re-add explicit device move 2022-10-29 14:13:02 -07:00
evshiron
88f46a5bec update progress response model 2022-10-30 05:04:29 +08:00
evshiron
e9c6c2a51f add description for state field 2022-10-30 04:02:56 +08:00
evshiron
f62db4d5c7 fix progress response model 2022-10-30 03:56:44 +08:00
evshiron
7f5212fb5f Merge branch 'master' into feat/progress-api 2022-10-30 03:49:00 +08:00
evshiron
6b719c49b1 Merge branch 'master' into feat/progress-api 2022-10-30 03:45:29 +08:00
AUTOMATIC1111
c328deb5f1
Merge pull request #3934 from bamarillo/api-add-png-info-endpoint
[API][Feature] Add png info endpoint
2022-10-29 22:20:50 +03:00
AUTOMATIC
9bb6b6509a add postprocess call for scripts 2022-10-29 22:20:02 +03:00
Bruno Seoane
83a1f44ae2 Fix space 2022-10-29 16:10:00 -03:00
Bruno Seoane
4609b83cd4 Add PNG Info endpoint 2022-10-29 16:09:19 -03:00
Muhammad Rizqi Nur
3d58510f21 Fix dataset still being loaded even when training will be skipped 2022-10-30 00:54:59 +07:00
Muhammad Rizqi Nur
a07f054c86 Add missing info on hypernetwork/embedding model log
Mentioned here: https://github.com/AUTOMATIC1111/stable-diffusion-webui/discussions/1528#discussioncomment-3991513

Also group the saving into one
2022-10-30 00:49:29 +07: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
Muhammad Rizqi Nur
ab05a74ead Revert "Add cleanup after training"
This reverts commit 3ce2bfdf95.
2022-10-30 00:32:02 +07:00
random_thoughtss
44ab954fab Fix latent upscale highres fix #3888 2022-10-29 10:02:56 -07:00
Martin Cairns
de1dc0d279 Add adjust_steps_if_invalid to find next valid step for ddim uniform sampler 2022-10-29 15:23:19 +01:00
Muhammad Rizqi Nur
a27d19de2e Additional assert on dataset 2022-10-29 19:44:05 +07:00
Muhammad Rizqi Nur
3ce2bfdf95 Add cleanup after training 2022-10-29 19:43:21 +07:00
Muhammad Rizqi Nur
ab27c111d0 Add input validations before loading dataset for training 2022-10-29 18:09:17 +07:00
Muhammad Rizqi Nur
ef4c94e1cf Improve lr schedule error message 2022-10-29 15:42:51 +07:00
Muhammad Rizqi Nur
a5f3adbdd7 Allow trailing comma in learning rate 2022-10-29 15:37:24 +07:00
AUTOMATIC
35c45df28b fix broken ↙ button, fix field paste ignoring most of useful fields for for #3768 2022-10-29 10:56:19 +03: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
AUTOMATIC
beb6fc2979 move send seed option to UI section and make it false by default 2022-10-29 09:57:22 +03:00
AUTOMATIC1111
9553a7e071
Merge pull request #3818 from jwatzman/master
Reduce peak memory usage when changing models
2022-10-29 09:16:00 +03:00
AUTOMATIC
28e6d4a54e add element ids for save buttons for #3798 2022-10-29 09:13:36 +03:00
AUTOMATIC1111
76086f6668
Merge branch 'master' into modal-save-button-and-shortcut 2022-10-29 09:11:00 +03:00
AUTOMATIC1111
f3454b8a6b
Merge pull request #3691 from xmodar/arabic
Revamped Arabic localization
2022-10-29 09:03:35 +03:00
AUTOMATIC
2922d8144f make existing image browser extension not break 2022-10-29 09:01:04 +03:00
AUTOMATIC
af547f63c3 Merge branch 'Inspiron' 2022-10-29 08:48:11 +03:00
AUTOMATIC
3c207ca684 add needed imports fr new code in copypaste.py 2022-10-29 08:42:34 +03:00
AUTOMATIC
a33d0a9a65 remove weird spaces added to ui.py over time 2022-10-29 08:28:48 +03:00
AUTOMATIC
2d220afb24 fix open folder button not working 2022-10-29 08:26:12 +03:00
AUTOMATIC
a1e5e0d766 skip filenames starting with . for img2img and extras batch modes 2022-10-29 08:11:03 +03:00
AUTOMATIC1111
cf8da8e1b0
Merge pull request #3826 from ANTONIOPSD/patch-1
Natural sorting for dropdown checkpoint list
2022-10-29 08:02:03 +03:00
AUTOMATIC1111
810e6a407d
Merge pull request #3858 from R-N/log-csv
Fix log off by 1 #3847
2022-10-29 07:55:20 +03:00
AUTOMATIC1111
3019452927
Merge pull request #3803 from FlameLaw/master
Fixed proper dataset shuffling
2022-10-29 07:52:51 +03:00
AUTOMATIC1111
86e19fe873
Merge pull request #3669 from random-thoughtss/master
Added option to use unmasked conditioning image for inpainting model.
2022-10-29 07:49:48 +03:00
AUTOMATIC1111
1fba573d24
Merge pull request #3874 from cobryan05/extra_tweak
Extras Tab - Option to upscale before face fix, caching improvements
2022-10-29 07:44:17 +03:00
AUTOMATIC
bce5adcd6d change default hypernet activation function to linear 2022-10-29 07:37:06 +03:00
AUTOMATIC1111
f3685281e2
Merge pull request #3877 from Yaiol/master
Filename tags are wrongly referencing to process size instead of image size
2022-10-29 07:32:11 +03:00
AUTOMATIC1111
d3b4b9d7ec
Merge pull request #3717 from benkyoujouzu/master
Add missing support for linear activation in hypernetwork
2022-10-29 07:30:14 +03:00
AUTOMATIC1111
fc89495df3
Merge pull request #3771 from aria1th/patch-12
Disable unavailable or duplicate options for Activation functions
2022-10-29 07:29:02 +03:00
Bruno Seoane
0edf100d83
Merge branch 'AUTOMATIC1111:master' into master 2022-10-28 22:03:49 -03:00
AngelBottomless
f361e804eb
Re enable linear 2022-10-29 08:36:50 +09:00
Yaiol
539c0f51e4 Update images.py
Filename tags [height] and [width] are wrongly referencing to process size instead of resulting image size. Making all upscale files named wrongly.
2022-10-29 01:07:01 +02:00
Chris OBryan
d8b3661467 extras: upscaler blending should not be considered in cache key 2022-10-28 16:55:02 -05:00
Chris OBryan
5732c0282d extras-tweaks: autoformat changed lines 2022-10-28 16:36:25 -05:00
Chris OBryan
1f1b327959 extras: Make image cache LRU
This changes the extras image cache into a Least-Recently-Used
cache. This allows more experimentation with different upscalers
without missing the cache.

Max cache size is increased to 5 and is cleared on source image
update.
2022-10-28 16:14:21 -05:00
Chris OBryan
bde4731f1d extras: Rework image cache
Bit of a refactor to the image cache to make it easier to extend.
Also takes into account the entire image instead of just a cropped portion.
2022-10-28 14:44:25 -05:00
Chris OBryan
26d0819384 extras: Add option to run upscaling before face fixing
Face restoration can look much better if ran after upscaling, as it
allows the restoration to fix upscaling artifacts. This patch adds
an option to choose which order to run upscaling/face fixing in.
2022-10-28 13:33:49 -05:00
Muhammad Rizqi Nur
9ceef81f77 Fix log off by 1 2022-10-28 20:48:08 +07:00
timntorres
db5a354c48 Always ignore "None.pt" in the hypernet directory. 2022-10-28 01:41:57 -07:00
timntorres
c0677b3316 Explicitly state when Hypernet is none. 2022-10-27 23:31:45 -07:00
timntorres
d4a069a23c Read hypernet strength from PNG info. 2022-10-27 23:16:27 -07:00
timntorres
9e465c8aa5 Add strength to textinfo. 2022-10-27 23:03:34 -07:00
benkyoujouzu
b2a8b263b2 Add missing support for linear activation in hypernetwork 2022-10-28 12:54:59 +08:00
Antonio
5d5dc64064
Natural sorting for dropdown checkpoint list
Example:

Before					After

11.ckpt					11.ckpt
ab.ckpt					ab.ckpt
ade_pablo_step_1000.ckpt	ade_pablo_step_500.ckpt			
ade_pablo_step_500.ckpt	ade_pablo_step_1000.ckpt	
ade_step_1000.ckpt		ade_step_500.ckpt
ade_step_1500.ckpt		ade_step_1000.ckpt
ade_step_2000.ckpt		ade_step_1500.ckpt
ade_step_2500.ckpt		ade_step_2000.ckpt
ade_step_3000.ckpt		ade_step_2500.ckpt
ade_step_500.ckpt			ade_step_3000.ckpt
atp_step_5500.ckpt			atp_step_5500.ckpt
model1.ckpt				model1.ckpt
model10.ckpt				model10.ckpt
model1000.ckpt			model33.ckpt
model33.ckpt				model50.ckpt
model400.ckpt			model400.ckpt
model50.ckpt				model1000.ckpt
moo44.ckpt				moo44.ckpt
v1-4-pruned-emaonly.ckpt	v1-4-pruned-emaonly.ckpt
v1-5-pruned-emaonly.ckpt	v1-5-pruned-emaonly.ckpt
v1-5-pruned.ckpt			v1-5-pruned.ckpt
v1-5-vae.ckpt				v1-5-vae.ckpt
2022-10-28 05:49:39 +02:00
Josh Watzman
b50ff4f4e4 Reduce peak memory usage when changing models
A few tweaks to reduce peak memory usage, the biggest being that if we
aren't using the checkpoint cache, we shouldn't duplicate the model
state dict just to immediately throw it away.

On my machine with 16GB of RAM, this change means I can typically change
models, whereas before it would typically OOM.
2022-10-27 22:01:06 +01:00
random_thoughtss
b68c7c437e Updated name and hover text. 2022-10-27 11:45:35 -07:00
random_thoughtss
a38496c1de Moved mask weight config to SD section 2022-10-27 11:31:31 -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
FlameLaw
a0a7024c67
Fix random dataset shuffle on TI 2022-10-28 02:13:48 +09:00
Florian Horn
268159cfe3 fixed indentation 2022-10-27 16:32:10 +02:00
Florian Horn
0995e879ce added save button and shortcut (s) to Modal View 2022-10-27 16:20:01 +02:00
yfszzx
e0cbf53f45 create send to buttons by extensions 2022-10-27 18:00:51 +08:00
AngelBottomless
462e6ba667
Disable unavailable or duplicate options 2022-10-27 15:40:24 +09:00
AngelBottomless
029d7c7543
Revert unresolved changes in Bias initialization
it should be zeros_ or parameterized in future properly.
2022-10-27 14:44:53 +09:00
guaneec
cc56df996e Fix dropout logic 2022-10-27 14:38:21 +09:00
AngelBottomless
85fcccc105 Squashed commit of fixing dropout silently
fix dropouts for future hypernetworks

add kwargs for Hypernetwork class

hypernet UI for gradio input

add recommended options

remove as options

revert adding options in ui
2022-10-27 14:38:21 +09:00
yfszzx
4a4647e0df create send to buttons in one module 2022-10-27 13:36:11 +08:00
xmodar
3de0365141 Add id access to scripts list in the css 2022-10-26 23:57:19 +03:00
MMaker
0dd8480281
fix: Correct before image saved callback 2022-10-26 11:08:44 -04:00
evshiron
fddb4883f4 prototype progress api 2022-10-26 22:39:08 +08:00
DepFA
737eb28fac typo: cmd_opts.embedding_dir to cmd_opts.embeddings_dir 2022-10-26 17:38:08 +03:00
Bruno Seoane
b2e0d8ba78 Remove folder endpoint 2022-10-26 09:54:26 -03:00
Bruno Seoane
8320963dcb Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui 2022-10-26 09:50:26 -03:00
Sihan Wang
7bd8581e46
Fix error caused by EXIF transpose when using custom scripts
Some custom scripts read image directly and no need to select image in UI, this will cause error.
2022-10-26 20:32:55 +08:00
AUTOMATIC
0cd7460253 add script callback for before image save and change callback for after image save to use a class with parameters 2022-10-26 13:12:44 +03:00
AUTOMATIC
1e428238db add override_settings to API as an alternative to #3629 2022-10-26 11:47:17 +03:00
guaneec
b6a8bb123b
Fix merge 2022-10-26 15:15:19 +08:00
timntorres
f4e1464217 Implement PR #3625 but for embeddings. 2022-10-26 10:14:35 +03:00
timntorres
4875a6c217 Implement PR #3309 but for embeddings. 2022-10-26 10:14:35 +03:00
timntorres
c2dc9bfa89 Implement PR #3189 but for embeddings. 2022-10-26 10:14:35 +03:00
timntorres
a524d137d0 patch bug (SeverianVoid's comment on 5245c7a) 2022-10-26 10:12:46 +03:00
timntorres
cb49800c08 img2img, use smartphone photos' EXIF orientation 2022-10-26 10:10:57 +03:00
guaneec
91bb35b1e6
Merge fix 2022-10-26 15:00:03 +08:00
guaneec
649d79a8ec
Merge branch 'master' into hn-activation 2022-10-26 14:58:04 +08:00
AUTOMATIC
9d82c351ac fix typo in on_save_imaged/on_image_saved; hope no extension is using it yet 2022-10-26 09:56:32 +03:00
w-e-w
757264c453 default_time_format if format is blank 2022-10-26 09:51:32 +03:00
guaneec
877d94f97c
Back compatibility 2022-10-26 14:50:58 +08:00
Milly
146856f66d images: allow nested bracket in filename pattern 2022-10-26 09:50:24 +03:00
Stephen
b46c64c6e5 clean 2022-10-26 09:46:17 +03:00
Stephen
db9ab1a46b [Bugfix][API] - Fix API response for colab users 2022-10-26 09:46:17 +03:00
AUTOMATIC
cbb857b675 enable creating embedding with --medvram 2022-10-26 09:44:02 +03:00
AUTOMATIC1111
ee73341f04
Merge pull request #3139 from captin411/focal-point-cropping
[Preprocess image] New option to auto crop based on complexity, edges, faces
2022-10-26 09:24:21 +03:00
AngelBottomless
7207e3bf49 remove duplicate keys and lowercase 2022-10-26 09:17:01 +03:00
AngelBottomless
de096d0ce7 Weight initialization and More activation func
add weight init

add weight init option in create_hypernetwork

fstringify hypernet info

save weight initialization info for further debugging

fill bias with zero for He/Xavier

initialize LayerNorm with Normal

fix loading weight_init
2022-10-26 09:17:01 +03:00
guaneec
c702d4d0df
Fix off-by-one 2022-10-26 13:43:04 +08:00
guaneec
2f4c91894d
Remove activation from final layer of HNs 2022-10-26 12:10:30 +08:00
captin411
df0c5ea29d update default weights 2022-10-25 17:06:59 -07:00
captin411
54f0c14824 download better face detection module dynamically 2022-10-25 16:14:13 -07:00
captin411
db8ed5fe5c Focal crop UI elements 2022-10-25 15:22:29 -07:00
captin411
6629446a2f Merge branch 'master' into focal-point-cropping 2022-10-25 13:22:27 -07:00
random_thoughtss
8b4f32779f Switch to a continous blend for cond. image. 2022-10-25 13:15:08 -07:00
captin411
3e6c2420c1 improve debug markers, fix algo weighting 2022-10-25 13:13:12 -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
不会画画的中医不是好程序员
4ff4730d82
Merge branch 'AUTOMATIC1111:master' into Inspiron 2022-10-25 19:09:38 +08:00
yfszzx
f300d0f2b4 Merge branch 'Inspiron' of https://github.com/yfszzx/stable-diffusion-webui-plus into Inspiron 2022-10-25 18:48:24 +08:00
yfszzx
9ba439b533 need some rights for extensions 2022-10-25 18:48:07 +08:00
AUTOMATIC
3e15f8e0f5 update callbacks code for #3549 2022-10-25 12:16:25 +03:00
不会画画的中医不是好程序员
5bfa2b23ca
Merge branch 'AUTOMATIC1111:master' into Inspiron 2022-10-25 15:38:33 +08:00
yfszzx
ff305acd51 some rights for extensions 2022-10-25 15:33:43 +08:00
w-e-w
91c1e1e6a9 fix default filename pattern 2022-10-25 09:44:54 +03:00
brkirch
faed465a0b MPS Upscalers Fix
Get ESRGAN, SCUNet, and SwinIR working correctly on MPS by ensuring memory is contiguous for tensor views before sending to MPS device.
2022-10-25 09:42:53 +03:00
brkirch
4c24347e45 Remove BSRGAN from --use-cpu, add SwinIR 2022-10-25 09:42:53 +03:00
AUTOMATIC1111
16416e42b5
Merge branch 'master' into on-image-saved-callback 2022-10-25 08:40:12 +03:00
AUTOMATIC
77a320f406 do not stop execution when script's callback misbehaves and report which script it was 2022-10-25 08:32:47 +03:00
ritosonn
b383702752 fix #3145 #3093 2022-10-25 08:32:33 +03:00
w-e-w
0c0028a9d3 UnknownTimeZoneError 2022-10-24 16:01:48 +03:00
yfszzx
cb9d2f8705 move to img component to public 2022-10-24 20:06:53 +08:00
Bruno Seoane
2267498a8c Merge remote-tracking branch 'upstream/master' 2022-10-24 08:37:37 -03:00
Bruno Seoane
595dca85af Reverse run_extras change
Update serialization on the batch images endpoint
2022-10-24 08:32:18 -03:00
AUTOMATIC
2c05e06ea7 rename api/processing to api/models for #3511 2022-10-24 14:11:14 +03:00
AUTOMATIC
8da1bd48bf add an option to skip adding number to filenames when saving.
rework filename pattern function go through the pattern once and not calculate any of replacements until they are actually encountered in the pattern.
2022-10-24 14:03:58 +03:00
yfszzx
994aaadf08 a strange bug 2022-10-24 16:44:36 +08:00
w-e-w
eb007e5884 use the same datetime object for [date] and [datetime] 2022-10-24 10:28:42 +03:00
w-e-w
5a981310e6 replace_datetime() can now accept a datetime parameter 2022-10-24 10:28:42 +03:00
w-e-w
8f6af4ed65 remove lowercasing file_decoration as it is not needed anymore 2022-10-24 10:28:42 +03:00
w-e-w
00952fb4a8 add sanitize_filename() to datetime 2022-10-24 10:28:42 +03:00
w-e-w
480d8e7646 replace "srt.replace()" in apply_filename_pattern() with equivalent re.sub()
the file_decoration passed into apply_filename_pattern() is formatted to lowercase to increase compatibility
the use of case sensitive srt.replace()

but because the newly implemented "time format" is case sensitive
the lowercasing the file_decoration will cause time format to be broken

in order to resolve this issue
I decided to replace every srt.replace() and in if "str" in x to regular expression (case insensitive) equivalent
2022-10-24 10:28:42 +03:00
w-e-w
37dd6deafb filename pattern [datetime], extended customizable Format and Time Zone
format:
[datetime]
[datetime<Format>]
[datetime<Format><Time Zone>]
2022-10-24 10:28:42 +03:00
w-e-w
7d4a4db9ea modify unnecessary sting assignment as it's going to get overwritten 2022-10-24 10:28:42 +03:00
w-e-w
c5d90628a4 move "file_decoration" initialize section
into "if forced_filename is None:"
no need to initialize it if it's not going to be used
2022-10-24 10:28:42 +03:00
w-e-w
3be6b29d81 indent=4 config.json 2022-10-24 10:22:48 +03:00
AUTOMATIC
876a96f0f9 remove erroneous dir in the extension directory
remove loading .js files from scripts dir (they go into javascript)
load scripts after models, for scripts that depend on loaded models
2022-10-24 09:39:46 +03:00