diff options
| author | hako-mikan <122196982+hako-mikan@users.noreply.github.com> | 2023-11-09 12:57:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 12:57:57 +0000 |
| commit | 816096e642187a18b11e2729c42c0b5f677f047d (patch) | |
| tree | 8127b07b946b376d4276e2169ceffb7c2e64ba09 /webui.sh | |
| parent | 6b9795849d497b41514aa9462690cf7c2802e4f6 (diff) | |
| parent | 5e80d9ee99c5899e5e2b130408ffb65a0585a62a (diff) | |
| download | stable-diffusion-webui-gfx803-816096e642187a18b11e2729c42c0b5f677f047d.tar.gz stable-diffusion-webui-gfx803-816096e642187a18b11e2729c42c0b5f677f047d.tar.bz2 stable-diffusion-webui-gfx803-816096e642187a18b11e2729c42c0b5f677f047d.zip | |
Merge branch 'dev' into master
Diffstat (limited to 'webui.sh')
| -rwxr-xr-x | webui.sh | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -4,12 +4,6 @@ # change the variables in webui-user.sh instead # ################################################# - -use_venv=1 -if [[ $venv_dir == "-" ]]; then - use_venv=0 -fi - SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) @@ -28,6 +22,12 @@ then source "$SCRIPT_DIR"/webui-user.sh fi +# If $venv_dir is "-", then disable venv support +use_venv=1 +if [[ $venv_dir == "-" ]]; then + use_venv=0 +fi + # Set defaults # Install directory without trailing slash if [[ -z "${install_dir}" ]] @@ -51,6 +51,8 @@ fi if [[ -z "${GIT}" ]] then export GIT="git" +else + export GIT_PYTHON_GIT_EXECUTABLE="${GIT}" fi # python3 venv without trailing slash (defaults to ${install_dir}/${clone_dir}/venv) @@ -141,9 +143,8 @@ case "$gpu_info" in *"Navi 2"*) export HSA_OVERRIDE_GFX_VERSION=10.3.0 ;; *"Navi 3"*) [[ -z "${TORCH_COMMAND}" ]] && \ - export TORCH_COMMAND="pip install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/rocm5.6" - # Navi 3 needs at least 5.5 which is only on the nightly chain, previous versions are no longer online (torch==2.1.0.dev-20230614+rocm5.5 torchvision==0.16.0.dev-20230614+rocm5.5 torchaudio==2.1.0.dev-20230614+rocm5.5) - # so switch to nightly rocm5.6 without explicit versions this time + export TORCH_COMMAND="pip install torch torchvision --index-url https://download.pytorch.org/whl/test/rocm5.6" + # Navi 3 needs at least 5.5 which is only on the torch 2.1.0 release candidates right now ;; *"Renoir"*) export HSA_OVERRIDE_GFX_VERSION=9.0.0 printf "\n%s\n" "${delimiter}" |