From 62f2a24cbce1a73f782e4ef2631d045fb05b4d1d Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sat, 10 Feb 2024 20:39:46 +0100
Subject: [PATCH 01/26] simplify entry.sh + move to IOPaint

---
 50.sh    | 12 ++++++------
 entry.sh | 47 +++++------------------------------------------
 2 files changed, 11 insertions(+), 48 deletions(-)

diff --git a/50.sh b/50.sh
index 336eabd..4ba2fb0 100755
--- a/50.sh
+++ b/50.sh
@@ -4,7 +4,7 @@ source /sl_folder.sh
 export PATH="/home/abc/miniconda3/bin:$PATH"
 
 mkdir -p "${SD50_DIR}"
-mkdir -p /config/outputs/50-Lama-cleaner
+mkdir -p /config/outputs/50-IOPaint
 
 if [ ! -d ${SD50_DIR}/env ]; then
     conda create -p ${SD50_DIR}/env -y
@@ -18,12 +18,12 @@ if [ ! -f "$SD50_DIR/parameters.txt" ]; then
     cp -v "${SD_INSTALL_DIR}/parameters/50.txt" "$SD50_DIR/parameters.txt"
 fi
 
-if [ ! -d ${SD50_DIR}/lama-cleaner ]; then
-    cd "${SD50_DIR}" && git clone https://github.com/Sanster/lama-cleaner
+if [ ! -d ${SD50_DIR}/IOPaint ]; then
+    cd "${SD50_DIR}" && git clone https://github.com/Sanster/IOPaint
 fi
 
-cd ${SD50_DIR}/lama-cleaner
-git config --global --add safe.directory ${SD50_DIR}/lama_cleaner
+cd ${SD50_DIR}/IOPaint
+#git config --global --add safe.directory ${SD50_DIR}/lama_cleaner
 git pull -X ours
 
 # chown -R diffusion:users ${BASE_DIR}
@@ -32,7 +32,7 @@ git pull -X ours
 #     su -w SD50_DIR - diffusion -c 'cd ${SD50_DIR} && python3 -m venv venv'
 # fi
 
-cd ${SD50_DIR}/lama-cleaner
+cd ${SD50_DIR}/IOPaint
 pip install -r requirements.txt
 
 CMD="python main.py"
diff --git a/entry.sh b/entry.sh
index 7ca8c00..6739b60 100644
--- a/entry.sh
+++ b/entry.sh
@@ -7,45 +7,8 @@ if [ ! -f "$BASE_DIR/scripts/custom-sample.sh" ]; then
     cp -v "/custom-sample.sh" "$BASE_DIR/scripts/custom-sample.sh"
 fi
 
-case $WEBUI_VERSION in
-  01)
-    . /01.sh
-    ;;
-  02)
-    . /02.sh
-    ;;
-  03)
-    . /03.sh
-    ;;
-  04)
-    . /04.sh
-    ;;
-  05)
-    . /05.sh
-    ;;
-  06)
-    . /06.sh
-    ;;
-  07)
-    . /07.sh
-    ;;
-  08)
-    . /08.sh
-    ;;
-  20)
-    . /20.sh
-    ;;
-  50)
-    . /50.sh
-    ;;
-  51)
-    . /51.sh
-    ;;
-  70)
-    . /70.sh
-    ;;
-  *)
-    . $BASE_DIR/scripts/$WEBUI_VERSION
-    echo error in webui selection variable
-    ;;
-esac
+. $BASE_DIR/$WEBUI_VERSION.sh
+. $BASE_DIR/$WEBUI_VERSION
+. $BASE_DIR/scripts/$WEBUI_VERSION
+. $BASE_DIR/scripts/$WEBUI_VERSION.sh 
+echo error in webui selection variable
\ No newline at end of file

From 07eff66599212227960960c18b14bb89499b4b74 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sat, 10 Feb 2024 20:40:31 +0100
Subject: [PATCH 02/26] fix entry.sh

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

diff --git a/entry.sh b/entry.sh
index 6739b60..5cd4093 100644
--- a/entry.sh
+++ b/entry.sh
@@ -7,8 +7,8 @@ if [ ! -f "$BASE_DIR/scripts/custom-sample.sh" ]; then
     cp -v "/custom-sample.sh" "$BASE_DIR/scripts/custom-sample.sh"
 fi
 
-. $BASE_DIR/$WEBUI_VERSION.sh
-. $BASE_DIR/$WEBUI_VERSION
+. /$WEBUI_VERSION.sh
+. /$WEBUI_VERSION
 . $BASE_DIR/scripts/$WEBUI_VERSION
 . $BASE_DIR/scripts/$WEBUI_VERSION.sh 
 echo error in webui selection variable
\ No newline at end of file

From 8ef569055cf7de96f2fba9bceee6457a0ef9813c Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sat, 10 Feb 2024 20:42:26 +0100
Subject: [PATCH 03/26] adjust IOPaint parameters

---
 parameters/50.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parameters/50.txt b/parameters/50.txt
index ca29ea0..50151d2 100644
--- a/parameters/50.txt
+++ b/parameters/50.txt
@@ -1,6 +1,6 @@
 ##### Web + Network #####
---host 0.0.0.0
---port 9000
+--host=0.0.0.0
+--port=9000
 
 ##### Directories #####
 #--output-dir /config/outputs/50-Lama-Cleaner

