aboutsummaryrefslogtreecommitdiffstats
path: root/modules
Commit message (Collapse)AuthorAgeFilesLines
* 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 #14009 from ↵AUTOMATIC11112023-11-202-4/+21
|\ | | | | | | | | AUTOMATIC1111/Option-to-show-batch-img2img-results-in-UI Option to show batch img2img results in UI
| * Option to show batch img2img results in UIw-e-w2023-11-192-4/+21
| | | | | | | | | | | | | | | | 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
* | Merge branch 'dag' into devAUTOMATIC11112023-11-202-153/+148
|\ \
| * | rework extensions metadata: use custom sorter that doesn't mess the order as ↵AUTOMATIC11112023-11-202-153/+148
| | | | | | | | | | | | much and ignores cyclic errors, use classes with named fields instead of dictionaries, eliminate some duplicated code
* | | Merge pull request #13944 from wfjsw/dagAUTOMATIC11112023-11-202-24/+188
|\| | | | | | | | implementing script metadata and DAG sorting mechanism
| * | use metadata.ini for meta filenamewfjsw2023-11-191-6/+6
| | |
| * | bug fixwfjsw2023-11-111-7/+18
| | |
| * | fixwfjsw2023-11-111-1/+0
| | |
| * | allow comma and whitespace as separatorwfjsw2023-11-112-6/+9
| | |
| * | remove the assumption of same namewfjsw2023-11-111-51/+30
| | |
| * | reverse the extension load order so builtin extensions load earlier nativelywfjsw2023-11-111-1/+1
| | |
| * | populate loaded_extensions from extension list insteadwfjsw2023-11-111-3/+2
| | |
| * | implementing script metadata and DAG sorting mechanismwfjsw2023-11-112-24/+197
| |/
* | save sysinfo as .jsonw-e-w2023-11-192-2/+2
| | | | | | | | GitHub now allows uploading of .json files in issues
* | Merge pull request #13931 from AUTOMATIC1111/style-hotkeysAUTOMATIC11112023-11-191-2/+2
|\ \ | | | | | | Enable prompt hotkeys in style editor
| * | Enable prompt hotkeys in style editormissionfloyd2023-11-101-2/+2
| | |
* | | Merge pull request #13014 from ↵AUTOMATIC11112023-11-193-6/+25
|\ \ \ | | | | | | | | | | | | | | | | AUTOMATIC1111/thread-safe-extranetworks-list_items thread safe extra network list_items
| * | | add commentw-e-w2023-09-123-0/+3
| | | |
| * | | return nothing if not foundw-e-w2023-09-113-4/+18
| | | |
| * | | thread safe extra network using listw-e-w2023-09-092-2/+4
| | | |
| * | | Revert "thread safe extra network list_items"w-e-w2023-09-094-11/+7
| | | | | | | | | | | | | | | | This reverts commit aab385d01b4311726127397552d791f4d71b7147.
| * | | thread safe extra network list_itemsw-e-w2023-09-034-7/+11
| | | |
* | | | Merge pull request #13968 from kaalibro/extranetworks-path-sortingAUTOMATIC11112023-11-192-2/+3
|\ \ \ \ | | | | | | | | | | Adds 'Path' sorting for Extra network cards
| * | | | Adds 'Path' sorting for Extra network cardskaalibro2023-11-132-2/+3
| | |_|/ | |/| |
* | | | Merge pull request #13977 from AUTOMATIC1111/hotfix-postprocessing-state-endAUTOMATIC11112023-11-191-1/+1
|\ \ \ \ | | | | | | | | | | Hotfix: call shared.state.end() after postprocessing done
| * | | | hotfix: call shared.state.end() after postprocessing doneAngelBottomless2023-11-151-1/+1
| |/ / /
* | | | Merge pull request #13996 from Luxter77/patch-1AUTOMATIC11112023-11-191-1/+26
|\ \ \ \ | | | | | | | | | | Adds tqdm handler to logging_config.py for progress bar integration
| * | | | actually adds handler to logging_config.pyYour Name2023-11-161-1/+1
| | | | |
| * | | | Take into account tqdm not being installed before first boot for loggingLucas Daniel Velazquez M2023-11-161-13/+24
| | | | |
| * | | | Adds tqdm handler to logging_config.py for progress bar integrationLucas Daniel Velazquez M2023-11-161-0/+14
| | |_|/ | |/| |
* | | | Merge pull request #13826 from ezxzeng/ui_mobile_optimizationsAUTOMATIC11112023-11-192-2/+13
|\ \ \ \ | | | | | | | | | | added accordion settings options
| * | | | ExitStack as alternative to suppressEmily Zeng2023-11-101-3/+10
| | | | |
| * | | | fix added accordion settings optionsw-e-w2023-11-101-5/+3
| | | | |
| * | | | multiline with statement for readibilityEmily Zeng2023-11-091-2/+6
| | | | |
| * | | | removed changes that weren't merged properlyEmily Zeng2023-11-091-50/+1
| | | | |
| * | | | moved nested with to single line to remove extra tabsEmily Zeng2023-11-091-296/+295
| | | | |
| * | | | Merge branch 'dev' into ui_mobile_optimizationsezxzeng2023-11-0714-187/+369
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | added accordion settings optionsEmily Zeng2023-11-032-250/+254
| | | | |
* | | | | Merge pull request #14004 from storyicon/masterAUTOMATIC11112023-11-191-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | feat: fix randn found element of type float at pos 2
| * | | | feat: fix randn found element of type float at pos 2storyicon2023-11-171-1/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: storyicon <storyicon@foxmail.com>
* | | | fix pix2pix producing bad resultsAUTOMATIC11112023-11-071-1/+1
| | | |
* | | | Add option to set notification sound volumeGerryDE2023-11-071-0/+1
| | | |
* | | | fix exception related to the pix2pixAUTOMATIC11112023-11-061-0/+4
| | | |
* | | | fix img2img_tabs errorAUTOMATIC11112023-11-061-10/+10
| | | |
* | | | more changes for #13865: fix formatting, rename the function, add comment ↵AUTOMATIC11112023-11-052-12/+14
| | | | | | | | | | | | | | | | and add a readme entry
* | | | linterAUTOMATIC11112023-11-053-4/+4
| | | |