diff options
| author | MalumaDev <piano.lu92@gmail.com> | 2022-10-15 22:06:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-15 22:06:36 +0000 |
| commit | 97ceaa23d00f6a17ca752dda757e6016f99230cb (patch) | |
| tree | 1c44afefae393779f57ede3578422d08330cceac /launch.py | |
| parent | 3d21684ee30ca5734126b8d08c05b3a0f513fe75 (diff) | |
| parent | be1596ce30b1ead6998da0c62003003dcce5eb2c (diff) | |
| download | stable-diffusion-webui-gfx803-97ceaa23d00f6a17ca752dda757e6016f99230cb.tar.gz stable-diffusion-webui-gfx803-97ceaa23d00f6a17ca752dda757e6016f99230cb.tar.bz2 stable-diffusion-webui-gfx803-97ceaa23d00f6a17ca752dda757e6016f99230cb.zip | |
Merge branch 'master' into test_resolve_conflicts
Diffstat (limited to 'launch.py')
| -rw-r--r-- | launch.py | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -104,6 +104,7 @@ def prepare_enviroment(): args = shlex.split(commandline_args)
args, skip_torch_cuda_test = extract_arg(args, '--skip-torch-cuda-test')
+ args, reinstall_xformers = extract_arg(args, '--reinstall-xformers')
xformers = '--xformers' in args
deepdanbooru = '--deepdanbooru' in args
ngrok = '--ngrok' in args
@@ -128,9 +129,9 @@ def prepare_enviroment(): if not is_installed("clip"):
run_pip(f"install {clip_package}", "clip")
- if not is_installed("xformers") and xformers and platform.python_version().startswith("3.10"):
+ if (not is_installed("xformers") or reinstall_xformers) and xformers and platform.python_version().startswith("3.10"):
if platform.system() == "Windows":
- run_pip("install https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/c/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl", "xformers")
+ run_pip("install -U -I --no-deps https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/f/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl", "xformers")
elif platform.system() == "Linux":
run_pip("install xformers", "xformers")
|