From 3bbfbb680891f13a779630601a16f9ccaf7f4039 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sat, 10 Feb 2024 20:42:51 +0100
Subject: [PATCH 04/26] fix IOPaint parameters

---
 parameters/50.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parameters/50.txt b/parameters/50.txt
index 50151d2..1198318 100644
--- a/parameters/50.txt
+++ b/parameters/50.txt
@@ -3,7 +3,7 @@
 --port=9000
 
 ##### Directories #####
-#--output-dir /config/outputs/50-Lama-Cleaner
+#--output-dir /config/outputs/50-IOPaint
 
 ##### Options #####
 --device cuda

From 12147c1dbe6a83ab4fa2beb7ba00d1e4ae8e1f41 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sat, 10 Feb 2024 20:57:16 +0100
Subject: [PATCH 05/26] fix parameters again

---
 parameters/50.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parameters/50.txt b/parameters/50.txt
index 1198318..2198008 100644
--- a/parameters/50.txt
+++ b/parameters/50.txt
@@ -7,4 +7,4 @@
 
 ##### Options #####
 --device cuda
---enable-xformers
+--enable-xformers
\ No newline at end of file

From 764a82d8e2e11ee0ef2b6a9fbe55ba1f440cc259 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sat, 10 Feb 2024 21:10:34 +0100
Subject: [PATCH 06/26] fix dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1a5b8e8..eafb59e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ ENV BASE_DIR=/config \
     SD07_DIR=/config/07-StableSwarm \
     SD08_DIR=/config/08-voltaML \
     SD20_DIR=/config/20-kubin \
-    SD50_DIR=/config/50-lama-cleaner \
+    SD50_DIR=/config/50-IOPaint \
     SD51_DIR=/config/51-facefusion \
     SD70_DIR=/config/70-kohya \
     XDG_CACHE_HOME=/config/temp

From 8aca5d3c794864c76243617da2e773642e7b6dc7 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sat, 10 Feb 2024 21:47:41 +0100
Subject: [PATCH 07/26] change install mode for IOPaint

---
 50.sh             | 26 +++++++++++++++-----------
 parameters/50.txt |  5 ++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/50.sh b/50.sh
index 4ba2fb0..a2008b0 100755
--- a/50.sh
+++ b/50.sh
@@ -3,7 +3,7 @@ source /sl_folder.sh
 
 export PATH="/home/abc/miniconda3/bin:$PATH"
 
-mkdir -p "${SD50_DIR}"
+mkdir -p "${SD50_DIR}/IOPaint"
 mkdir -p /config/outputs/50-IOPaint
 
 if [ ! -d ${SD50_DIR}/env ]; then
@@ -14,17 +14,17 @@ source activate ${SD50_DIR}/env
 conda install -n base conda-libmamba-solver -y
 conda install -c conda-forge git python=3.11 pip --solver=libmamba -y
 
-if [ ! -f "$SD50_DIR/parameters.txt" ]; then
-    cp -v "${SD_INSTALL_DIR}/parameters/50.txt" "$SD50_DIR/parameters.txt"
-fi
+#if [ ! -f "$SD50_DIR/parameters.txt" ]; then
+#    cp -v "${SD_INSTALL_DIR}/parameters/50.txt" "$SD50_DIR/parameters.txt"
+#fi
 
-if [ ! -d ${SD50_DIR}/IOPaint ]; then
-    cd "${SD50_DIR}" && git clone https://github.com/Sanster/IOPaint
-fi
+#if [ ! -d ${SD50_DIR}/IOPaint ]; then
+#    cd "${SD50_DIR}" && git clone https://github.com/Sanster/IOPaint
+#fi
 
-cd ${SD50_DIR}/IOPaint
+#cd ${SD50_DIR}/IOPaint
 #git config --global --add safe.directory ${SD50_DIR}/lama_cleaner
-git pull -X ours
+#git pull -X ours
 
 # chown -R diffusion:users ${BASE_DIR}
 
@@ -32,10 +32,14 @@ git pull -X ours
 #     su -w SD50_DIR - diffusion -c 'cd ${SD50_DIR} && python3 -m venv venv'
 # fi
 
+
 cd ${SD50_DIR}/IOPaint
-pip install -r requirements.txt
+#pip install -r requirements.txt
+
+pip3 install iopaint
+
 
