diff options
author | JC-Array <44535867+JC-Array@users.noreply.github.com> | 2022-10-10 23:06:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-10 23:06:07 +0000 |
commit | aca1553bde726e1455f3a73a6378b31e93d3e8f2 (patch) | |
tree | b5492fb630f58deddd9fbf812fdd7d9134a59cc1 /modules/sd_hijack_optimizations.py | |
parent | 45fbd1c5fec887988ab555aac75a999d4f3aff40 (diff) | |
parent | 42bf5fa3256bff5e4640e5a626e750d4e49e01e1 (diff) | |
download | stable-diffusion-webui-gfx803-aca1553bde726e1455f3a73a6378b31e93d3e8f2.tar.gz stable-diffusion-webui-gfx803-aca1553bde726e1455f3a73a6378b31e93d3e8f2.tar.bz2 stable-diffusion-webui-gfx803-aca1553bde726e1455f3a73a6378b31e93d3e8f2.zip |
Merge pull request #1 from AUTOMATIC1111/master
updating files to resolve merge conflicts
Diffstat (limited to 'modules/sd_hijack_optimizations.py')
-rw-r--r-- | modules/sd_hijack_optimizations.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/modules/sd_hijack_optimizations.py b/modules/sd_hijack_optimizations.py index 634fb4b2..18408e62 100644 --- a/modules/sd_hijack_optimizations.py +++ b/modules/sd_hijack_optimizations.py @@ -13,8 +13,6 @@ from modules import shared if shared.cmd_opts.xformers or shared.cmd_opts.force_enable_xformers:
try:
import xformers.ops
- import functorch
- xformers._is_functorch_available = True
shared.xformers_available = True
except Exception:
print("Cannot import xformers", file=sys.stderr)
|