diff options
author | discus0434 <66945496+discus0434@users.noreply.github.com> | 2022-10-20 00:08:47 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-20 00:08:47 +0000 |
commit | 4574eea5898dcd64f354fcf17a5c67b55288b002 (patch) | |
tree | d180b71e7ac4f144ad6daceef8a56cba61f235ab /launch.py | |
parent | 634acdd9546ca84a9fc75d5ecfe5650af566dd8e (diff) | |
parent | 604620a7f08d1126a8689f9f4bec8ade0801a69b (diff) | |
download | stable-diffusion-webui-gfx803-4574eea5898dcd64f354fcf17a5c67b55288b002.tar.gz stable-diffusion-webui-gfx803-4574eea5898dcd64f354fcf17a5c67b55288b002.tar.bz2 stable-diffusion-webui-gfx803-4574eea5898dcd64f354fcf17a5c67b55288b002.zip |
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'launch.py')
-rw-r--r-- | launch.py | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -156,9 +156,15 @@ def prepare_enviroment(): if not is_installed("clip"):
run_pip(f"install {clip_package}", "clip")
- if (not is_installed("xformers") or reinstall_xformers) and xformers and platform.python_version().startswith("3.10"):
+ if (not is_installed("xformers") or reinstall_xformers) and xformers:
if platform.system() == "Windows":
- run_pip(f"install -U -I --no-deps {xformers_windows_package}", "xformers")
+ if platform.python_version().startswith("3.10"):
+ run_pip(f"install -U -I --no-deps {xformers_windows_package}", "xformers")
+ else:
+ print("Installation of xformers is not supported in this version of Python.")
+ print("You can also check this and build manually: https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Xformers#building-xformers-on-windows-by-duckness")
+ if not is_installed("xformers"):
+ exit(0)
elif platform.system() == "Linux":
run_pip("install xformers", "xformers")
|