From ac9b2ec010bad830fca6d1fbb8abd16136433c54 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Tue, 13 Sep 2022 00:24:37 +0300
Subject: [PATCH] fixed version for GFPGAN and k-diffusion made launcher always
 install requirements bumped basicsr to 1.4.2 because someone wanted it

---
 requirements.txt          | 2 +-
 requirements_versions.txt | 2 +-
 webui.bat                 | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 84c9bbd28..df7d2b8ff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,6 +14,6 @@ scikit-image
 fonts
 font-roboto
 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
 fairscale==0.4.4
diff --git a/requirements_versions.txt b/requirements_versions.txt
index f3a4d2b87..c12d5712f 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -1,4 +1,4 @@
-basicsr==1.3.5
+basicsr==1.4.2
 gfpgan
 gradio==3.3
 numpy==1.23.3
diff --git a/webui.bat b/webui.bat
index b1e84b7af..509830c88 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