aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into test-fp8Kohaku-Blueleaf2023-12-0226-257/+681
|\
| * 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
| | * \ \ \ Merge branch 'dev' of https://github.com/cjj1977/stable-diffusion-webui into devCharlie Joynt2023-11-270-0/+0
| | |\ \ \ \
| | | * | | | bugfix for warning message (#6)MisterSeajay2023-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bugfix for warning message * bugfix error message
| | | * | | | bugfix for warning message (#6)MisterSeajay2023-11-271-1/+1
| | | | | | |
| | | * | | | Allow use of mutiple styles csv filesCharlie Joynt2023-11-271-32/+171
| | | |/ / /
| | * / / / 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 #14126 from aria1th/hypertile-xyzAUTOMATIC11112023-12-023-12/+74
| |\ \ \ \ | | | | | | | | | | | | Support XYZ scripts / split hires path from unet
| | * | | | hypertile_xyz: we don't need isnumeric check for AxisOptionaria1th2023-11-271-3/+0
| | | | | |
| | * | | | fix ruff - set comprehensionaria1th2023-11-271-2/+2
| | | | | |
| | * | | | fix ruff in hypertile_xyz.pyaria1th2023-11-271-2/+2
| | | | | |
| | * | | | cache divisors / fix ruffaria1th2023-11-273-18/+26
| | | | | |
| | * | | | Support XYZ scripts / split hires path from unetaria1th2023-11-272-3/+60
| | |/ / /
| * | | | 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 #14156 from AUTOMATIC1111/metadata-pop-up-size-limitAUTOMATIC11112023-12-022-0/+8
| |\ \ \ \ | | | | | | | | | | | | fix not able to exit metadata popup when pop up is too big
| | * | | | Close popups with escape keymissionfloyd2023-12-011-0/+6
| | | | | |
| | * | | | add max-heigh/width to global-popup-innerw-e-w2023-11-301-0/+2
| | | |/ / | | |/| | | | | | | | | | | | prevent the pop-up from being too big as to making exiting the pop-up impossible
| * | | | 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-022-30/+40
| | | | |
| * | | | infotext updates: add option to disregard certain infotext fields, add ↵AUTOMATIC11112023-12-024-12/+41
| |/ / / | | | | | | | | | | | | option to not include VAE in infotext, add explanation to infotext settings page, move some options to infotext settings page
| * | | add categories to settingsAUTOMATIC11112023-11-264-28/+130
| | | |
| * | | Merge pull request #14108 from AUTOMATIC1111/json.dump(ensure_ascii=False)AUTOMATIC11112023-11-265-5/+5
| |\ \ \ | | | | | | | | | | json.dump(ensure_ascii=False)
| | * | | json.dump(ensure_ascii=False)w-e-w2023-11-265-5/+5
| |/ / / | | | | | | | | | | | | improve json readability
| * | | compact prompt layout: preserve scroll when switching between lora tabsAUTOMATIC11112023-11-263-3/+18
| | | |
* | | | Merge branch 'dev' into test-fp8Kohaku-Blueleaf2023-11-2617-73/+664
|\| | |
| * | | Merge pull request #13936 from cabelo/compatibilityAUTOMATIC11112023-11-262-3/+5
| |\ \ \ | | | | | | | | | | Compatibility
| | * | | Compatibility with Debian 11, Fedora 34+ and openSUSE 15.4+Alessandro de Oliveira Faria (A.K.A. CABELO)2023-11-102-4/+4
| | | | |