aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAarni Koskela <akx@iki.fi>2023-12-03 16:50:20 +0200
committerAarni Koskela <akx@iki.fi>2023-12-03 16:55:38 +0200
commitd92ce145bba714c5b257b9853aa22681233651b8 (patch)
tree6b296ac80e5d69b2fee7e1420631a1709a628bc9
parentb4776ea3a236c07041940ba78a50e25bc5c9a06f (diff)
Add import_hook hack to work around basicsr incompatibility
Fixes #13985
-rw-r--r--modules/import_hook.py11
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...