From d2dbfddf1e38d30661cff5e055a4a747582bc5f5 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Wed, 18 Jan 2023 08:23:48 -0500
Subject: [PATCH] update requirements

---
 requirements.txt          | 37 +++++++++-----------
 requirements_versions.txt | 38 +++++++-------------
 webui.bat                 | 74 ---------------------------------------
 3 files changed, 29 insertions(+), 120 deletions(-)
 delete mode 100644 webui.bat

diff --git a/requirements.txt b/requirements.txt
index 90f57edd8..b3df08f46 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,33 +1,30 @@
-blendmodes
 accelerate
 basicsr
-fairscale==0.4.4
-fonts
+clean-fid
+einops
+fairscale
+filetype
 font-roboto
+fonts
 gfpgan
-gradio==3.16.2
+gradio
 invisible-watermark
+jsonmerge
+kornia
+lark
+mediapipe
 numpy
 omegaconf
 opencv-contrib-python
-requests
 piexif
 Pillow
-pytorch_lightning==1.7.7
+pytorch_lightning
 realesrgan
-scikit-image>=0.19
-timm==0.4.12
-transformers==4.19.2
-torch
-einops
-jsonmerge
-clean-fid
 resize-right
-torchdiffeq
-kornia
-lark
-inflection
-GitPython
-torchsde
 safetensors
-psutil; sys_platform == 'darwin'
+scikit-image
+timm
+torch
+torchdiffeq
+torchsde
+transformers
diff --git a/requirements_versions.txt b/requirements_versions.txt
index f97ad765b..76d047b51 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -1,30 +1,16 @@
-blendmodes==2022
-transformers==4.19.2
-accelerate==0.12.0
+accelerate==0.15.0
 basicsr==1.4.2
+blendmodes==2022
 gfpgan==1.3.8
-gradio==3.16.2
-numpy==1.23.3
-Pillow==9.4.0
-realesrgan==0.3.0
-torch
-omegaconf==2.2.3
-pytorch_lightning==1.7.6
-scikit-image==0.19.2
-fonts
-font-roboto
-timm==0.6.7
-fairscale==0.4.9
-piexif==1.1.3
-einops==0.4.1
-jsonmerge==1.8.0
-clean-fid==0.1.29
-resize-right==0.0.2
-torchdiffeq==0.2.3
-kornia==0.6.7
-lark==1.1.2
-inflection==0.5.1
 GitPython==3.1.27
+gradio==3.16.2
+numpy==1.23.5
+omegaconf==2.2.3
+Pillow==9.4.0
+pytorch_lightning==1.7.7
+realesrgan==0.3.0
+scikit-image==0.19.2
+timm==0.6.7
+torchdiffeq==0.2.3
 torchsde==0.2.5
-safetensors==0.2.7
-httpcore<=0.15
+transformers==4.25.1
diff --git a/webui.bat b/webui.bat
deleted file mode 100644
index 3165b94d2..000000000
--- a/webui.bat
+++ /dev/null
@@ -1,74 +0,0 @@
-@echo off
-
-if not defined PYTHON (set PYTHON=python)
-if not defined VENV_DIR (set "VENV_DIR=%~dp0%venv")
-
-set ERROR_REPORTING=FALSE
-
-mkdir tmp 2>NUL
-
-%PYTHON% -c "" >tmp/stdout.txt 2>tmp/stderr.txt
-if %ERRORLEVEL% == 0 goto :start_venv
-echo Couldn't launch python
-goto :show_stdout_stderr
-
-:start_venv
-if ["%VENV_DIR%"] == ["-"] goto :skip_venv
-
-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
-if %ERRORLEVEL% == 0 goto :activate_venv
-echo Unable to create venv in directory "%VENV_DIR%"
-goto :show_stdout_stderr
-
-:activate_venv
-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.
-echo exit code: %errorlevel%
-
-for /f %%i in ("tmp\stdout.txt") do set size=%%~zi
-if %size% equ 0 goto :show_stderr
-echo.
-echo stdout:
-type tmp\stdout.txt
-
-:show_stderr
-for /f %%i in ("tmp\stderr.txt") do set size=%%~zi
-if %size% equ 0 goto :show_stderr
-echo.
-echo stderr:
-type tmp\stderr.txt
-
-:endofscript
-
-echo.
-echo Launch unsuccessful. Exiting.
-pause