Commit Graph

1297 Commits

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