-CMD="python main.py"
+CMD="iopaint start"
 while IFS= read -r param; do
     if [[ $param != \#* ]]; then
         CMD+=" ${param}"
diff --git a/parameters/50.txt b/parameters/50.txt
index 2198008..d6a2489 100644
--- a/parameters/50.txt
+++ b/parameters/50.txt
@@ -1,10 +1,9 @@
 ##### Web + Network #####
---host=0.0.0.0
 --port=9000
 
 ##### Directories #####
 #--output-dir /config/outputs/50-IOPaint
 
 ##### Options #####
---device cuda
---enable-xformers
\ No newline at end of file
+--device=cuda
+--model=lama
\ No newline at end of file

From bafe1cbdef3a483878f6de6728f435139fe65f3d Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sat, 10 Feb 2024 22:55:33 +0100
Subject: [PATCH 08/26] fix parameters not copied for IOPaint

---
 50.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/50.sh b/50.sh
index a2008b0..5d834c6 100755
--- a/50.sh
+++ b/50.sh
@@ -14,9 +14,9 @@ source activate ${SD50_DIR}/env
 conda install -n base conda-libmamba-solver -y
 conda install -c conda-forge git python=3.11 pip --solver=libmamba -y
 
-#if [ ! -f "$SD50_DIR/parameters.txt" ]; then
-#    cp -v "${SD_INSTALL_DIR}/parameters/50.txt" "$SD50_DIR/parameters.txt"
-#fi
+if [ ! -f "$SD50_DIR/parameters.txt" ]; then
+    cp -v "${SD_INSTALL_DIR}/parameters/50.txt" "$SD50_DIR/parameters.txt"
+fi
 
 #if [ ! -d ${SD50_DIR}/IOPaint ]; then
 #    cd "${SD50_DIR}" && git clone https://github.com/Sanster/IOPaint

From 7800873a56557711e04106136131b1b1e7d62373 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 11 Feb 2024 00:00:14 +0100
Subject: [PATCH 09/26] change IOPaint default parameters

---
 parameters/50.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parameters/50.txt b/parameters/50.txt
index d6a2489..c7d9ba2 100644
--- a/parameters/50.txt
+++ b/parameters/50.txt
@@ -1,8 +1,8 @@
 ##### Web + Network #####
+--host=0.0.0.0
 --port=9000
 
 ##### Directories #####
-#--output-dir /config/outputs/50-IOPaint
 
 ##### Options #####
 --device=cuda

From e6828fcc289717eb25b569722435e5c18ac5da68 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 12:01:01 +0100
Subject: [PATCH 10/26] add forge fork + add use of common folders

---
 02.forge.sh | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 02.sh       | 23 +++++++-------
 2 files changed, 102 insertions(+), 11 deletions(-)
 create mode 100644 02.forge.sh

diff --git a/02.forge.sh b/02.forge.sh
new file mode 100644
index 0000000..504b9e9
--- /dev/null
+++ b/02.forge.sh
@@ -0,0 +1,90 @@
+#!/bin/bash
+source /sl_folder.sh
+
+export PATH="/home/abc/miniconda3/bin:$PATH"
+
+export use_venv=1
+
+# Install or update Stable-Diffusion-WebUI
+mkdir -p ${SD02_DIR}
+
+if [ ! -d ${SD02_DIR}/conda-env ]; then
+    conda create -p ${SD02_DIR}/conda-env -y
+fi
+
+source activate ${SD02_DIR}/conda-env
+conda install -n base conda-libmamba-solver -y
+conda install -c conda-forge git python=3.11 pip gcc gxx libcurand --solver=libmamba -y
+
+
+
+if [ ! -d ${SD02_DIR}/forge ]; then
+    git clone https://github.com/lllyasviel/stable-diffusion-webui-forge.git ${SD02_DIR}/forge
+fi
+
+cd ${SD02_DIR}/forge
+
+if [ -d "${SD02_DIR}/python-venv" ]; then
+    # check if remote is ahead of local
+    # https://stackoverflow.com/a/25109122/1469797
+    if [ "$CLEAN_ENV" != "true" ] && [ $(git rev-parse HEAD) = $(git ls-remote $(git rev-parse --abbrev-ref @{u} | \
+    sed 's/\// /g') | cut -f1) ]; then
+         echo "Local branch up-to-date, keeping existing venv"
+      else
+        if [ "$CLEAN_ENV" = "true" ]; then
+          echo "Forced wiping venv for clean packages install"
+        else
+          echo "Remote branch is ahead. Wiping venv for clean packages install"
+        fi
+        rm -rf ${SD02_DIR}/python-venv
+        git pull -X ours
+    fi
+fi
+
+if [ ! -f "$SD02_DIR/parameters.txt" ]; then
+    cp -v "/opt/sd-install/parameters/02.txt" "$SD02_DIR/parameters.txt"
+fi
+
+# Create venv
+if [ ! -d ${SD02_DIR}/python-venv ]; then
+    cd ${SD02_DIR}
+    python -m venv python-venv
+    cd ${SD02_DIR}
+    source python-venv/bin/activate
+    pip install --upgrade pip
+    pip install packaging
+    pip install onnxruntime-gpu
+    pip install insightface 
+    pip install protobuf==3.20.3
+    deactivate
+fi
+
+# Merge Models, vae, lora, and hypernetworks, and outputs
+# Ignore move errors if they occur
+sl_folder ${SD02_DIR}/forge/models Stable-diffusion ${BASE_DIR}/models stable-diffusion
+sl_folder ${SD02_DIR}/forge/models hypernetworks ${BASE_DIR}/models hypernetwork
+sl_folder ${SD02_DIR}/forge/models Lora ${BASE_DIR}/models lora
+sl_folder ${SD02_DIR}/forge/models VAE ${BASE_DIR}/models vae
+sl_folder ${SD02_DIR}/forge embeddings ${BASE_DIR}/models embeddings
+sl_folder ${SD02_DIR}/forge/models ESRGAN ${BASE_DIR}/models upscale
+sl_folder ${SD02_DIR}/forge/models BLIP ${BASE_DIR}/models blip
+sl_folder ${SD02_DIR}/forge/models Codeformer ${BASE_DIR}/models codeformer
+sl_folder ${SD02_DIR}/forge/models GFPGAN ${BASE_DIR}/models gfpgan
+sl_folder ${SD02_DIR}/forge/models LDSR ${BASE_DIR}/models ldsr
+sl_folder ${SD02_DIR}/forge/models ControlNet ${BASE_DIR}/models controlnet
+
+sl_folder ${SD02_DIR}/forge outputs ${BASE_DIR}/outputs 02-sd-webui
+
+echo "Run Stable-Diffusion-WebUI-forge"
+cd ${SD02_DIR}
+source python-venv/bin/activate
+export PATH="/config/02-sd-webui/forge/python-venv/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
+pip install --upgrade pip
+
+CMD="bash webui.sh"
+while IFS= read -r param; do
+    if [[ $param != \#* ]]; then
+        CMD+=" ${param}"
+    fi
+done < "${SD02_DIR}/parameters.txt"
+eval $CMD
diff --git a/02.sh b/02.sh
index d9e7334..083eb62 100755
--- a/02.sh
+++ b/02.sh
@@ -8,11 +8,11 @@ export use_venv=1
 # Install or update Stable-Diffusion-WebUI
 mkdir -p ${SD02_DIR}
 
-if [ ! -d ${SD02_DIR}/env ]; then
-    conda create -p ${SD02_DIR}/env -y
+if [ ! -d ${SD02_DIR}/conda-env ]; then
+    conda create -p ${SD02_DIR}/conda-env -y
 fi
 
-source activate ${SD02_DIR}/env
+source activate ${SD02_DIR}/conda-env
 conda install -n base conda-libmamba-solver -y
 conda install -c conda-forge git python=3.11 pip gcc gxx libcurand --solver=libmamba -y
 
@@ -24,7 +24,7 @@ fi
 
 cd ${SD02_DIR}/webui
 
-if [ -d "${SD02_DIR}/webui/venv" ]; then
+if [ -d "${SD02_DIR}/python-venv" ]; then
     # check if remote is ahead of local
     # https://stackoverflow.com/a/25109122/1469797
     if [ "$CLEAN_ENV" != "true" ] && [ $(git rev-parse HEAD) = $(git ls-remote $(git rev-parse --abbrev-ref @{u} | \
@@ -36,7 +36,7 @@ if [ -d "${SD02_DIR}/webui/venv" ]; then
         else
           echo "Remote branch is ahead. Wiping venv for clean packages install"
         fi
-        rm -rf ${SD02_DIR}/webui/venv
+        rm -rf ${SD02_DIR}/python-venv
         git pull -X ours
     fi
 fi
@@ -46,11 +46,11 @@ if [ ! -f "$SD02_DIR/parameters.txt" ]; then
 fi
 
 # Create venv
-if [ ! -d ${SD02_DIR}/webui/venv ]; then
+if [ ! -d ${SD02_DIR}/python-venv ]; then
+    cd ${SD02_DIR}
+    python -m venv python-venv
     cd ${SD02_DIR}/webui
-    python -m venv venv
-    cd ${SD02_DIR}/webui
-    source venv/bin/activate
+    source python-venv/bin/activate
     pip install --upgrade pip
     pip install packaging
     pip install onnxruntime-gpu
@@ -71,13 +71,14 @@ sl_folder ${SD02_DIR}/webui/models BLIP ${BASE_DIR}/models blip
 sl_folder ${SD02_DIR}/webui/models Codeformer ${BASE_DIR}/models codeformer
 sl_folder ${SD02_DIR}/webui/models GFPGAN ${BASE_DIR}/models gfpgan
 sl_folder ${SD02_DIR}/webui/models LDSR ${BASE_DIR}/models ldsr
+sl_folder ${SD02_DIR}/webui/models ControlNet ${BASE_DIR}/models controlnet
 
 sl_folder ${SD02_DIR}/webui outputs ${BASE_DIR}/outputs 02-sd-webui
 
 echo "Run Stable-Diffusion-WebUI"
 cd ${SD02_DIR}/webui
-source venv/bin/activate
-export PATH="/config/02-sd-webui/webui/venv/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
+source python-venv/bin/activate
+export PATH="/config/02-sd-webui/forge/python-venv/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 pip install --upgrade pip
 
 CMD="bash webui.sh"

From 7f0ae3c97eab96dcdee72dcc889468da9d2dbb37 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 14:20:18 +0100
Subject: [PATCH 11/26] don't use python venv for forge

---
 02.forge.sh | 65 +++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 35 deletions(-)

diff --git a/02.forge.sh b/02.forge.sh
index 504b9e9..4325d09 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -2,8 +2,10 @@
 source /sl_folder.sh
 
 export PATH="/home/abc/miniconda3/bin:$PATH"
+export active_clean=0
 
-export use_venv=1
+# disable the use of a python venv
+export venv_dir="-"
 
 # Install or update Stable-Diffusion-WebUI
 mkdir -p ${SD02_DIR}
@@ -12,11 +14,9 @@ if [ ! -d ${SD02_DIR}/conda-env ]; then
     conda create -p ${SD02_DIR}/conda-env -y
 fi
 
-source activate ${SD02_DIR}/conda-env
+conda activate ${SD02_DIR}/conda-env
 conda install -n base conda-libmamba-solver -y
-conda install -c conda-forge git python=3.11 pip gcc gxx libcurand --solver=libmamba -y
-
-
+conda install -c git python=3.11 pip --solver=libmamba -y
 
 if [ ! -d ${SD02_DIR}/forge ]; then
     git clone https://github.com/lllyasviel/stable-diffusion-webui-forge.git ${SD02_DIR}/forge
@@ -24,40 +24,39 @@ fi
 
 cd ${SD02_DIR}/forge
 
-if [ -d "${SD02_DIR}/python-venv" ]; then
-    # check if remote is ahead of local
-    # https://stackoverflow.com/a/25109122/1469797
-    if [ "$CLEAN_ENV" != "true" ] && [ $(git rev-parse HEAD) = $(git ls-remote $(git rev-parse --abbrev-ref @{u} | \
-    sed 's/\// /g') | cut -f1) ]; then
-         echo "Local branch up-to-date, keeping existing venv"
-      else
+# check if remote is ahead of local
+# https://stackoverflow.com/a/25109122/1469797
+if [ "$CLEAN_ENV" != "true" ] && [ $(git rev-parse HEAD) = $(git ls-remote $(git rev-parse --abbrev-ref @{u} | \
+sed 's/\// /g') | cut -f1) ]; then
+    echo "Local branch up-to-date, keeping existing venv"
+    else
         if [ "$CLEAN_ENV" = "true" ]; then
-          echo "Forced wiping venv for clean packages install"
+        echo "Forced wiping venv for clean packages install"
         else
-          echo "Remote branch is ahead. Wiping venv for clean packages install"
+        echo "Remote branch is ahead. Wiping venv for clean packages install"
         fi
-        rm -rf ${SD02_DIR}/python-venv
-        git pull -X ours
-    fi
+    export active_clean=1
+    git pull -X ours
 fi
 
+#clean conda env
+if [ "$active_clean" = "1" ]; then
+    conda deactivate
+    conda remove -p ${SD02_DIR}/conda-env --all -y
+    conda create -p ${SD02_DIR}/conda-env -y
+    conda activate ${SD02_DIR}/conda-env
+fi
+conda install -c conda-forge git python=3.11 pip gcc gxx libcurand --solver=libmamba -y
+
 if [ ! -f "$SD02_DIR/parameters.txt" ]; then
     cp -v "/opt/sd-install/parameters/02.txt" "$SD02_DIR/parameters.txt"
 fi
 
-# Create venv
-if [ ! -d ${SD02_DIR}/python-venv ]; then
-    cd ${SD02_DIR}
-    python -m venv python-venv
-    cd ${SD02_DIR}
-    source python-venv/bin/activate
-    pip install --upgrade pip
-    pip install packaging
-    pip install onnxruntime-gpu
-    pip install insightface 
-    pip install protobuf==3.20.3
-    deactivate
-fi
+pip install --upgrade pip
+pip install packaging
+pip install onnxruntime-gpu
+pip install insightface 
+pip install protobuf==3.20.3
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur
@@ -76,11 +75,7 @@ sl_folder ${SD02_DIR}/forge/models ControlNet ${BASE_DIR}/models controlnet
 sl_folder ${SD02_DIR}/forge outputs ${BASE_DIR}/outputs 02-sd-webui
 
 echo "Run Stable-Diffusion-WebUI-forge"
-cd ${SD02_DIR}
-source python-venv/bin/activate
-export PATH="/config/02-sd-webui/forge/python-venv/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
-pip install --upgrade pip
-
+cd ${SD02_DIR}/forge
 CMD="bash webui.sh"
 while IFS= read -r param; do
     if [[ $param != \#* ]]; then

From 5c817140f0314221bcd55a6e79f85dae5b1cb83f Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 14:31:15 +0100
Subject: [PATCH 12/26] add conda init

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

diff --git a/02.forge.sh b/02.forge.sh
index 4325d09..e2ae422 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -10,6 +10,8 @@ export venv_dir="-"
 # Install or update Stable-Diffusion-WebUI
 mkdir -p ${SD02_DIR}
 
+conda init
+
 if [ ! -d ${SD02_DIR}/conda-env ]; then
     conda create -p ${SD02_DIR}/conda-env -y
 fi

From 5afcff8e806bf914ec35b81beff8ff2a05ee60dc Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 14:43:48 +0100
Subject: [PATCH 13/26] fix conda activate

---
 02.forge.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/02.forge.sh b/02.forge.sh
index e2ae422..d08a8e8 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -10,13 +10,11 @@ export venv_dir="-"
 # Install or update Stable-Diffusion-WebUI
 mkdir -p ${SD02_DIR}
 
-conda init
-
 if [ ! -d ${SD02_DIR}/conda-env ]; then
     conda create -p ${SD02_DIR}/conda-env -y
 fi
 
-conda activate ${SD02_DIR}/conda-env
+source activate ${SD02_DIR}/conda-env
 conda install -n base conda-libmamba-solver -y
 conda install -c git python=3.11 pip --solver=libmamba -y
 
@@ -46,7 +44,7 @@ if [ "$active_clean" = "1" ]; then
     conda deactivate
     conda remove -p ${SD02_DIR}/conda-env --all -y
     conda create -p ${SD02_DIR}/conda-env -y
-    conda activate ${SD02_DIR}/conda-env
+    source activate ${SD02_DIR}/conda-env
 fi
 conda install -c conda-forge git python=3.11 pip gcc gxx libcurand --solver=libmamba -y
 

From 166ba54cabf3635aec875da722c6b085cf0716a0 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 15:16:16 +0100
Subject: [PATCH 14/26] remove python venv for 02 + 02.forge

---
 02.sh             | 61 ++++++++++++++++++++++-------------------------
 parameters/02.txt |  3 ++-
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/02.sh b/02.sh
index 083eb62..cd61e4a 100755
--- a/02.sh
+++ b/02.sh
@@ -2,8 +2,10 @@
 source /sl_folder.sh
 
 export PATH="/home/abc/miniconda3/bin:$PATH"
+export active_clean=0
 
-export use_venv=1
+# disable the use of a python venv
+export venv_dir="-"
 
 # Install or update Stable-Diffusion-WebUI
 mkdir -p ${SD02_DIR}
@@ -14,9 +16,7 @@ fi
 
 source activate ${SD02_DIR}/conda-env
 conda install -n base conda-libmamba-solver -y
-conda install -c conda-forge git python=3.11 pip gcc gxx libcurand --solver=libmamba -y
-
-
+conda install -c git python=3.11 pip --solver=libmamba -y
 
 if [ ! -d ${SD02_DIR}/webui ]; then
     git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui ${SD02_DIR}/webui
@@ -24,40 +24,39 @@ fi
 
 cd ${SD02_DIR}/webui
 
-if [ -d "${SD02_DIR}/python-venv" ]; then
-    # check if remote is ahead of local
-    # https://stackoverflow.com/a/25109122/1469797
-    if [ "$CLEAN_ENV" != "true" ] && [ $(git rev-parse HEAD) = $(git ls-remote $(git rev-parse --abbrev-ref @{u} | \
-    sed 's/\// /g') | cut -f1) ]; then
-         echo "Local branch up-to-date, keeping existing venv"
-      else
+# check if remote is ahead of local
+# https://stackoverflow.com/a/25109122/1469797
+if [ "$CLEAN_ENV" != "true" ] && [ $(git rev-parse HEAD) = $(git ls-remote $(git rev-parse --abbrev-ref @{u} | \
+sed 's/\// /g') | cut -f1) ]; then
+    echo "Local branch up-to-date, keeping existing venv"
+    else
         if [ "$CLEAN_ENV" = "true" ]; then
-          echo "Forced wiping venv for clean packages install"
+        echo "Forced wiping venv for clean packages install"
         else
-          echo "Remote branch is ahead. Wiping venv for clean packages install"
+        echo "Remote branch is ahead. Wiping venv for clean packages install"
         fi
-        rm -rf ${SD02_DIR}/python-venv
-        git pull -X ours
-    fi
+    export active_clean=1
+    git pull -X ours
+fi
+
+#clean conda env
+if [ "$active_clean" = "1" ]; then
+    conda deactivate
+    conda remove -p ${SD02_DIR}/conda-env --all -y
+    conda create -p ${SD02_DIR}/conda-env -y
+    source activate ${SD02_DIR}/conda-env
 fi
+conda install -c conda-forge git python=3.11 pip gcc gxx libcurand --solver=libmamba -y
 
 if [ ! -f "$SD02_DIR/parameters.txt" ]; then
     cp -v "/opt/sd-install/parameters/02.txt" "$SD02_DIR/parameters.txt"
 fi
 
-# Create venv
-if [ ! -d ${SD02_DIR}/python-venv ]; then
-    cd ${SD02_DIR}
-    python -m venv python-venv
-    cd ${SD02_DIR}/webui
-    source python-venv/bin/activate
-    pip install --upgrade pip
-    pip install packaging
-    pip install onnxruntime-gpu
-    pip install insightface 
-    pip install protobuf==3.20.3
-    deactivate
-fi
+pip install --upgrade pip
+pip install packaging
+pip install onnxruntime-gpu
+pip install insightface 
+pip install protobuf==3.20.3
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur
@@ -77,10 +76,6 @@ sl_folder ${SD02_DIR}/webui outputs ${BASE_DIR}/outputs 02-sd-webui
 
 echo "Run Stable-Diffusion-WebUI"
 cd ${SD02_DIR}/webui
-source python-venv/bin/activate
-export PATH="/config/02-sd-webui/forge/python-venv/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
-pip install --upgrade pip
-
 CMD="bash webui.sh"
 while IFS= read -r param; do
     if [[ $param != \#* ]]; then
diff --git a/parameters/02.txt b/parameters/02.txt
index f7a2a25..32fef65 100644
--- a/parameters/02.txt
+++ b/parameters/02.txt
@@ -4,9 +4,10 @@
 
 # options
 --enable-insecure-extension-access
---medvram
 --xformers
 --api
+--cuda-malloc
+--cuda-stream
 
 #--no-half-vae
 #--disable-nan-check

From ec5dbd3a4f2e191c2d6f841cee0b67780e37870e Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 15:39:17 +0100
Subject: [PATCH 15/26] add onxx path

---
 02.forge.sh | 1 +
 02.sh       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/02.forge.sh b/02.forge.sh
index d08a8e8..74714c3 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -57,6 +57,7 @@ pip install packaging
 pip install onnxruntime-gpu
 pip install insightface 
 pip install protobuf==3.20.3
+export PATH="/config/02-sd-webui/conda-venv/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur
diff --git a/02.sh b/02.sh
index cd61e4a..9aefb9c 100755
--- a/02.sh
+++ b/02.sh
@@ -57,6 +57,7 @@ pip install packaging
 pip install onnxruntime-gpu
 pip install insightface 
 pip install protobuf==3.20.3
+export PATH="/config/02-sd-webui/conda-venv/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur

From 73cd2223e33381c2c52c66814b9a63a47f363b33 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 16:06:33 +0100
Subject: [PATCH 16/26] fix typo

---
 02.forge.sh | 2 +-
 02.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/02.forge.sh b/02.forge.sh
index 74714c3..15ff79a 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -57,7 +57,7 @@ pip install packaging
 pip install onnxruntime-gpu
 pip install insightface 
 pip install protobuf==3.20.3
-export PATH="/config/02-sd-webui/conda-venv/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
+export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur
diff --git a/02.sh b/02.sh
index 9aefb9c..13a150c 100755
--- a/02.sh
+++ b/02.sh
@@ -57,7 +57,7 @@ pip install packaging
 pip install onnxruntime-gpu
 pip install insightface 
 pip install protobuf==3.20.3
-export PATH="/config/02-sd-webui/conda-venv/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
+export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur

From 88137c09ad1b403542943c059222d7c010b5f4fa Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 16:50:29 +0100
Subject: [PATCH 17/26] update onxx for cuda 12.x

---
 02.forge.sh | 4 ++--
 02.sh       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/02.forge.sh b/02.forge.sh
index 15ff79a..1fad502 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -54,10 +54,10 @@ fi
 
 pip install --upgrade pip
 pip install packaging
-pip install onnxruntime-gpu
+pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
 pip install insightface 
 pip install protobuf==3.20.3
-export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
+#export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur
diff --git a/02.sh b/02.sh
index 13a150c..3d8b0a3 100755
--- a/02.sh
+++ b/02.sh
@@ -54,10 +54,10 @@ fi
 
 pip install --upgrade pip
 pip install packaging
-pip install onnxruntime-gpu
+pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
 pip install insightface 
 pip install protobuf==3.20.3
-export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
+#export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur

From a60614c1742752c7b90e1d9ef16eaf8bdd94fcdb Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 17:03:45 +0100
Subject: [PATCH 18/26] fix path onxx

---
 02.forge.sh | 2 +-
 02.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/02.forge.sh b/02.forge.sh
index 1fad502..52b8735 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -57,7 +57,7 @@ pip install packaging
 pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
 pip install insightface 
 pip install protobuf==3.20.3
-#export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
+export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur
diff --git a/02.sh b/02.sh
index 3d8b0a3..f034934 100755
--- a/02.sh
+++ b/02.sh
@@ -57,7 +57,7 @@ pip install packaging
 pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
 pip install insightface 
 pip install protobuf==3.20.3
-#export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
+export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur

From 254b24e2f9602596911bd61f60574e47d5709abe Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 18:45:08 +0100
Subject: [PATCH 19/26] onxx fix for auto1111

---
 02.forge.sh | 2 +-
 02.sh       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/02.forge.sh b/02.forge.sh
index 52b8735..1fad502 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -57,7 +57,7 @@ pip install packaging
 pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
 pip install insightface 
 pip install protobuf==3.20.3
-export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
+#export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur
diff --git a/02.sh b/02.sh
index f034934..652449a 100755
--- a/02.sh
+++ b/02.sh
@@ -57,7 +57,6 @@ pip install packaging
 pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
 pip install insightface 
 pip install protobuf==3.20.3
-export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur

From a3b21033bfb963ac17740cc3fb5b58e9a4281cee Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 19:51:41 +0100
Subject: [PATCH 20/26] dedicated parameters for forge + fix auto1111
 parameters

---
 02.forge.sh             |  4 ++--
 parameters/02.forge.txt | 16 ++++++++++++++++
 parameters/02.txt       |  2 --
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 parameters/02.forge.txt

diff --git a/02.forge.sh b/02.forge.sh
index 1fad502..1b7f912 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -48,8 +48,8 @@ if [ "$active_clean" = "1" ]; then
 fi
 conda install -c conda-forge git python=3.11 pip gcc gxx libcurand --solver=libmamba -y
 
-if [ ! -f "$SD02_DIR/parameters.txt" ]; then
-    cp -v "/opt/sd-install/parameters/02.txt" "$SD02_DIR/parameters.txt"
+if [ ! -f "$SD02_DIR/parameters.forge.txt" ]; then
+    cp -v "/opt/sd-install/parameters/02.forge.txt" "$SD02_DIR/parameters.forge.txt"
 fi
 
 pip install --upgrade pip
diff --git a/parameters/02.forge.txt b/parameters/02.forge.txt
new file mode 100644
index 0000000..32fef65
--- /dev/null
+++ b/parameters/02.forge.txt
@@ -0,0 +1,16 @@
+# Web + Network
+--listen
+--port 9000
+
+# options
+--enable-insecure-extension-access
+--xformers
+--api
+--cuda-malloc
+--cuda-stream
+
+#--no-half-vae
+#--disable-nan-check
+#--update-all-extensions
+#--reinstall-xformers
+#--reinstall-torch  
diff --git a/parameters/02.txt b/parameters/02.txt
index 32fef65..b911eef 100644
--- a/parameters/02.txt
+++ b/parameters/02.txt
@@ -6,8 +6,6 @@
 --enable-insecure-extension-access
 --xformers
 --api
---cuda-malloc
---cuda-stream
 
 #--no-half-vae
 #--disable-nan-check

From 06463e55907f782c4dda7adbdddd27ad515a0272 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Sun, 25 Feb 2024 21:54:54 +0100
Subject: [PATCH 21/26] final fixes sdwebui+forge

---
 02.forge.sh       | 3 +--
 02.sh             | 2 +-
 parameters/02.txt | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/02.forge.sh b/02.forge.sh
index 1b7f912..0838c6e 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -54,10 +54,9 @@ fi
 
 pip install --upgrade pip
 pip install packaging
-pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
+pip install onnxruntime-gpu
 pip install insightface 
 pip install protobuf==3.20.3
-#export PATH="/config/02-sd-webui/conda-env/lib/python3.11/site-packages/onnxruntime/capi:$PATH"
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur
diff --git a/02.sh b/02.sh
index 652449a..cd61e4a 100755
--- a/02.sh
+++ b/02.sh
@@ -54,7 +54,7 @@ fi
 
 pip install --upgrade pip
 pip install packaging
-pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
+pip install onnxruntime-gpu
 pip install insightface 
 pip install protobuf==3.20.3
 
diff --git a/parameters/02.txt b/parameters/02.txt
index b911eef..cd191ee 100644
--- a/parameters/02.txt
+++ b/parameters/02.txt
@@ -4,6 +4,7 @@
 
 # options
 --enable-insecure-extension-access
+--medvram
 --xformers
 --api
 
@@ -11,4 +12,4 @@
 #--disable-nan-check
 #--update-all-extensions
 #--reinstall-xformers
-#--reinstall-torch  
+#--reinstall-torch 

From bcd08f2ddc84491230a5c4df60a9433b13d04b92 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Tue, 27 Feb 2024 09:33:04 +0100
Subject: [PATCH 22/26] Update 02.forge.sh

Fix :
forge wasn't running with the correct parameters config file
---
 02.forge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/02.forge.sh b/02.forge.sh
index 0838c6e..e1d70d8 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -81,5 +81,5 @@ while IFS= read -r param; do
     if [[ $param != \#* ]]; then
         CMD+=" ${param}"
     fi
-done < "${SD02_DIR}/parameters.txt"
+done < "${SD02_DIR}/parameters.forge.txt"
 eval $CMD

From a7af65e8578882697800884bc58a12f9c1f847d9 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Tue, 27 Feb 2024 11:11:42 +0100
Subject: [PATCH 23/26] Update Dockerfile (add bc command)

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index eafb59e..4ddbc3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get update -y -q=2 && \
     apt-get install -y -q=2 curl \
     wget \
     mc \
+    bc \
     nano \
     rsync \
     libgl1-mesa-glx \

From 40e2b665bb76e0dc95bfbcc32d4f9e05756b8b06 Mon Sep 17 00:00:00 2001
From: Holaf <32452391+grokuku@users.noreply.github.com>
Date: Tue, 27 Feb 2024 12:04:23 +0100
Subject: [PATCH 24/26] Update 02.forge.sh

Fix ouput wrong folder
---
 02.forge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/02.forge.sh b/02.forge.sh
index e1d70d8..a873e4f 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -72,7 +72,7 @@ sl_folder ${SD02_DIR}/forge/models GFPGAN ${BASE_DIR}/models gfpgan
 sl_folder ${SD02_DIR}/forge/models LDSR ${BASE_DIR}/models ldsr
 sl_folder ${SD02_DIR}/forge/models ControlNet ${BASE_DIR}/models controlnet
 
-sl_folder ${SD02_DIR}/forge outputs ${BASE_DIR}/outputs 02-sd-webui
+sl_folder ${SD02_DIR}/forge output ${BASE_DIR}/outputs 02-sd-webui
 
 echo "Run Stable-Diffusion-WebUI-forge"
 cd ${SD02_DIR}/forge

From b9569a5b67550964920526535d0eb41ceb8fbeae Mon Sep 17 00:00:00 2001
From: nico <nico@holaf.fr>
Date: Sun, 3 Mar 2024 12:08:33 +0100
Subject: [PATCH 25/26] update onxx for cuda 12 (auto1111 + forge)

---
 02.forge.sh | 2 +-
 02.sh       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/02.forge.sh b/02.forge.sh
index a873e4f..3fbb569 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -54,7 +54,7 @@ fi
 
 pip install --upgrade pip
 pip install packaging
-pip install onnxruntime-gpu
+pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
 pip install insightface 
 pip install protobuf==3.20.3
 
diff --git a/02.sh b/02.sh
index cd61e4a..1a034aa 100755
--- a/02.sh
+++ b/02.sh
@@ -54,9 +54,9 @@ fi
 
 pip install --upgrade pip
 pip install packaging
-pip install onnxruntime-gpu
+pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
 pip install insightface 
-pip install protobuf==3.20.3
+#pip install protobuf==3.20.3
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur

From 43e71014d29b56245e3eb6029332e93690b2bc46 Mon Sep 17 00:00:00 2001
From: nico <nico@holaf.fr>
Date: Sun, 3 Mar 2024 18:16:39 +0100
Subject: [PATCH 26/26] upgrade to onxx for cuda12

---
 02.forge.sh | 3 ++-
 02.sh       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/02.forge.sh b/02.forge.sh
index 3fbb569..43578bc 100644
--- a/02.forge.sh
+++ b/02.forge.sh
@@ -56,7 +56,8 @@ pip install --upgrade pip
 pip install packaging
 pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
 pip install insightface 
-pip install protobuf==3.20.3
+pip install basicsr
+#pip install protobuf==3.20.3
 
 # Merge Models, vae, lora, and hypernetworks, and outputs
 # Ignore move errors if they occur
diff --git a/02.sh b/02.sh
index 1a034aa..a0d1402 100755
--- a/02.sh
+++ b/02.sh
@@ -55,7 +55,8 @@ fi
 pip install --upgrade pip
 pip install packaging
 pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
-pip install insightface 
+pip install insightface
+pip install basicsr 
 #pip install protobuf==3.20.3
 
 # Merge Models, vae, lora, and hypernetworks, and outputs