From 0a54bd3395e30bf7772ad6f11d69c5c437a1ab73 Mon Sep 17 00:00:00 2001
From: d8ahazard <d8ahazard@gmail.com>
Date: Wed, 9 Nov 2022 11:15:17 -0600
Subject: Optional Accelerate Launch

---
 webui.bat | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'webui.bat')

diff --git a/webui.bat b/webui.bat
index a38a28bb..2a066d60 100644
--- a/webui.bat
+++ b/webui.bat
@@ -28,15 +28,28 @@ goto :show_stdout_stderr
 :activate_venv
 set PYTHON="%~dp0%VENV_DIR%\Scripts\Python.exe"
 echo venv %PYTHON%
+if [%ACCELERATE%] == ["True"] goto :accelerate
 goto :launch
 
 :skip_venv
 
+:accelerate
+echo "Checking for accelerate"
+dir %VENV_DIR%\Scripts\accelerate.exe >tmp/stdout.txt 2>tmp/stderr.txt
+if %ERRORLEVEL% == 0 goto :accelerate_launch
+
 :launch
 %PYTHON% launch.py %*
 pause
 exit /b
 
+:accelerate_launch
+echo "Accelerating2"
+set ACCELERATE="%~dp0%VENV_DIR%\Scripts\accelerate.exe"
+%ACCELERATE% launch --num_cpu_threads_per_process=6 launch.py
+pause
+exit /b
+
 :show_stdout_stderr
 
 echo.
-- 
cgit v1.2.3


From ac6fd2a5d91ca1ee36d721ef483b101597d3ee25 Mon Sep 17 00:00:00 2001
From: d8ahazard <d8ahazard@gmail.com>
Date: Thu, 10 Nov 2022 09:39:43 -0600
Subject: Fix accelerate check when spaces in path

---
 webui.bat | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'webui.bat')

diff --git a/webui.bat b/webui.bat
index 2a066d60..d4d626e2 100644
--- a/webui.bat
+++ b/webui.bat
@@ -35,8 +35,8 @@ goto :launch
 
 :accelerate
 echo "Checking for accelerate"
-dir %VENV_DIR%\Scripts\accelerate.exe >tmp/stdout.txt 2>tmp/stderr.txt
-if %ERRORLEVEL% == 0 goto :accelerate_launch
+set ACCELERATE="%~dp0%VENV_DIR%\Scripts\accelerate.exe"
+if EXIST %ACCELERATE% goto :accelerate_launch
 
 :launch
 %PYTHON% launch.py %*
@@ -44,8 +44,7 @@ pause
 exit /b
 
 :accelerate_launch
-echo "Accelerating2"
-set ACCELERATE="%~dp0%VENV_DIR%\Scripts\accelerate.exe"
+echo "Accelerating"
 %ACCELERATE% launch --num_cpu_threads_per_process=6 launch.py
 pause
 exit /b
-- 
cgit v1.2.3


From e2c8584f753b6fe8116f3032360a3b02e8398349 Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Tue, 10 Jan 2023 22:26:49 +0300
Subject: make VENV envvar accept absolute path instead of relative

---
 webui.bat | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'webui.bat')

diff --git a/webui.bat b/webui.bat
index d4d626e2..3a3e310a 100644
--- a/webui.bat
+++ b/webui.bat
@@ -1,7 +1,7 @@
 @echo off
 
 if not defined PYTHON (set PYTHON=python)
-if not defined VENV_DIR (set VENV_DIR=venv)
+if not defined VENV_DIR (set VENV_DIR=%~dp0\venv)
 
 set ERROR_REPORTING=FALSE
 
@@ -26,7 +26,7 @@ echo Unable to create venv in directory %VENV_DIR%
 goto :show_stdout_stderr
 
 :activate_venv
-set PYTHON="%~dp0%VENV_DIR%\Scripts\Python.exe"
+set PYTHON="%VENV_DIR%\Scripts\Python.exe"
 echo venv %PYTHON%
 if [%ACCELERATE%] == ["True"] goto :accelerate
 goto :launch
@@ -35,7 +35,7 @@ goto :launch
 
 :accelerate
 echo "Checking for accelerate"
-set ACCELERATE="%~dp0%VENV_DIR%\Scripts\accelerate.exe"
+set ACCELERATE="%VENV_DIR%\Scripts\accelerate.exe"
 if EXIST %ACCELERATE% goto :accelerate_launch
 
 :launch
-- 
cgit v1.2.3


From 9cfd10cdefc7b2966b8e42fbb0e05735967cf87b Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 11 Jan 2023 01:27:00 +0300
Subject: repair #6612

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

(limited to 'webui.bat')

diff --git a/webui.bat b/webui.bat
index 3a3e310a..e6a7a429 100644
--- a/webui.bat
+++ b/webui.bat
@@ -1,7 +1,7 @@
 @echo off
 
 if not defined PYTHON (set PYTHON=python)
-if not defined VENV_DIR (set VENV_DIR=%~dp0\venv)
+if not defined VENV_DIR (set VENV_DIR=%~dp0%venv)
 
 set ERROR_REPORTING=FALSE
 
@@ -13,16 +13,16 @@ echo Couldn't launch python
 goto :show_stdout_stderr
 
 :start_venv
-if [%VENV_DIR%] == [-] goto :skip_venv
+if ["%VENV_DIR%"] == ["-"] goto :skip_venv
 
-dir %VENV_DIR%\Scripts\Python.exe >tmp/stdout.txt 2>tmp/stderr.txt
+dir "%VENV_DIR%\Scripts\Python.exe" >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :activate_venv
 
 for /f "delims=" %%i in ('CALL %PYTHON% -c "import sys; print(sys.executable)"') do set PYTHON_FULLNAME="%%i"
 echo Creating venv in directory %VENV_DIR% using python %PYTHON_FULLNAME%
-%PYTHON_FULLNAME% -m venv %VENV_DIR% >tmp/stdout.txt 2>tmp/stderr.txt
+%PYTHON_FULLNAME% -m venv "%VENV_DIR%" >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :activate_venv
-echo Unable to create venv in directory %VENV_DIR%
+echo Unable to create venv in directory "%VENV_DIR%"
 goto :show_stdout_stderr
 
 :activate_venv
-- 
cgit v1.2.3