sd-webui/stable-diffusion-webui
1
1
Fork 0
mirror of https://github.com/sd-webui/stable-diffusion-webui.git synced 2024-12-14 23:02:00 +03:00
Code Issues Projects Releases Wiki Activity

Update conda environment on startup always (#1171) (#1176)

Browse Source 
* Update environment on startup always

* Message to explicitly state no environment.yaml update required

Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>

Co-authored-by: Brian Semrau <brian.semrau@gmail.com>
Co-authored-by: hlky <106811348+hlky@users.noreply.github.com>
This commit is contained in:
Thomas Mello 2022-09-16 12:26:01 +03:00 committed by GitHub
parent 4a8cc9ba6d
commit 1af2610c71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
update_to_latest.cmd
View File

@ -36,25 +36,26 @@ IF "%v_conda_path%"=="" (
echo Stashing local changes and pulling latest update...
call git stash
call git pull
echo If you want to restore changes you made before updating, run "git stash pop".
call "%v_conda_path%\Scripts\activate.bat"
for /f "delims=" %%a in ('git log -1 --format^="%%H" -- environment.yaml') DO set v_cur_hash=%%a
set /p "v_last_hash="<"z_version_env.tmp"
echo %v_cur_hash%>z_version_env.tmp
echo Current environment.yaml hash: %v_cur_hash%
echo Previous environment.yaml hash: %v_last_hash%
if "%v_last_hash%" == "%v_cur_hash%" (
echo environment.yaml unchanged. dependencies should be up to date.
echo if you still have unresolved dependencies, delete "z_version_env.tmp"
if not defined AUTO pause
) else (
echo environment.yaml changed. updating dependencies
call conda env create --name "%v_conda_env_name%" -f environment.yaml
call conda env update --name "%v_conda_env_name%" -f environment.yaml
if not defined AUTO pause
set /P restore="Do you want to restore changes you made before updating? (Y/N): "
IF /I "%restore%" == "N" (
echo Removing changes please wait...
call git stash drop
echo Changes removed, press any key to continue...
pause >nul
) ELSE IF /I "%restore%" == "Y" (
echo Restoring changes, please wait...
call git stash pop --quiet
echo Changes restored, press any key to continue...
pause >nul
)
for /f "delims=" %%a in ('git log -1 --format^="%%H" -- environment.yaml') DO set v_cur_hash=%%a
echo %v_cur_hash%>z_version_env.tmp
call conda env create --name "%v_conda_env_name%" -f environment.yaml
call conda env update --name "%v_conda_env_name%" -f environment.yaml
if not defined AUTO pause
call "%v_conda_path%\Scripts\activate.bat"
::cmd /k

18
webui-streamlit.cmd
View File

@ -52,6 +52,24 @@ if not exist "z_version_env.tmp" (
call "%v_conda_path%\Scripts\activate.bat" "%v_conda_env_name%"
set v_last_hash=0
set /p "v_last_hash="<"z_version_env.tmp"
for /f "delims=" %%a in ('git log -1 --format^="%%H" -- environment.yaml') DO set v_cur_hash=%%a
if not "%v_last_hash%" == "%v_cur_hash%" (
set /P updateenv="Do you want to update with the latest environment.yaml? (Y/N): "
if /I "%updateenv%" == "N" (
echo Starting without updating dependencies.
) else if /I "%updateenv%" == "Y" (
echo Updating dependencies...
call conda env create --name "%v_conda_env_name%" -f environment.yaml
call conda env update --name "%v_conda_env_name%" -f environment.yaml
echo %v_cur_hash%>z_version_env.tmp
)
) else (
echo No environment.yaml update required.
)
:PROMPT
set SETUPTOOLS_USE_DISTUTILS=stdlib
IF EXIST "models\ldm\stable-diffusion-v1\model.ckpt" (

18
webui.cmd
View File

@ -52,6 +52,24 @@ if not exist "z_version_env.tmp" (
call "%v_conda_path%\Scripts\activate.bat" "%v_conda_env_name%"
set v_last_hash=0
set /p "v_last_hash="<"z_version_env.tmp"
for /f "delims=" %%a in ('git log -1 --format^="%%H" -- environment.yaml') DO set v_cur_hash=%%a
if not "%v_last_hash%" == "%v_cur_hash%" (
set /P updateenv="Do you want to update with the latest environment.yaml? (Y/N): "
if /I "%updateenv%" == "N" (
echo Starting without updating dependencies.
) else if /I "%updateenv%" == "Y" (
echo Updating dependencies...
call conda env create --name "%v_conda_env_name%" -f environment.yaml
call conda env update --name "%v_conda_env_name%" -f environment.yaml
echo %v_cur_hash%>z_version_env.tmp
)
) else (
echo No environment.yaml update required.
)
:PROMPT
set SETUPTOOLS_USE_DISTUTILS=stdlib
IF EXIST "models\ldm\stable-diffusion-v1\model.ckpt" (