From 737a013377dd698e620f39e405594f7688656af0 Mon Sep 17 00:00:00 2001
From: Beinsezii <beinsezii@gmail.com>
Date: Thu, 31 Aug 2023 15:03:08 -0700
Subject: WEBUI.SH Navi 3 torch 2.1.0 rc instead of nightly

With the release candidates being out for both torch and vision,
webui should default to these over nightly for a more stable experience.

Stable release isn't excpected until October 4th:
https://dev-discuss.pytorch.org/c/release-announcements/27
---
 webui.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index 3d0f87ee..29a6d311 100755
--- a/webui.sh
+++ b/webui.sh
@@ -141,9 +141,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}"
-- 
cgit v1.2.1


From 0ad38a9b87b7781315ea6324a8aa6c924d1275de Mon Sep 17 00:00:00 2001
From: Der Chien <der3318@yahoo.com.tw>
Date: Wed, 13 Sep 2023 20:20:01 +0800
Subject: 20230913 setup GIT_PYTHON_GIT_EXECUTABLE for GitPython

---
 webui.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index 3d0f87ee..bdab3f05 100755
--- a/webui.sh
+++ b/webui.sh
@@ -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)
-- 
cgit v1.2.1


From 6ab0b65ed15730f590a3e530f00a2047f582b488 Mon Sep 17 00:00:00 2001
From: PermissionDenied7335 <grade6_wty@163.com>
Date: Mon, 2 Oct 2023 15:43:59 +0800
Subject: Added an option not to enable venv

---
 webui.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index 3d0f87ee..f3621903 100755
--- a/webui.sh
+++ b/webui.sh
@@ -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}" ]]
-- 
cgit v1.2.1


From 6a86b3ad9bc7bb9a58dc4228ecf93a3a511ed122 Mon Sep 17 00:00:00 2001
From: "Alessandro de Oliveira Faria (A.K.A. CABELO)" <cabelo@opensuse.org>
Date: Fri, 10 Nov 2023 14:15:34 -0300
Subject: Compatibility with Debian 11, Fedora 34+ and openSUSE 15.4+

---
 webui.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index 3d0f87ee..5c23c1d8 100755
--- a/webui.sh
+++ b/webui.sh
@@ -87,7 +87,7 @@ delimiter="################################################################"
 
 printf "\n%s\n" "${delimiter}"
 printf "\e[1m\e[32mInstall script for stable-diffusion + Web UI\n"
-printf "\e[1m\e[34mTested on Debian 11 (Bullseye)\e[0m"
+printf "\e[1m\e[34mTested on Debian 11 (Bullseye), Fedora 34+ and openSUSE Leap 15.4 or newer.\e[0m"
 printf "\n%s\n" "${delimiter}"
 
 # Do not run as root
@@ -222,7 +222,7 @@ fi
 # Try using TCMalloc on Linux
 prepare_tcmalloc() {
     if [[ "${OSTYPE}" == "linux"* ]] && [[ -z "${NO_TCMALLOC}" ]] && [[ -z "${LD_PRELOAD}" ]]; then
-        TCMALLOC="$(PATH=/usr/sbin:$PATH ldconfig -p | grep -Po "libtcmalloc(_minimal|)\.so\.\d" | head -n 1)"
+        TCMALLOC="$(PATH=/sbin:$PATH ldconfig -p | grep -Po "libtcmalloc(_minimal|)\.so\.\d" | head -n 1)"
         if [[ ! -z "${TCMALLOC}" ]]; then
             echo "Using TCMalloc: ${TCMALLOC}"
             export LD_PRELOAD="${TCMALLOC}"
-- 
cgit v1.2.1