fixed version for GFPGAN and k-diffusion

made launcher always install requirements
bumped basicsr to 1.4.2 because someone wanted it
This commit is contained in:
AUTOMATIC 2022-09-13 00:24:37 +03:00
parent 19a817d97d
commit ac9b2ec010
3 changed files with 4 additions and 6 deletions

View File

@ -14,6 +14,6 @@ scikit-image
fonts fonts
font-roboto font-roboto
git+https://github.com/crowsonkb/k-diffusion.git git+https://github.com/crowsonkb/k-diffusion.git
git+https://github.com/TencentARC/GFPGAN.git git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379
timm==0.4.12 timm==0.4.12
fairscale==0.4.4 fairscale==0.4.4

View File

@ -1,4 +1,4 @@
basicsr==1.3.5 basicsr==1.4.2
gfpgan gfpgan
gradio==3.3 gradio==3.3
numpy==1.23.3 numpy==1.23.3

View File

@ -73,7 +73,7 @@ goto :show_stdout_stderr
%PYTHON% -c "import k_diffusion.sampling" >tmp/stdout.txt 2>tmp/stderr.txt %PYTHON% -c "import k_diffusion.sampling" >tmp/stdout.txt 2>tmp/stderr.txt
if %ERRORLEVEL% == 0 goto :install_GFPGAN if %ERRORLEVEL% == 0 goto :install_GFPGAN
echo Installing K-Diffusion... 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 if %ERRORLEVEL% == 0 goto :install_GFPGAN
goto :show_stdout_stderr goto :show_stdout_stderr
@ -82,13 +82,11 @@ goto :show_stdout_stderr
%PYTHON% -c "import gfpgan" >tmp/stdout.txt 2>tmp/stderr.txt %PYTHON% -c "import gfpgan" >tmp/stdout.txt 2>tmp/stderr.txt
if %ERRORLEVEL% == 0 goto :install_reqs if %ERRORLEVEL% == 0 goto :install_reqs
echo Installing GFPGAN 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 if %ERRORLEVEL% == 0 goto :install_reqs
goto :show_stdout_stderr goto :show_stdout_stderr
:install_reqs :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... echo Installing requirements...
%PYTHON% -m pip install -r %REQS_FILE% --prefer-binary >tmp/stdout.txt 2>tmp/stderr.txt %PYTHON% -m pip install -r %REQS_FILE% --prefer-binary >tmp/stdout.txt 2>tmp/stderr.txt
if %ERRORLEVEL% == 0 goto :make_dirs if %ERRORLEVEL% == 0 goto :make_dirs