Merge pull request #4527 from d8ahazard/Accelerate

Optional Accelerate Launch

requirements.txt

@@ -1,3 +1,4 @@
+accelerate
 basicsr
 diffusers
 fairscale==0.4.4

requirements_versions.txt

@@ -1,5 +1,6 @@
 transformers==4.19.2
 diffusers==0.3.0
+accelerate==0.12.0
 basicsr==1.4.2
 gfpgan==1.3.8
 gradio==3.9

webui-user.bat

@@ -4,5 +4,6 @@ set PYTHON=
 set GIT=
 set VENV_DIR=
 set COMMANDLINE_ARGS=
+set ACCELERATE=
 
 call webui.bat

webui-user.sh

@@ -40,4 +40,7 @@ export COMMANDLINE_ARGS=""
 #export CODEFORMER_COMMIT_HASH=""
 #export BLIP_COMMIT_HASH=""
 
+# Uncomment to enable accelerated launch
+#export ACCELERATE="True"
+
 ###########################################

webui.bat

@@ -28,15 +28,27 @@ 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"
+set ACCELERATE="%~dp0%VENV_DIR%\Scripts\accelerate.exe"
+if EXIST %ACCELERATE% goto :accelerate_launch
+
 :launch
 %PYTHON% launch.py %*
 pause
 exit /b
 
+:accelerate_launch
+echo "Accelerating"
+%ACCELERATE% launch --num_cpu_threads_per_process=6 launch.py
+pause
+exit /b
+
 :show_stdout_stderr
 
 echo.

webui.sh

@@ -134,7 +134,15 @@ else
     exit 1
 fi
 
-printf "\n%s\n" "${delimiter}"
-printf "Launching launch.py..."
-printf "\n%s\n" "${delimiter}"
-"${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
+if [[ ! -z "${ACCELERATE}" ]] && [ ${ACCELERATE}="True" ] && [ -x "$(command -v accelerate)" ]
+then
+    printf "\n%s\n" "${delimiter}"
+    printf "Accelerating launch.py..."
+    printf "\n%s\n" "${delimiter}"
+    accelerate launch --num_cpu_threads_per_process=6 "${LAUNCH_SCRIPT}" "$@"
+else
+    printf "\n%s\n" "${delimiter}"
+    printf "Launching launch.py..."
+    printf "\n%s\n" "${delimiter}"
+    "${python_cmd}" "${LAUNCH_SCRIPT}" "$@"
+fi