Merge branch 'master' into tensorboard

1 files changed, 18 insertions, 6 deletions

diff --git a/webui.bat b/webui.bat
index a38a28bb..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=venv)

+if not defined VENV_DIR (set VENV_DIR=%~dp0%venv)

 

 set ERROR_REPORTING=FALSE

 

@@ -13,30 +13,42 @@ 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

-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

 

 :skip_venv

 

+:accelerate

+echo "Checking for accelerate"

+set ACCELERATE="%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.