From 4599e8ad0acaae3f13bd3a7bef4db7632aac8504 Mon Sep 17 00:00:00 2001
From: DaniAndTheWeb <57776841+DaniAndTheWeb@users.noreply.github.com>
Date: Thu, 19 Jan 2023 17:00:51 +0100
Subject: [PATCH 1/8] Environment variable on launch just for Navi cards

Setting HSA_OVERRIDE_GFX_VERSION=10.3.0 for all AMD cards seems to break compatibility for polaris and vega cards so it should just be enabled on Navi
---
 webui.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/webui.sh b/webui.sh
index 1edf921dd..a35a5f351 100755
--- a/webui.sh
+++ b/webui.sh
@@ -172,7 +172,12 @@ else
         then	    
             export TORCH_COMMAND="pip install torch torchvision --extra-index-url https://download.pytorch.org/whl/rocm5.2"
         fi
-        HSA_OVERRIDE_GFX_VERSION=10.3.0 exec "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
+        if echo "$gpu_info" | grep -q "Navi"
+        then
+            HSA_OVERRIDE_GFX_VERSION=10.3.0 exec "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
+        else
+            exec "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
+        fi
     else
         exec "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
     fi

From c09fb3d8f1f71bc66d7c4cea603885619d6a1cd4 Mon Sep 17 00:00:00 2001
From: DaniAndTheWeb <57776841+DaniAndTheWeb@users.noreply.github.com>
Date: Thu, 19 Jan 2023 19:21:02 +0100
Subject: [PATCH 2/8] Simplify GPU check

---
 webui.sh | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/webui.sh b/webui.sh
index a35a5f351..aa4f875cb 100755
--- a/webui.sh
+++ b/webui.sh
@@ -104,6 +104,12 @@ then
 fi
 
 # Check prerequisites
+gpu_info=$(lspci 2>/dev/null | grep VGA)
+if echo "$gpu_info" | grep -q "Navi"
+then
+    export HSA_OVERRIDE_GFX_VERSION=10.3.0
+fi
+
 for preq in "${GIT}" "${python_cmd}"
 do
     if ! hash "${preq}" &>/dev/null
@@ -165,20 +171,9 @@ else
     printf "\n%s\n" "${delimiter}"
     printf "Launching launch.py..."
     printf "\n%s\n" "${delimiter}"
-    gpu_info=$(lspci 2>/dev/null | grep VGA)
-    if echo "$gpu_info" | grep -q "AMD"
+    if echo "$gpu_info" | grep -q "AMD" && [[ -z "${TORCH_COMMAND}" ]]
     then
-        if [[ -z "${TORCH_COMMAND}" ]]
-        then	    
-            export TORCH_COMMAND="pip install torch torchvision --extra-index-url https://download.pytorch.org/whl/rocm5.2"
-        fi
-        if echo "$gpu_info" | grep -q "Navi"
-        then
-            HSA_OVERRIDE_GFX_VERSION=10.3.0 exec "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
-        else
-            exec "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
-        fi
-    else
-        exec "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
-    fi
+        export TORCH_COMMAND="pip install torch torchvision --extra-index-url https://download.pytorch.org/whl/rocm5.2"
+    fi        
+    exec "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
 fi

From 48045545d9a3f174621a62086812d9bbfb3ce1c2 Mon Sep 17 00:00:00 2001
From: DaniAndTheWeb <57776841+DaniAndTheWeb@users.noreply.github.com>
Date: Thu, 19 Jan 2023 19:23:40 +0100
Subject: [PATCH 3/8] Small reformat of the GPU check

---
 webui.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webui.sh b/webui.sh
index aa4f875cb..ff410e152 100755
--- a/webui.sh
+++ b/webui.sh
@@ -109,6 +109,10 @@ if echo "$gpu_info" | grep -q "Navi"
 then
     export HSA_OVERRIDE_GFX_VERSION=10.3.0
 fi
+if echo "$gpu_info" | grep -q "AMD" && [[ -z "${TORCH_COMMAND}" ]]
+then
+    export TORCH_COMMAND="pip install torch torchvision --extra-index-url https://download.pytorch.org/whl/rocm5.2"
+fi  
 
 for preq in "${GIT}" "${python_cmd}"
 do
@@ -170,10 +174,6 @@ then
 else
     printf "\n%s\n" "${delimiter}"
     printf "Launching launch.py..."
-    printf "\n%s\n" "${delimiter}"
-    if echo "$gpu_info" | grep -q "AMD" && [[ -z "${TORCH_COMMAND}" ]]
-    then
-        export TORCH_COMMAND="pip install torch torchvision --extra-index-url https://download.pytorch.org/whl/rocm5.2"
-    fi        
+    printf "\n%s\n" "${delimiter}"      
     exec "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
 fi

From 36364bd76c4634820e08070a287f0a5ad27c35f6 Mon Sep 17 00:00:00 2001
From: DaniAndTheWeb <57776841+DaniAndTheWeb@users.noreply.github.com>
Date: Thu, 19 Jan 2023 20:05:49 +0100
Subject: [PATCH 4/8] GFX env just for RDNA 1 and 2

This commit specifies which GPUs should use the GFX variable, RDNA 3 is excluded since it uses a newer GFX version
---
 webui.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webui.sh b/webui.sh
