Commit Graph

108 Commits

Author SHA1 Message Date
Weiming 95cb492e41 Fixed: #10460 2023-05-17 22:35:59 +08:00
Aarni Koskela 49a55b410b Autofix Ruff W (not W605) (mostly whitespace) 2023-05-11 20:29:11 +03:00
AUTOMATIC 762265eab5 autofixes from ruff 2023-05-10 07:52:45 +03:00
space-nuko fbaf6e4fd8 Namespace metadata fields 2023-04-02 21:41:23 -05:00
space-nuko 7c016dd642 Calculate shorthash on merge if not exist 2023-04-02 19:06:39 -05:00
space-nuko afc349c2c0 Add field for model merge type
Incase this is supported by other merge extensions
2023-04-02 18:40:33 -05:00
space-nuko d132481058 Embed model merge metadata in .safetensors file 2023-04-02 17:41:55 -05:00
AUTOMATIC1111 bea31e849a
Merge pull request #7240 from Unstackd/master
Allow users to convert models to Instruct-pix2pix models by supporting merging Instruct-pix2pix models with regular ones in the merge tab
2023-01-28 10:52:28 +03:00
AUTOMATIC cc8c9b7474 fix broken calls to find_checkpoint_config 2023-01-27 22:43:08 +03:00
ULTRANOX\Chris cdc2fa209a Changed filename addition from "instrpix2pix" to the more readable ".instruct-pix2pix" for newly generated instruct pix2pix models. 2023-01-26 11:27:07 -05:00
ULTRANOX\Chris 9e72dc7434 Changed all references to "pix2pix" to the more precise name "instruct pix2pix". Also changed extension to instrpix2pix at least for now. 2023-01-26 06:05:40 -05:00
ULTRANOX\Chris f90798c6b6 Added error check for the rare case a user merges a pix2pix model with a normal model using weighted sum. Also removed bad print message that interfered with merging progress bar. 2023-01-26 04:38:04 -05:00
ULTRANOX\Chris f4ec411f2c Allow checkpoint merger to merge pix2pix models in the same way that it currently supports inpainting models. 2023-01-26 03:45:16 -05:00
AUTOMATIC 41265a026d third time's the charm 2023-01-23 14:50:20 +03:00
AUTOMATIC 68303c96e5 split oversize extras.py to postprocessing.py 2023-01-22 15:38:39 +03:00
Andrey c56b367122 Split history extras.py to postprocessing.py 2023-01-22 15:26:41 +03:00
Andrey b238b14ee4 Split history extras.py to postprocessing.py 2023-01-22 15:26:40 +03:00
AUTOMATIC 112416d041 add option to discard weights in checkpoint merger UI 2023-01-22 10:17:12 +03:00
EllangoK f2ae252987 fixes minor typos around run_modelmerger 2023-01-19 10:24:17 -05:00
AUTOMATIC 54674674b8 allow having at half precision when there is only one checkpoint in merger tab 2023-01-19 12:12:09 +03:00
AUTOMATIC 0f5dbfffd0 allow baking in VAE in checkpoint merger tab
do not save config if it's the default for checkpoint merger tab
change file naming scheme for checkpoint merger tab
allow just saving A without any merging for checkpoint merger tab
some stylistic changes for UI in checkpoint merger tab
2023-01-19 10:39:51 +03:00
AUTOMATIC c7e50425f6 add progress bar to modelmerger 2023-01-19 09:25:37 +03:00
AUTOMATIC 7cfc645030 eliminate repetition of code in #6910 2023-01-19 08:53:50 +03:00
EllangoK 26a6a78b16 only lookup tertiary model if theta_func1 is set 2023-01-18 21:21:52 -05:00
EllangoK 99207bc816 check model name values are set before merging 2023-01-18 19:13:15 -05:00
bbc_mc 5f8685237e Exclude clip index from merge 2023-01-14 20:09:32 +09:00
AUTOMATIC 954091697f add an option to copy config from one of models in checkpoint merger 2023-01-11 09:10:07 +03:00
Vladimir Mandic 79c682ad4f
fix jpeg 2023-01-04 08:20:42 -05:00
Vladimir Mandic 192ddc04d6
add job info to modules 2023-01-03 10:34:51 -05:00
Vladimir Mandic 1d9dc48efd
init job and add info to model merge 2023-01-03 10:21:51 -05:00
AUTOMATIC 84dd7e8e24 error out with a readable message in chwewckpoint merger for incompatible tensor shapes (ie when trying to merge SD1.5 with SD2.0) 2023-01-02 20:30:02 +03:00
Philpax 6247f21a63 fix(api): don't save extras output to disk 2022-12-24 22:04:53 +11:00
AUTOMATIC1111 ee65237d69
Merge pull request #5747 from yuvalabou/singleton-comparison
Format singleton comparisons
2022-12-24 10:17:38 +03:00
AUTOMATIC1111 55f3ef876b
Merge pull request #5814 from timntorres/5802-save-upscaler-to-filename
Add option to save upscaler to filename suffix in extras tab.
2022-12-24 09:07:00 +03:00
timntorres a7a039d53a Add option to include upscaler name in filename. 2022-12-17 08:50:20 -08:00
timntorres a26fe85056 Add upscaler name as a suffix. 2022-12-17 05:11:06 -08:00
Yuval Aboulafia 957e15c464 Correct singleton comparisons 2022-12-14 20:59:33 +02:00
Mackerel 681c450ecd extras.py: use as little RAM as possible, misc fixes
maximum of 2 models loaded at once. delete unneeded model before next
step. fix 'teritary' -> 'tertiary'. gracefully fail when "add
difference" is selected without a tertiary model
2022-12-04 10:31:06 -05:00
AUTOMATIC 44c46f0ed3 make it possible to merge inpainting model with non-inpainting one 2022-12-04 12:30:44 +03:00
AUTOMATIC 506d529d19 rework #5012 to also work for pictures dragged into the prompt and also add Clip skip + ENSD to parameters 2022-11-27 16:28:32 +03:00
AUTOMATIC1111 488f831d52
Merge pull request #5012 from Nandaka/master
Support NAI style exif in PNG Info for Send... buttons
2022-11-27 15:57:50 +03:00
AUTOMATIC dac9b6f15d add safetensors support for model merging #4869 2022-11-27 15:51:29 +03:00
Nandaka 904121fecc Support NAI exif for PNG Info 2022-11-24 02:39:09 +00:00
Chris OBryan 313e14de04 extras - skip unnecessary second hash of image
There is no need to re-hash the input image each iteration of the loop.
This also reverts PR #4026 as it was determined the cache hits it avoids
were actually valid.
2022-11-02 21:37:43 -05:00
DepFA 29f758afe9
Extend extras image cache with upscale_first arg 2022-10-31 02:39:55 +00:00
AUTOMATIC a1e5e0d766 skip filenames starting with . for img2img and extras batch modes 2022-10-29 08:11:03 +03: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