From e205322c8db1808e063ea10f3154dd006ff08395 Mon Sep 17 00:00:00 2001
From: mrq <barry.quiggles@protonmail.com>
Date: Fri, 3 Mar 2023 02:58:34 +0000
Subject: [PATCH] added setup script for bitsandbytes-rocm (soon: multi-gpu
 testing, because I am finally making use of my mispurchased second 6800XT)

---
 dlas              | 2 +-
 setup-rocm-bnb.sh | 8 ++++++++
 setup-rocm.sh     | 7 ++-----
 tortoise-tts      | 2 +-
 update-force.bat  | 8 ++++----
 5 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100755 setup-rocm-bnb.sh

diff --git a/dlas b/dlas
index 0f04206..71cc43e 160000
--- a/dlas
+++ b/dlas
@@ -1 +1 @@
-Subproject commit 0f04206aa20b1ab632c0cbf7bb6a43d5c1fd9eb0
+Subproject commit 71cc43e65cd47c6704d20c99006a3e78feb2400d
diff --git a/setup-rocm-bnb.sh b/setup-rocm-bnb.sh
new file mode 100755
index 0000000..eff17f2
--- /dev/null
+++ b/setup-rocm-bnb.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+source ./venv/bin/activate
+git clone https://git.ecker.tech/mrq/bitsandbytes-rocm
+cd bitsandbytes-rocm
+make hip
+CUDA_VERSION=gfx1030 python setup.py install # assumes you're using a 6XXX series card
+python3 -m bitsandbytes # to validate it works
+cd ..
\ No newline at end of file
diff --git a/setup-rocm.sh b/setup-rocm.sh
index b38bcf6..adf4b0f 100755
--- a/setup-rocm.sh
+++ b/setup-rocm.sh
@@ -14,9 +14,6 @@ python3 -m pip install -r ./tortoise-tts/requirements.txt # install TorToiSe req
 python3 -m pip install -e ./tortoise-tts/ # install TorToiSe
 python3 -m pip install -r ./requirements.txt # install local requirements
 # swap to ROCm version of BitsAndBytes
-pip3 uninstall bitsandbytes
-
-# gives errors
-# pip3 install git+https://github.com/broncotc/bitsandbytes-rocm
-
+pip3 uninstall -y bitsandbytes
+./setup-rocm-bnb.sh
 deactivate
\ No newline at end of file
diff --git a/tortoise-tts b/tortoise-tts
index 7cc0250..a9de016 160000
--- a/tortoise-tts
+++ b/tortoise-tts
@@ -1 +1 @@
-Subproject commit 7cc0250a1a559da90965812fdefcba0d54a59c41
+Subproject commit a9de01623044b3a5b2d614f0d7992a962b16b32f
diff --git a/update-force.bat b/update-force.bat
index 4d77460..8bf643f 100755
--- a/update-force.bat
+++ b/update-force.bat
@@ -6,10 +6,10 @@ python -m venv venv
 call .\venv\Scripts\activate.bat
 
 python -m pip install --upgrade pip
-python -m pip install -r .\dlas\requirements.txt
-python -m pip install -r .\tortoise-tts\requirements.txt
-python -m pip install -e .\tortoise-tts 
-python -m pip install -r .\requirements.txt
+python -m pip install -U -r .\dlas\requirements.txt
+python -m pip install -U -r .\tortoise-tts\requirements.txt
+python -m pip install -U -e .\tortoise-tts 
+python -m pip install -U -r .\requirements.txt
 
 pause
 deactivate
\ No newline at end of file