mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2024-06-07 21:20:49 +00:00
Merge pull request #14186 from akx/torchvision-basicsr-hack
Add import_hook hack to work around basicsr/torchvision incompatibility
This commit is contained in:
commit
334298d473
@ -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
|
# 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):
|
if "--xformers" not in "".join(sys.argv):
|
||||||
sys.modules["xformers"] = None
|
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...
|
||||||
|
Loading…
Reference in New Issue
Block a user