fixed version for GFPGAN and k-diffusion

made launcher always install requirements
bumped basicsr to 1.4.2 because someone wanted it

1 files changed, 2 insertions, 4 deletions

diff --git a/webui.bat b/webui.bat
index b1e84b7a..509830c8 100644
--- a/webui.bat
+++ b/webui.bat
@@ -73,7 +73,7 @@ goto :show_stdout_stderr
 %PYTHON% -c "import k_diffusion.sampling" >tmp/stdout.txt 2>tmp/stderr.txt

 if %ERRORLEVEL% == 0 goto :install_GFPGAN

 echo Installing K-Diffusion...

-%PYTHON% -m pip install git+https://github.com/crowsonkb/k-diffusion.git --prefer-binary --only-binary=psutil >tmp/stdout.txt 2>tmp/stderr.txt

+%PYTHON% -m pip install git+https://github.com/crowsonkb/k-diffusion.git@1a0703dfb7d24d8806267c3e7ccc4caf67fd1331 --prefer-binary --only-binary=psutil >tmp/stdout.txt 2>tmp/stderr.txt

 if %ERRORLEVEL% == 0 goto :install_GFPGAN

 goto :show_stdout_stderr

 

@@ -82,13 +82,11 @@ goto :show_stdout_stderr
 %PYTHON% -c "import gfpgan" >tmp/stdout.txt 2>tmp/stderr.txt

 if %ERRORLEVEL% == 0 goto :install_reqs

 echo Installing GFPGAN

-%PYTHON% -m pip install git+https://github.com/TencentARC/GFPGAN.git --prefer-binary >tmp/stdout.txt 2>tmp/stderr.txt

+%PYTHON% -m pip install git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 --prefer-binary >tmp/stdout.txt 2>tmp/stderr.txt

 if %ERRORLEVEL% == 0 goto :install_reqs

 goto :show_stdout_stderr

 

 :install_reqs

-%PYTHON% -c "import omegaconf; import fonts; import timm" >tmp/stdout.txt 2>tmp/stderr.txt

-if %ERRORLEVEL% == 0 goto :make_dirs

 echo Installing requirements...

 %PYTHON% -m pip install -r %REQS_FILE% --prefer-binary >tmp/stdout.txt 2>tmp/stderr.txt

 if %ERRORLEVEL% == 0 goto :make_dirs