OPENGIT/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-02-01 03:03:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,601 Commits 24 Branches 36 Tags 1.8 GiB
8b08b78c03
Commit Graph

4163 Commits

Author SHA1 Message Date
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
CodeHatchling
bb04d400c9 Rewrote latent_blend() to use in-place operations and to aggressively "del" references with the intention of minimizing allocations and easing garbage collection. 2023-12-02 21:08:26 -07:00
CodeHatchling
73ab982d1b Blend masks are now produced afterward, based on an estimate of the visual difference between the original and modified latent images. This should remove ghosting and clipping artifacts from masks, while preserving the details of largely unchanged content. 2023-12-02 21:07:02 -07:00
Kohaku-Blueleaf
9a15ae2a92 Merge branch 'dev' into test-fp8 2023-12-03 10:54:54 +08:00
CodeHatchling
609dea36ea Added utility functions related to processing masks. 2023-12-02 18:56:49 -07:00
catboxanon
9528d66c94 Re-add setting lost as part of e294e46 2023-12-02 14:56:26 -05:00
catboxanon
83e8c32276 Fix save_samples being checked early when saving masked composite 2023-12-02 13:30:53 -05:00
AUTOMATIC1111
ac02216e54 alternate implementation for unet forward replacement that does not depend on hijack being applied 2023-12-02 19:35:47 +03:00
AUTOMATIC1111
af5f0734c9
Merge pull request #14171 from Nuullll/ipex 
Initial IPEX support for Intel Arc GPU
 2023-12-02 19:22:32 +03:00
AUTOMATIC1111
a5f61aa8c5 potential fix for #14172 2023-12-02 18:03:34 +03:00
AUTOMATIC1111
11d23e8ca5 remove Train/Preprocessing tab and put all its functionality into extras batch images mode 2023-12-02 18:01:11 +03:00
Kohaku-Blueleaf
50a21cb09f Ensure the cached weight will not be affected 2023-12-02 22:06:47 +08:00
Nuullll
96871e4f74 Remove webui-ipex-user.bat 2023-12-02 17:11:31 +08:00
AUTOMATIC1111
4a666381bf extras tab batch: actually use original filename 
preprocessing upscale: do not do an extra upscale step if it's not needed
 2023-12-02 12:11:21 +03:00
Kohaku-Blueleaf
110485d5bb Merge branch 'dev' into test-fp8 2023-12-02 17:00:09 +08:00
Nuullll
87cd07b3af Fix fp64 2023-12-02 15:54:25 +08:00
AUTOMATIC1111
0bb6e00ba3
Merge pull request #13957 from h43lb1t0/extra_network_subdirs 
dir buttons start with / so only the correct dir will be shown and no…
 2023-12-02 09:59:29 +03:00
AUTOMATIC1111
87d973e389
Merge pull request #14063 from wfjsw/use-ext-name-for-installed 
use extension name for determining an extension is installed in the index
 2023-12-02 09:58:44 +03:00
AUTOMATIC1111
ef6b8123dc put code that can cause an exception into its own function for #14120 2023-12-02 09:57:39 +03:00
AUTOMATIC1111
5ed7daa3d9
Merge pull request #14120 from AUTOMATIC1111/protect-against-bad-ui-creation-scripts 
catch uncaught exception with ui creation scripts
 2023-12-02 09:54:21 +03:00
AUTOMATIC1111
ef1723ef41
Merge pull request #14125 from cjj1977/dev 
Allow use of mutiple styles csv files
 2023-12-02 09:53:27 +03:00
AUTOMATIC1111
88736b5557
Merge pull request #14131 from read-0nly/patch-1 
Update devices.py - Make 'use-cpu all' actually apply to 'all'
 2023-12-02 09:46:19 +03:00
AUTOMATIC1111
9eadc4f146
Merge pull request #14121 from AUTOMATIC1111/fix-Auto-focal-point-crop-for-opencv-4.8.x 
Fix auto focal point crop for opencv >= 4.8
 2023-12-02 09:46:00 +03:00
