Commit Graph

1553 Commits

Author SHA1 Message Date
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
Roy Shilkrot
bdc9083798 Add a barebones interrogate API 2022-10-27 15:20:15 -04: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
AUTOMATIC1111
999929bea4
Merge pull request #3537 from yfszzx/Inspiron
Move out images browser from project
2022-10-24 09:28:37 +03:00
Trung Ngo
734986dde3 add callback after image is saved 2022-10-24 01:25:31 -05:00
AUTOMATIC
6cbb04f7a5 fix #3517 breaking txt2img 2022-10-24 09:15:26 +03:00
不会画画的中医不是好程序员
68931242cf
Merge branch 'AUTOMATIC1111:master' into Inspiron 2022-10-24 14:09:27 +08:00
AngelBottomless
e9a410b535 check length for variance 2022-10-24 09:07:39 +03:00
AngelBottomless
0d2e1dac40 convert deque -> list
I don't feel this being efficient
2022-10-24 09:07:39 +03:00
AngelBottomless
348f89c8d4 statistics for pbar 2022-10-24 09:07:39 +03:00
AngelBottomless
40b56c9289 cleanup some code 2022-10-24 09:07:39 +03:00
AngelBottomless
b297cc3324 Hypernetworks - fix KeyError in statistics caching
Statistics logging has changed to {filename : list[losses]}, so it has to use loss_info[key].pop()
2022-10-24 09:07:39 +03:00
Vladimir Repin
f2cc3f32d5 fix whitespaces 2022-10-24 08:58:56 +03:00
Vladimir Repin
9741969325 Save properly processed image before color correction 2022-10-24 08:58:56 +03:00
yfszzx
a889c93f23 paste_fields add to public 2022-10-24 11:13:16 +08:00
yfszzx
cef1b89aa2 remove browser to extension 2022-10-24 10:10:33 +08:00
yfszzx
124e44cf1e remove browser to extension 2022-10-24 09:51:56 +08:00
Bruno Seoane
90f02c7522 Remove unused field and class 2022-10-23 16:05:54 -03:00
Bruno Seoane
1e625624ba Add folder processing endpoint
Also minor refactor
2022-10-23 16:01:16 -03:00
Bruno Seoane
866b36d705 Move processing's models into models.py
It didn't make sense to have two differente files for the same and
"models" is a more descriptive name.
2022-10-23 15:35:49 -03:00
Bruno Seoane
e0ca4dfbc1 Update endpoints to use gradio's own utils functions 2022-10-23 15:13:37 -03:00
Bruno Seoane
e3f0e34cd6 Merge branch 'master' of https://github.com/bamarillo/stable-diffusion-webui 2022-10-23 13:14:54 -03:00
Bruno Seoane
4ff852ffb5 Add batch processing "extras" endpoint 2022-10-23 13:07:59 -03:00
Bruno Seoane
0523704dad Update run_extras to use the temp filename
In batch mode run_extras tries to preserve the original file name of the
images. The problem is that this makes no sense since the user only gets
a list of images in the UI, trying to manually save them shows that this
images have random temp names. Also, trying to keep "orig_name" in the
API is a hassle that adds complexity to the consuming UI since the
client has to use (or emulate) an input (type=file) element in a form.
Using the normal file name not only doesn't change the output and
functionality in the original UI but also helps keep the API simple.
2022-10-23 12:27:50 -03:00
captin411
1be5933ba2
auto cropping now works with non square crops 2022-10-23 04:11:07 -07:00
AUTOMATIC1111
6bd6154a92
Merge pull request #2067 from victorca25/esrgan_mod
update ESRGAN architecture and model to support all ESRGAN models
2022-10-23 13:43:41 +03:00
yfszzx
6a9ea40d7f Move browser and Inspiration into extension 2022-10-23 16:17:37 +08:00
Stephen
5dc0739ecd working mask 2022-10-23 09:26:56 +03:00
Stephen
9e1a8b7734 non-implemented mask with any type 2022-10-23 09:26:56 +03:00
Stephen
a7c213d0f5 [API][Feature] - Add img2img API endpoint 2022-10-23 09:26:56 +03:00
DepFA
1fbfc052eb Update hypernetwork.py 2022-10-23 08:34:33 +03:00
Bruno Seoane
28e26c2bef Add "extra" single image operation
- Separate extra modes into 3 endpoints so the user ddoesn't ahve to
handle so many unused parameters.
 - Add response model for codumentation
2022-10-22 23:17:27 -03:00
Bruno Seoane
b02926df13 Moved moodels to their own file and extracted base64 conversion to its own function 2022-10-22 20:24:04 -03:00
Bruno Seoane
1b4d04737a Remove unused imports 2022-10-22 20:13:16 -03:00
AngelBottomless
48dbf99e84 Allow tracking real-time loss
Someone had 6000 images in their dataset, and it was shown as 0, which was confusing.
This will allow tracking real time dataset-average loss for registered objects.
2022-10-22 22:24:19 +03:00
AUTOMATIC
ca5a9e79dc fix for img2img color correction in a batch #3218 2022-10-22 22:06:54 +03:00
AUTOMATIC
be748e8b08 add --freeze-settings commandline argument to disable changing settings 2022-10-22 22:05:22 +03:00
AUTOMATIC
d213d6ca6f removed the option to use 2x more memory when generating previews
added an option to always only show one image in previews
removed duplicate code
2022-10-22 20:48:13 +03:00
Unnoen
4fdb53c1e9 Generate grid preview for progress image 2022-10-22 20:36:04 +03:00
AngelBottomless
24694e5983 Update hypernetwork.py 2022-10-22 20:25:32 +03:00
AUTOMATIC
321bacc6a9 call model_loaded_callback after setting shared.sd_model in case scripts refer to it using that 2022-10-22 20:15:12 +03:00
MrCheeze
0df94d3fcf fix aesthetic gradients doing nothing after loading a different model 2022-10-22 20:14:18 +03:00
AUTOMATIC
324c7c732d record First pass size as 0x0 for #3328 2022-10-22 20:09:51 +03:00
AUTOMATIC1111
ffea9b1509
Merge pull request #3414 from discus0434/master
[Hypernetworks] Add a feature to use dropout / more activation functions
2022-10-22 19:32:13 +03:00
Greendayle
e38625011c fix part2 2022-10-22 19:27:16 +03:00
Greendayle
72383abacd Deepdanbooru linux fix 2022-10-22 19:27:16 +03:00
AUTOMATIC
dbc8ab65f6 typo 2022-10-22 19:19:17 +03:00
AUTOMATIC
d37cfffd53 added callback for creating new settings in extensions 2022-10-22 19:18:56 +03:00
discus0434
6a4fa73a38 small fix 2022-10-22 13:44:39 +00:00
discus0434
97749b7c7d
Merge branch 'AUTOMATIC1111:master' into master 2022-10-22 22:00:59 +09:00
discus0434
7912acef72 small fix 2022-10-22 13:00:44 +00:00
discus0434
fccba4729d add an option to avoid dying relu 2022-10-22 12:02:41 +00:00
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