From d29fe44e467c6ecc435f561a776ead8f5116f077 Mon Sep 17 00:00:00 2001
From: kernelmethod <17100608+kernelmethod@users.noreply.github.com>
Date: Thu, 25 May 2023 14:51:47 -0400
Subject: Small fixes to prepare_tcmalloc for Debian/Ubuntu compatibility

- /usr/sbin (where ldconfig is usually located) is not typically on users' PATHs by default, so we set that variable before trying to run ldconfig.
- The libtcmalloc library is called libtcmalloc_minimal on Debian/Ubuntu systems. We now check whether libtcmalloc_minimal exists when running prepare_tcmalloc.
---
 webui.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index 19cf2f78..7f26d6bf 100755
--- a/webui.sh
+++ b/webui.sh
@@ -183,7 +183,7 @@ fi
 # Try using TCMalloc on Linux
 prepare_tcmalloc() {
     if [[ "${OSTYPE}" == "linux"* ]] && [[ -z "${NO_TCMALLOC}" ]] && [[ -z "${LD_PRELOAD}" ]]; then
-        TCMALLOC="$(ldconfig -p | grep -Po "libtcmalloc.so.\d" | head -n 1)"
+        TCMALLOC="$(PATH=/usr/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.3


From 09d9c3d287ee4543d285e0fde8b81603c9751a7e Mon Sep 17 00:00:00 2001
From: Roman Beltiukov <maybe.hello.world@gmail.com>
Date: Thu, 25 May 2023 14:45:05 -0700
Subject: change to AMD only if NVIDIA is not presented

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

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index 19cf2f78..999fafe4 100755
--- a/webui.sh
+++ b/webui.sh
@@ -116,11 +116,14 @@ case "$gpu_info" in
     *)
     ;;
 esac
-if echo "$gpu_info" | grep -q "AMD" && [[ -z "${TORCH_COMMAND}" ]]
+if ! echo "$gpu_info" | grep -q "NVIDIA";
 then
-    # AMD users will still use torch 1.13 because 2.0 does not seem to work.
-    export TORCH_COMMAND="pip install torch==1.13.1+rocm5.2 torchvision==0.14.1+rocm5.2 --index-url https://download.pytorch.org/whl/rocm5.2"
-fi  
+    if echo "$gpu_info" | grep -q "AMD" && [[ -z "${TORCH_COMMAND}" ]]
+    then
+        # AMD users will still use torch 1.13 because 2.0 does not seem to work.
+        export TORCH_COMMAND="pip install torch==1.13.1+rocm5.2 torchvision==0.14.1+rocm5.2 --index-url https://download.pytorch.org/whl/rocm5.2"
+    fi
+fi
 
 for preq in "${GIT}" "${python_cmd}"
 do
-- 
cgit v1.2.3


From bdc371983ea817547378fd2232ff0eb22bb315fa Mon Sep 17 00:00:00 2001
From: Roman Beltiukov <maybe.hello.world@gmail.com>
Date: Fri, 26 May 2023 02:09:09 -0700
Subject: Update webui.sh

---
 webui.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index d8b57b14..31296e08 100755
--- a/webui.sh
+++ b/webui.sh
@@ -128,8 +128,7 @@ if ! echo "$gpu_info" | grep -q "NVIDIA";
 then
     if echo "$gpu_info" | grep -q "AMD" && [[ -z "${TORCH_COMMAND}" ]]
     then
-        # AMD users will still use torch 1.13 because 2.0 does not seem to work.
-        export TORCH_COMMAND="pip install torch==1.13.1+rocm5.2 torchvision==0.14.1+rocm5.2 --index-url https://download.pytorch.org/whl/rocm5.2"
+        export TORCH_COMMAND="pip install torch==2.0.1+rocm5.4.2 torchvision==0.15.2+rocm5.4.2 --index-url https://download.pytorch.org/whl/rocm5.4.2"
     fi
 fi
 
-- 
cgit v1.2.3