AUTOMATIC1111
97c8e7e0c7
Merge pull request #14119 from AUTOMATIC1111/add-Block-component-creation-callback 
add Block component creation callback
 2023-12-02 09:45:03 +03:00
AUTOMATIC1111
e12a26c253
Merge pull request #14046 from hidenorly/AddFP32FallbackSupportOnSdVaeApprox 
Add FP32 fallback support on sd_vae_approx
 2023-12-02 09:44:00 +03:00
AUTOMATIC1111
4125552752
Merge pull request #14170 from MrCheeze/sd-turbo 
Add support for SD 2.1 Turbo
 2023-12-02 09:30:07 +03:00
AUTOMATIC1111
e294e46d46 split UI settings page into many 2023-12-02 09:26:38 +03:00
Nuullll
7499148ad4 Disable ipex autocast due to its bad perf 2023-12-02 14:00:46 +08:00
AUTOMATIC1111
b58d061e41 infotext updates: add option to disregard certain infotext fields, add option to not include VAE in infotext, add explanation to infotext settings page, move some options to infotext settings page 2023-12-02 08:33:28 +03:00
MrCheeze
6080045b2a Add support for SD 2.1 Turbo, by converting the state dict from SGM to LDM on load 2023-12-01 22:58:05 -05:00
MrCheeze
293f44e6c1 Fix bug where is_using_v_parameterization_for_sd2 fails because the sd_hijack is only partially undone 2023-12-01 22:56:08 -05:00
Nuullll
8b40f475a3 Initial IPEX support 2023-11-30 20:22:46 +08:00
CodeHatchling
c7a1ff8720 Tweaked default values. 2023-11-28 23:31:10 -07:00
CodeHatchling
284fd8f415 Tweaked UI sliders and labels. 2023-11-28 23:03:50 -07:00
CodeHatchling
c5c7fa06aa Added slider for detail preservation strength, removed largely needless offset parameter, changed labels in UI and for saving to/pasting data from PNG files. 2023-11-28 22:35:07 -07:00
CodeHatchling
debf836fcc Added UI elements to control blending parameters. 2023-11-28 16:15:36 -07:00
CodeHatchling
a6e5846453 Nerfs the aggressive post-processing step of overlaying the original image. 2023-11-28 16:13:42 -07:00
CodeHatchling
e715e46b6a Implements "scheduling" for blending of the original latents and a latent blending formula that preserves details in blend transition areas. 2023-11-28 16:10:22 -07:00
CodeHatchling
bbba133f05 Removed conflicting step that replaces the softly inpainted latents with a naive blend with the original latents. 2023-11-28 15:09:43 -07:00
CodeHatchling
dec791d35d Removed code which forces the inpainting mask to be 0 or 1. Now fractional values (e.g. 0.5) are accepted. 2023-11-28 15:05:01 -07:00
hidenorly
81c00728b8 Fix the Ruff error about unused import 2023-11-29 04:59:35 +09:00
hidenorly
a0096c5897 Add FP32 fallback support on torch.nn.functional.interpolate 
This tries to execute interpolate with FP32 if it failed.

Background is that
on some environment such as Mx chip MacOS devices, we get error as follows:

```
"torch/nn/functional.py", line 3931, in interpolate
        return torch._C._nn.upsample_nearest2d(input, output_size, scale_factors)
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    RuntimeError: "upsample_nearest2d_channels_last" not implemented for 'Half'
```

In this case, ```--no-half``` doesn't help to solve. Therefore this commits add the FP32 fallback execution to solve it.

Note that the ```upsample_nearest2d``` is called from ```torch.nn.functional.interpolate```.
And the fallback for torch.nn.functional.interpolate is necessary at
```modules/sd_vae_approx.py``` 's ```VAEApprox.forward```
```repositories/stable-diffusion-stability-ai/ldm/modules/diffusionmodules/openaimodel.py``` 's ```Upsample.forward```
 2023-11-29 04:45:04 +09:00
