aboutsummaryrefslogtreecommitdiffstats
path: root/modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14203 from AUTOMATIC1111/remove-clean_text()AUTOMATIC11112023-12-051-20/+3
| | | remove clean_text()
* repair old handler for postprocessing API in a way that doesn't break interfaceAUTOMATIC11112023-12-042-3/+7
|
* repair old handler for postprocessing APIAUTOMATIC11112023-12-041-1/+1
|
* make webui not crash when running with --disable-all-extensions optionAUTOMATIC11112023-12-041-1/+6
|
* Merge pull request #14192 from illtellyoulater/patch-1AUTOMATIC11112023-12-041-4/+10
|\ | | | | Update launch_utils.py - fixes repetead package reinstalls
| * Lintmissionfloyd2023-12-041-3/+3
| |
| * Update launch_utils.py to fix wrong dep. checks and reinstallsilltellyoulater2023-12-041-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #14186 from akx/torchvision-basicsr-hackAUTOMATIC11112023-12-031-0/+11
|\ \ | | | | | | Add import_hook hack to work around basicsr/torchvision incompatibility
| * | Add import_hook hack to work around basicsr incompatibilityAarni Koskela2023-12-031-0/+11
| | | | | | | | | | | | Fixes #13985
* | | rework mask and mask_composite logicw-e-w2023-12-031-15/+14
|/ /
* | Merge pull request #14177 from catboxanon/fix/mask-composite-saveAUTOMATIC11112023-12-031-3/+3
|\ \ | | | | | | Fix `save_samples` being checked early when saving masked composite
| * | Fix `save_samples` being checked early when saving masked compositecatboxanon2023-12-021-3/+3
| | |
* | | Re-add setting lost as part of e294e46catboxanon2023-12-021-0/+1
|/ /
* | alternate implementation for unet forward replacement that does not depend ↵AUTOMATIC11112023-12-022-8/+13
| | | | | | | | on hijack being applied
* | Merge pull request #14171 from Nuullll/ipexAUTOMATIC11112023-12-025-2/+88
|\ \ | | | | | | Initial IPEX support for Intel Arc GPU
| * | Remove webui-ipex-user.batNuullll2023-12-021-0/+22
| | |
| * | Fix fp64Nuullll2023-12-022-3/+3
| | |
| * | Disable ipex autocast due to its bad perfNuullll2023-12-023-17/+32
| | |
| * | Initial IPEX supportNuullll2023-11-302-2/+51
| | |
* | | potential fix for #14172AUTOMATIC11112023-12-021-8/+4
| | |
* | | remove Train/Preprocessing tab and put all its functionality into extras ↵AUTOMATIC11112023-12-0210-399/+166
| | | | | | | | | | | | batch images mode
* | | extras tab batch: actually use original filenameAUTOMATIC11112023-12-022-4/+6
| | | | | | | | | | | | preprocessing upscale: do not do an extra upscale step if it's not needed
* | | Merge pull request #13957 from h43lb1t0/extra_network_subdirsAUTOMATIC11112023-12-022-2/+8
|\ \ \ | | | | | | | | dir buttons start with / so only the correct dir will be shown and no…
| * | | added option for default behavior of dir buttonsTom Haelbich2023-11-202-2/+8
| | | |
| * | | Lintmissionfloyd2023-11-131-1/+0
| | | |
| * | | dir buttons start with / so only the correct dir will be shown and not dirs ↵Tom Haelbich2023-11-121-2/+3
| | |/ | |/| | | | | | | with a substrings as name from the dir
* | | Merge pull request #14063 from wfjsw/use-ext-name-for-installedAUTOMATIC11112023-12-021-6/+9
|\ \ \ | | | | | | | | use extension name for determining an extension is installed in the index
| * | | also consider extension urlJabasukuriputo Wang2023-11-261-1/+2
| | | |
| * | | use extension name for determining an extension is installed in the indexwfjsw2023-11-231-6/+8
| | | |
* | | | put code that can cause an exception into its own function for #14120AUTOMATIC11112023-12-021-29/+33
| | | |
* | | | Merge pull request #14120 from ↵AUTOMATIC11112023-12-021-25/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | AUTOMATIC1111/protect-against-bad-ui-creation-scripts catch uncaught exception with ui creation scripts
| * | | | catch uncaught exception with ui creation scriptsw-e-w2023-11-271-25/+29
| | |_|/ | |/| | | | | | | | | | prevent total webui crash
* | | | Merge pull request #14125 from cjj1977/devAUTOMATIC11112023-12-021-32/+171
|\ \ \ \ | | | | | | | | | | Allow use of mutiple styles csv files
| * | | | Allow use of mutiple styles csv filesCharlie Joynt2023-11-271-32/+171
| |/ / / | | | | | | | | | | | | | | | | | | | | * 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
* | | | Merge pull request #14131 from read-0nly/patch-1AUTOMATIC11112023-12-021-1/+1
|\ \ \ \ | | | | | | | | | | Update devices.py - Make 'use-cpu all' actually apply to 'all'
| * | | | Update devices.pyobsol2023-11-281-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | 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
* | | | Merge pull request #14121 from ↵AUTOMATIC11112023-12-022-119/+124
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | AUTOMATIC1111/fix-Auto-focal-point-crop-for-opencv-4.8.x Fix auto focal point crop for opencv >= 4.8
| * | | | reformat file with uniform indentationw-e-w2023-11-281-104/+106
| | | | |
| * | | | fix Auto focal point crop for opencv >= 4.8.xw-e-w2023-11-282-15/+18
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge pull request #14119 from ↵AUTOMATIC11112023-12-021-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | AUTOMATIC1111/add-Block-component-creation-callback add Block component creation callback
| * | | | add Block component creation callbackw-e-w2023-11-271-0/+10
| |/ / /
* | | | Merge pull request #14046 from hidenorly/AddFP32FallbackSupportOnSdVaeApproxAUTOMATIC11112023-12-021-0/+15
|\ \ \ \ | | | | | | | | | | Add FP32 fallback support on sd_vae_approx
| * | | | Fix the Ruff error about unused importhidenorly2023-11-281-1/+0
| | | | |
| * | | | Add FP32 fallback support on torch.nn.functional.interpolatehidenorly2023-11-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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```
| * | | | Revert "Add FP32 fallback support on sd_vae_approx"hidenorly2023-11-281-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 58c19545c83fa6925c9ce2216ee64964eb5129ce. Since the modification is expected to move to mac_specific.py (https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/14046#issuecomment-1826731532)
| * | | | Add FP32 fallback support on sd_vae_approxhidenorly2023-11-201-1/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #14170 from MrCheeze/sd-turboAUTOMATIC11112023-12-022-7/+19
|\ \ \ \ | | | | | | | | | | Add support for SD 2.1 Turbo
| * | | | Add support for SD 2.1 Turbo, by converting the state dict from SGM to LDM ↵MrCheeze2023-12-021-4/+13
| | | | | | | | | | | | | | | | | | | | on load
| * | | | Fix bug where is_using_v_parameterization_for_sd2 fails because the ↵MrCheeze2023-12-021-3/+6
| | |/ / | |/| | | | | | | | | | sd_hijack is only partially undone
* | | | split UI settings page into manyAUTOMATIC11112023-12-021-25/+32
| | | |