Kohaku-Blueleaf
0fb34b57b8
Merge branch 'dev' into test-fp8
2023-12-14 16:54:45 +08:00
AUTOMATIC1111
96c393a7a7
Merge pull request #14269 from kaalibro/skip-interrupt-keyb-shortcuts
...
Add keyboard shortcuts for generate/skip/interrupt
2023-12-14 10:04:17 +03:00
AUTOMATIC1111
09013b357c
Merge pull request #14216 from wfjsw/state-dict-ref-comparison
...
change state dict comparison to ref compare
2023-12-14 10:03:14 +03:00
AUTOMATIC1111
d45f790f58
Merge pull request #14230 from AUTOMATIC1111/add-option-Live-preview-in-full-page-image-viewer
...
add option: Live preview in full page image viewer
2023-12-14 09:59:48 +03:00
AUTOMATIC1111
8c32594d3b
Merge pull request #14208 from CodeHatchling/soft-inpainting
...
Soft Inpainting
2023-12-14 09:56:12 +03:00
AUTOMATIC1111
f3cc5f8382
Merge pull request #14229 from Nuullll/ipex-embedding
...
[IPEX] Fix embedding and ControlNet
2023-12-14 09:52:23 +03:00
AUTOMATIC1111
28bafffdc2
Merge pull request #14266 from kaalibro/dev
...
Re-add setting lost as part of e294e46
2023-12-14 09:48:36 +03:00
kaalibro
1d42babd32
Replace Ctrl+Alt+Enter with Esc
2023-12-10 16:28:56 +06:00
w-e-w
8b74389e76
fix styles.csv filename
2023-12-10 15:48:16 +09:00
w-e-w
23a0e60b9b
fix save styles
2023-12-10 15:48:00 +09:00
kaalibro
9c201550dd
Add keyboard shortcuts for generation
...
(Removed Alt+Enter) Ctrl+Enter to start/restart generation
(New) Alt/Option+Enter to skip generation
(New) Ctrl+Alt/Option+Enter to interrupt generation
2023-12-09 21:04:45 +06:00
kaalibro
39ec4cfea9
Re-add setting lost as part of e294e46
2023-12-09 19:12:59 +06:00
Nuullll
049d5642e5
Fix format
2023-12-09 18:11:26 +08:00
Nuullll
5942979344
Fix ControlNet
2023-12-09 18:09:45 +08:00
CodeHatchling
0ef4a4cb23
Fixed error that occurs when using vanilla samplers (somehow).
2023-12-07 14:54:26 -07:00
CodeHatchling
56604f08a1
Moved image filters used by soft inpainting into soft_inpainting.py from images.py
2023-12-07 14:53:44 -07:00
CodeHatchling
2abc417834
Re-implemented soft inpainting via a script. Also fixed some mistakes with the previous hooks, removed unnecessary formatting changes, removed code that I had forgotten to.
2023-12-07 14:28:02 -07:00
CodeHatchling
ac45789123
Removed soft inpainting, added hooks for softpainting to work instead.
2023-12-06 21:16:27 -07:00
CodeHatchling
4608f6236f
Removed changes in some scripts since the arguments for soft painting are no longer passed through the same path as "mask_blur".
2023-12-06 18:11:17 -07:00
CodeHatchling
e90d4334ad
A custom blending function can be provided by p, replacing the use of soft_inpainting.
2023-12-06 18:02:07 -07:00
w-e-w
9d2cbf8e97
add option: Live preview in full page image viewer
...
make #13459 "show the preview image in the modal view if available" optional
2023-12-06 23:06:32 +09:00
Nuullll
746783f7a4
[IPEX] Fix embedding
...
Cast `torch.bmm` args into same `dtype`.
Fixes the following error when using Text Inversion embedding (#14224 ):
```
RuntimeError: could not create a primitive descriptor for a matmul
primitive
```
2023-12-06 20:55:47 +08:00
Kohaku-Blueleaf
294ec5ac37
Merge branch 'dev' into test-fp8
2023-12-06 15:16:49 +08:00
Kohaku-Blueleaf
672dc4efa8
Fix forced reload
2023-12-06 15:16:10 +08:00
Jabasukuriputo Wang
895456c4a2
change state dict comparison to ref compare
2023-12-05 18:00:48 -06:00
CodeHatchling
38864816fa
Merge remote-tracking branch 'origin2/dev' into soft-inpainting
...
# Conflicts:
# modules/processing.py
2023-12-04 20:38:13 -07:00
CodeHatchling
49bbf11407
Fixed unused import.
2023-12-04 19:47:40 -07:00
CodeHatchling
6fc12428e3
Fixed issue where batched inpainting (batch size > 1) wouldn't work because of mismatched tensor sizes. The 'already_decoded' decoded case should also be handled correctly (tested indirectly).
2023-12-04 19:42:59 -07:00
CodeHatchling
b32a334e3d
Applies a convert('RGBA') operation early to mimic previous behaviour.
2023-12-04 17:57:10 -07:00
CodeHatchling
60c602232f
Restored original formatting.
2023-12-04 17:55:14 -07:00
CodeHatchling
57f29bd61d
Re-introduce latent blending step from the vanilla inpainting procedure.
2023-12-04 17:41:18 -07:00
CodeHatchling
1455159cf4
Fixed issue with whitespace, removed commented out code that was meant to be used as a reference.
2023-12-04 16:43:57 -07:00
CodeHatchling
976c1053ef
Cleaned up code, moved main code contributions into soft_inpainting.py
2023-12-04 16:06:58 -07:00
w-e-w
854f8c318c
remove clean_text()
2023-12-05 04:41:09 +09:00
AUTOMATIC1111
883d6a2b34
repair old handler for postprocessing API in a way that doesn't break interface
2023-12-04 13:11:00 +03:00
AUTOMATIC1111
15322e1b1a
repair old handler for postprocessing API
2023-12-04 12:36:41 +03:00
CodeHatchling
259d33c3c8
Enables the original functionality to be toggled on and off.
2023-12-04 01:57:21 -07:00
Kohaku-Blueleaf
f5f89780cc
Merge branch 'dev' into test-fp8
2023-12-04 16:47:41 +08:00
CodeHatchling
aaacf48232
Organized the settings and UI of soft inpainting to allow for toggling the feature, and centralizes default values to reduce the amount of copy-pasta.
2023-12-04 01:27:22 -07:00
AUTOMATIC1111
9e1f3feb12
make webui not crash when running with --disable-all-extensions option
2023-12-04 09:15:19 +03:00
AUTOMATIC1111
208760f348
Merge pull request #14192 from illtellyoulater/patch-1
...
Update launch_utils.py - fixes repetead package reinstalls
2023-12-04 08:14:40 +03:00
missionfloyd
06725af40b
Lint
2023-12-03 21:26:12 -07:00
illtellyoulater
639ccf254b
Update launch_utils.py to fix wrong dep. checks and reinstalls
...
Fixes failing dependency checks for extensions having a different package name and import name (for example ffmpeg-python / ffmpeg), which currently is causing the unneeded reinstall of packages at runtime.
In fact with current code, the same string is used when installing a package and when checking for its presence, as you can see in the following example:
> launch_utils.run_pip("install ffmpeg-python", "required package")
[ Installing required package: "ffmpeg-python" ... ]
[ Installed ]
> launch_utils.is_installed("ffmpeg-python")
False
... which would actually return true with:
> launch_utils.is_installed("ffmpeg")
True
2023-12-04 02:35:35 +00:00
CodeHatchling
552f8bc832
"Uncrop" the original denoised image for the composite step, fixing a "ValueError: Images do not match" *shudder*
2023-12-03 14:49:41 -07:00
CodeHatchling
28a2b5b4aa
Fixed a math mistake.
2023-12-03 14:20:20 -07:00
AUTOMATIC1111
334298d473
Merge pull request #14186 from akx/torchvision-basicsr-hack
...
Add import_hook hack to work around basicsr/torchvision incompatibility
2023-12-03 19:58:53 +03:00
Aarni Koskela
d92ce145bb
Add import_hook hack to work around basicsr incompatibility
...
Fixes #13985
2023-12-03 16:55:38 +02:00
w-e-w
d3fdc4af61
rework mask and mask_composite logic
2023-12-03 18:22:41 +09:00
AUTOMATIC1111
b4776ea3a2
Merge pull request #14177 from catboxanon/fix/mask-composite-save
...
Fix `save_samples` being checked early when saving masked composite
2023-12-03 11:57:14 +03:00
CodeHatchling
3bd3a09160
Merge remote-tracking branch 'origin/dev' into soft-inpainting
...
# Conflicts:
# modules/processing.py
2023-12-02 21:14:02 -07:00