index ff410e152..91c95e475 100755
--- a/webui.sh
+++ b/webui.sh
@@ -105,7 +105,7 @@ fi
 
 # Check prerequisites
 gpu_info=$(lspci 2>/dev/null | grep VGA)
-if echo "$gpu_info" | grep -q "Navi"
+if echo "$gpu_info" | grep -qE "Navi (1|2)"
 then
     export HSA_OVERRIDE_GFX_VERSION=10.3.0
 fi

From 912285ae64e4e1186feb54caf82b4a0b11c6cb7f Mon Sep 17 00:00:00 2001
From: DaniAndTheWeb <57776841+DaniAndTheWeb@users.noreply.github.com>
Date: Thu, 19 Jan 2023 23:42:12 +0100
Subject: [PATCH 5/8] Experimental support for Renoir

This adds the GFX version 9.0.0 in order to use Renoir GPUs with at least 4 GB of VRAM (it's possible to increase the virtual VRAM from the BIOS settings of some vendors). This will only work if the remaining ram is at least 12 GB to avoid the system to become unresponsive on launch.).
This change also changes the GPU check to a case statement to be able to add more GPUs efficiently.
---
 webui.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/webui.sh b/webui.sh
index 91c95e475..27933c040 100755
--- a/webui.sh
+++ b/webui.sh
@@ -105,10 +105,14 @@ fi
 
 # Check prerequisites
 gpu_info=$(lspci 2>/dev/null | grep VGA)
-if echo "$gpu_info" | grep -qE "Navi (1|2)"
-then
-    export HSA_OVERRIDE_GFX_VERSION=10.3.0
-fi
+case "$gpu_info" in
+    *"Navi 1"*|*"Navi 2"*) export HSA_OVERRIDE_GFX_VERSION=10.3.0
+    ;;
+    *"Renoir"*) export HSA_OVERRIDE_GFX_VERSION=9.0.0
+    ;;
+    *) 
+    ;;
+esac
 if echo "$gpu_info" | grep -q "AMD" && [[ -z "${TORCH_COMMAND}" ]]
 then
     export TORCH_COMMAND="pip install torch torchvision --extra-index-url https://download.pytorch.org/whl/rocm5.2"

From 0684a6819dfaec40732271ca5ef32392c36f17ba Mon Sep 17 00:00:00 2001
From: DaniAndTheWeb <57776841+DaniAndTheWeb@users.noreply.github.com>
Date: Fri, 20 Jan 2023 00:21:05 +0100
Subject: [PATCH 6/8] Usage explanation for Renoir users

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

diff --git a/webui.sh b/webui.sh
index 27933c040..4da518802 100755
--- a/webui.sh
+++ b/webui.sh
@@ -109,6 +109,9 @@ case "$gpu_info" in
     *"Navi 1"*|*"Navi 2"*) export HSA_OVERRIDE_GFX_VERSION=10.3.0
     ;;
     *"Renoir"*) export HSA_OVERRIDE_GFX_VERSION=9.0.0
+        printf "\n%s\n" "${delimiter}"
+		printf "Make sure to have at least 4GB of VRAM and 10GB of RAM or enable cpu mode: --use-cpu all --no-half"
+		printf "\n%s\n" "${delimiter}"
     ;;
     *) 
     ;;

From fd651bd0bcceb4c746c86b202702bca029cbd6db Mon Sep 17 00:00:00 2001
From: DaniAndTheWeb <57776841+DaniAndTheWeb@users.noreply.github.com>
Date: Fri, 20 Jan 2023 00:21:51 +0100
Subject: [PATCH 7/8] Update webui.sh

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

diff --git a/webui.sh b/webui.sh
index 4da518802..d5e7b3c50 100755
--- a/webui.sh
+++ b/webui.sh
@@ -110,8 +110,8 @@ case "$gpu_info" in
     ;;
     *"Renoir"*) export HSA_OVERRIDE_GFX_VERSION=9.0.0
         printf "\n%s\n" "${delimiter}"
-		printf "Make sure to have at least 4GB of VRAM and 10GB of RAM or enable cpu mode: --use-cpu all --no-half"
-		printf "\n%s\n" "${delimiter}"
+        printf "Make sure to have at least 4GB of VRAM and 10GB of RAM or enable cpu mode: --use-cpu all --no-half"
+        printf "\n%s\n" "${delimiter}"
     ;;
     *) 
     ;;

From e0b6092bc99efe311261a51289dec67cbf4845bc Mon Sep 17 00:00:00 2001
From: DaniAndTheWeb <57776841+DaniAndTheWeb@users.noreply.github.com>
Date: Fri, 20 Jan 2023 15:31:27 +0100
Subject: [PATCH 8/8] Update webui.sh

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

diff --git a/webui.sh b/webui.sh
index d5e7b3c50..8cdad22d3 100755
--- a/webui.sh
+++ b/webui.sh
@@ -110,7 +110,7 @@ case "$gpu_info" in
     ;;
     *"Renoir"*) export HSA_OVERRIDE_GFX_VERSION=9.0.0
         printf "\n%s\n" "${delimiter}"
-        printf "Make sure to have at least 4GB of VRAM and 10GB of RAM or enable cpu mode: --use-cpu all --no-half"
+        printf "Experimental support for Renoir: make sure to have at least 4GB of VRAM and 10GB of RAM or enable cpu mode: --use-cpu all --no-half"
         printf "\n%s\n" "${delimiter}"
     ;;
     *)