diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-12-14 07:10:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-14 07:10:43 +0000 |
| commit | 097140ac1a3caf6e3c9980a757d4b52e6a76b789 (patch) | |
| tree | c31cf29908f94e7f6792b063df4543d6f83b423c /modules/import_hook.py | |
| parent | bda86f0fd9653657c146f7c1128f92771d16ad4e (diff) | |
| parent | 778a30a95e216f9f7ce0126dbbdb1334afc3d796 (diff) | |
| download | stable-diffusion-webui-gfx803-097140ac1a3caf6e3c9980a757d4b52e6a76b789.tar.gz stable-diffusion-webui-gfx803-097140ac1a3caf6e3c9980a757d4b52e6a76b789.tar.bz2 stable-diffusion-webui-gfx803-097140ac1a3caf6e3c9980a757d4b52e6a76b789.zip | |
Merge branch 'dev' into master
Diffstat (limited to 'modules/import_hook.py')
| -rw-r--r-- | modules/import_hook.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/modules/import_hook.py b/modules/import_hook.py index 28c67dfa..eba9a372 100644 --- a/modules/import_hook.py +++ b/modules/import_hook.py @@ -3,3 +3,14 @@ import sys # this will break any attempt to import xformers which will prevent stability diffusion repo from trying to use it if "--xformers" not in "".join(sys.argv): sys.modules["xformers"] = None + +# Hack to fix a changed import in torchvision 0.17+, which otherwise breaks +# basicsr; see https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/13985 +try: + import torchvision.transforms.functional_tensor # noqa: F401 +except ImportError: + try: + import torchvision.transforms.functional as functional + sys.modules["torchvision.transforms.functional_tensor"] = functional + except ImportError: + pass # shrug... |