hidenorly
39eae9f009 Revert "Add FP32 fallback support on sd_vae_approx" 
This reverts commit 58c19545c8.
Since the modification is expected to move to mac_specific.py
(https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/14046#issuecomment-1826731532)
 2023-11-29 04:07:48 +09:00
w-e-w
d608926f81 reformat file with uniform indentation 2023-11-28 12:12:27 +09:00
w-e-w
03ee297aa2 fix Auto focal point crop for opencv >= 4.8.x 
autocrop.download_and_cache_models
in opencv >= 4.8 the face detection model was updated
download the base on opencv version
returns the model path or raise exception
 2023-11-28 12:09:51 +09:00
obsol
3cd6e1d0a0
Update devices.py 
fixes issue where "--use-cpu" all properly makes SD run on CPU but leaves ControlNet (and other extensions, I presume) pointed at GPU, causing a crash in ControlNet caused by a mismatch between devices between SD and CN

https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/14097
 2023-11-27 19:21:43 -05:00
Charlie Joynt
26a0c29587 Allow use of mutiple styles csv files 
* https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/14122
Fix edge case where style text has multiple {prompt} placeholders
* https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/14005
 2023-11-27 12:08:51 +00:00
w-e-w
8a6e4bda21 catch uncaught exception with ui creation scripts 
prevent total webui crash
 2023-11-27 14:18:17 +09:00
w-e-w
b30cc87b78 add Block component creation callback 2023-11-27 13:15:17 +09:00
Jabasukuriputo Wang
1f6844eb7e
also consider extension url 2023-11-26 10:04:39 -06:00
AUTOMATIC1111
f0f100e67b add categories to settings 2023-11-26 17:56:22 +03:00
w-e-w
a15dd151ff json.dump(ensure_ascii=False) 
improve json readability
 2023-11-26 21:56:21 +09:00
AUTOMATIC1111
2a40d3c603 compact prompt layout: preserve scroll when switching between lora tabs 2023-11-26 14:58:56 +03:00
Kohaku-Blueleaf
3d341ebc7d Merge branch 'dev' into test-fp8 2023-11-26 17:32:52 +08:00
AUTOMATIC1111
29f04149b6 update torch to 2.1.0 2023-11-26 12:07:33 +03:00
AUTOMATIC1111
6955c210b7
Merge pull request #14059 from akx/upruff 
Update Ruff to 0.1.6
 2023-11-26 11:54:36 +03:00
AUTOMATIC1111
c5a0c59a83 do not save HTML explanations from options page to config 2023-11-26 11:36:17 +03:00
AUTOMATIC1111
f7f015e84b
Merge pull request #14084 from wfjsw/move-from-sysinfo-to-errors 
Move exception_records related methods to errors.py
 2023-11-26 11:29:27 +03:00
AUTOMATIC1111
f85b74763d Merge branch 'hypertile-in-sample' into dev 2023-11-26 11:18:49 +03:00
AUTOMATIC1111
fd8674a4bc
Merge pull request #13948 from aria1th/hypertile-in-sample 
support HyperTile optimization
 2023-11-26 11:18:25 +03:00
AUTOMATIC1111
d2e0c1ca13 rework hypertile into a built-in extension 2023-11-26 11:17:38 +03:00
AUTOMATIC1111
3a9bf4ac10 move file 2023-11-26 08:29:12 +03:00
Kohaku-Blueleaf
40ac134c55 Fix pre-fp8 2023-11-25 12:35:09 +08:00
Jabasukuriputo Wang
5cedc8f9b2
remove traceback in sysinfo 2023-11-24 11:30:30 -06:00
Jabasukuriputo Wang
86b99b1e98
Move exception_records related methods to errors.py 2023-11-24 11:28:54 -06:00
wfjsw
ac2a981c4f use extension name for determining an extension is installed in the index 2023-11-22 22:40:24 -06:00
Aarni Koskela
066afda2f6 Simplify restart_sampler (suggested by ruff) 2023-11-22 18:05:12 +02:00
Kohaku-Blueleaf
f5d719d1f1 Add forced reload for fp16 cache 2023-11-22 01:45:56 +08:00
Kohaku-Blueleaf
370a77f8e7 Option for using fp16 weight when apply lora 2023-11-21 19:59:34 +08:00
AUTOMATIC1111
8aa51f682c fix [Bug]: (Dev Branch) Placing "Dimensions" first in "ui_reorder_list" prevents start #14047 2023-11-21 08:32:07 +03:00
hidenorly
58c19545c8 Add FP32 fallback support on sd_vae_approx 
This tries to execute interpolate with FP32 if it failed.

Background is that
on some environment such as Mx chip MacOS devices, we get error as follows:

```
"torch/nn/functional.py", line 3931, in interpolate
        return torch._C._nn.upsample_nearest2d(input, output_size, scale_factors)
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    RuntimeError: "upsample_nearest2d_channels_last" not implemented for 'Half'
```

In this case, ```--no-half``` doesn't help to solve. Therefore this commits add the FP32 fallback execution to solve it.

Note that the submodule may require additional modifications. The following is the example modification on the other submodule.

```repositories/stable-diffusion-stability-ai/ldm/modules/diffusionmodules/openaimodel.py

class Upsample(nn.Module):
..snip..
    def forward(self, x):
        assert x.shape[1] == self.channels
        if self.dims == 3:
            x = F.interpolate(
                x, (x.shape[2], x.shape[3] * 2, x.shape[4] * 2), mode="nearest"
            )
        else:
            try:
                x = F.interpolate(x, scale_factor=2, mode="nearest")
            except:
                x = F.interpolate(x.to(th.float32), scale_factor=2, mode="nearest").to(x.dtype)
        if self.use_conv:
            x = self.conv(x)
        return x
..snip..
```

You can see the FP32 fallback execution as same as sd_vae_approx.py.
 2023-11-21 01:13:53 +09:00
Tom Haelbich
314ae1535e added option for default behavior of dir buttons 2023-11-20 16:19:54 +01:00
AUTOMATIC1111
5f36f6ab21
Merge pull request #14009 from AUTOMATIC1111/Option-to-show-batch-img2img-results-in-UI 
Option to show batch img2img results in UI
 2023-11-20 17:44:58 +03:00
AUTOMATIC1111
1463cea949 Merge branch 'dag' into dev 2023-11-20 14:50:01 +03:00
AUTOMATIC1111
73a0b4bba6
Merge pull request #13944 from wfjsw/dag 
implementing script metadata and DAG sorting mechanism
 2023-11-20 14:49:46 +03:00
AUTOMATIC1111
9b471436b2 rework extensions metadata: use custom sorter that doesn't mess the order as much and ignores cyclic errors, use classes with named fields instead of dictionaries, eliminate some duplicated code 2023-11-20 14:47:09 +03:00
w-e-w
6d337bf23d save sysinfo as .json 
GitHub now allows uploading of .json files in issues
 2023-11-20 01:38:31 +09:00
w-e-w
dea5e43c83 Option to show batch img2img results in UI 
shared.opts.img2img_batch_show_results_limit
limit the number of images return to the UI for batch img2img
default limit 32
0 no images are shown
-1 unlimited, all images are shown
 2023-11-19 17:37:32 +09:00
Kohaku-Blueleaf
043d2edcf6 Better naming 2023-11-19 15:56:31 +08:00
Kohaku-Blueleaf
f383af2729 update xformers/torch versions 2023-11-19 15:56:23 +08:00
Kohaku-Blueleaf
890181e1d4 Update the xformers/torch versions 2023-11-19 15:54:39 +08:00
Kohaku-Blueleaf
598da5cd49 Use options instead of cmd_args 2023-11-19 15:50:06 +08:00
Kohaku-Blueleaf
b60e1088db Merge branch 'dev' into test-fp8 2023-11-19 15:24:57 +08:00
wfjsw
bde439ef67 use metadata.ini for meta filename 2023-11-19 00:58:47 -06:00