From 1d7c51fb9f757b5dcdc506f8fc003e6047151567 Mon Sep 17 00:00:00 2001
From: Beinsezii <beinsezii@gmail.com>
Date: Wed, 14 Jun 2023 13:07:22 -0700
Subject: WEBUI.SH Navi 3 Support

Navi 3 card now defaults to nightly torch to utilize rocm 5.5
for out-of-the-box support.

https://download.pytorch.org/whl/nightly/

While its not yet on the main pytorch "get started" site,
it still seems perfectly indexable via pip which is all we need.

With this I'm able to clone a fresh repo and immediately run ./webui.sh
on my 7900 XTX without any problems.
---
 webui.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index 5c8d977c..c889c55e 100755
--- a/webui.sh
+++ b/webui.sh
@@ -131,6 +131,10 @@ 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.5"
+        # Navi 3 needs at least 5.5 which is only on the nightly chain
+    ;;
     *"Renoir"*) export HSA_OVERRIDE_GFX_VERSION=9.0.0
         printf "\n%s\n" "${delimiter}"
         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"
-- 
cgit v1.2.3


From 5a32d4fcb195f7ee5be2617d9f776c01fd0437b7 Mon Sep 17 00:00:00 2001
From: onyasumi <kugelblitz3@outlook.com>
Date: Mon, 3 Jul 2023 07:15:19 +0000
Subject: Fix launch script to be runnable from any directory

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

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index 5c8d977c..8a3c6f12 100755
--- a/webui.sh
+++ b/webui.sh
@@ -4,26 +4,28 @@
 # change the variables in webui-user.sh instead #
 #################################################
 
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
 # If run from macOS, load defaults from webui-macos-env.sh
 if [[ "$OSTYPE" == "darwin"* ]]; then
-    if [[ -f webui-macos-env.sh ]]
+    if [[ -f "$SCRIPT_DIR"/webui-macos-env.sh ]]
         then
-        source ./webui-macos-env.sh
+        source "$SCRIPT_DIR"/webui-macos-env.sh
     fi
 fi
 
 # Read variables from webui-user.sh
 # shellcheck source=/dev/null
-if [[ -f webui-user.sh ]]
+if [[ -f "$SCRIPT_DIR"/webui-user.sh ]]
 then
-    source ./webui-user.sh
+    source "$SCRIPT_DIR"/webui-user.sh
 fi
 
 # Set defaults
 # Install directory without trailing slash
 if [[ -z "${install_dir}" ]]
 then
-    install_dir="$(pwd)"
+    install_dir="$(dirname "$0")"
 fi
 
 # Name of the subdirectory (defaults to stable-diffusion-webui)
-- 
cgit v1.2.3


From e33e2c51753b91d836aabc52f1f8d67d7de05f86 Mon Sep 17 00:00:00 2001
From: Frank Tao <48634762+onyasumi@users.noreply.github.com>
Date: Mon, 3 Jul 2023 03:17:27 -0400
Subject: Update webui.sh

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

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index 8a3c6f12..246381fc 100755
--- a/webui.sh
+++ b/webui.sh
@@ -25,7 +25,7 @@ fi
 # Install directory without trailing slash
 if [[ -z "${install_dir}" ]]
 then
-    install_dir="$(dirname "$0")"
+    install_dir="$SCRIPT_DIR"
 fi
 
 # Name of the subdirectory (defaults to stable-diffusion-webui)
-- 
cgit v1.2.3


From 4da92281f65a5d3620e61aef76dc2ec23394e706 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 8 Jul 2023 17:29:28 +0300
Subject: pin version for torch for Navi3 according to comment from #11228

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

(limited to 'webui.sh')

diff --git a/webui.sh b/webui.sh
index 4b0d7cd8..a683d946 100755
--- a/webui.sh
+++ b/webui.sh
@@ -134,7 +134,7 @@ 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.5"
+        export TORCH_COMMAND="pip install --pre torch==2.1.0.dev-20230614+rocm5.5 torchvision==0.16.0.dev-20230614+rocm5.5 --index-url https://download.pytorch.org/whl/nightly/rocm5.5"
         # Navi 3 needs at least 5.5 which is only on the nightly chain
     ;;
     *"Renoir"*) export HSA_OVERRIDE_GFX_VERSION=9.0.0
-- 
cgit v1.2.3