From d14a13fcaf18a4eb83072172691a36b283e1f9ca Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 24 Sep 2022 23:38:56 +0530 Subject: [PATCH 1/3] Temporarily revert the System32 patch --- scripts/on_env_start.bat | 2 +- scripts/on_sd_start.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat index 16312a5a..8e46c62c 100644 --- a/scripts/on_env_start.bat +++ b/scripts/on_env_start.bat @@ -2,7 +2,7 @@ @echo. & echo "Stable Diffusion UI - v2" & echo. -set PATH=C:\Windows\System32;%PATH% +@REM set PATH=C:\Windows\System32;%PATH% @cd .. diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index b8ef042b..8c422865 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -79,7 +79,7 @@ @echo conda_sd_env_created >> ..\scripts\install_status.txt ) -set PATH=C:\Windows\System32;%PATH% +@REM set PATH=C:\Windows\System32;%PATH% @>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( From 489aae7a468675de7bafee007cd666faad6dc4ca Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 25 Sep 2022 00:03:15 +0530 Subject: [PATCH 2/3] Put back the System32 fix --- scripts/on_env_start.bat | 2 +- scripts/on_sd_start.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat index 8e46c62c..16312a5a 100644 --- a/scripts/on_env_start.bat +++ b/scripts/on_env_start.bat @@ -2,7 +2,7 @@ @echo. & echo "Stable Diffusion UI - v2" & echo. -@REM set PATH=C:\Windows\System32;%PATH% +set PATH=C:\Windows\System32;%PATH% @cd .. diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 8c422865..b8ef042b 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -79,7 +79,7 @@ @echo conda_sd_env_created >> ..\scripts\install_status.txt ) -@REM set PATH=C:\Windows\System32;%PATH% +set PATH=C:\Windows\System32;%PATH% @>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( From b3e9b266fa2b9a958bc384ef1f4f20fa6178c7e4 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Mon, 26 Sep 2022 12:05:07 +0530 Subject: [PATCH 3/3] Use python 3.8.13 instead of 3.8.5, since 3.8.5 seems to be missing openssl in some pip repositories --- ui/sd_internal/env_yaml.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ui/sd_internal/env_yaml.patch b/ui/sd_internal/env_yaml.patch index cc140ef1..ba4d2a19 100644 --- a/ui/sd_internal/env_yaml.patch +++ b/ui/sd_internal/env_yaml.patch @@ -1,7 +1,16 @@ diff --git a/environment.yaml b/environment.yaml -index 7f25da8..306750f 100644 +index 7f25da8..19ddcd8 100644 --- a/environment.yaml +++ b/environment.yaml +@@ -3,7 +3,7 @@ channels: + - pytorch + - defaults + dependencies: +- - python=3.8.5 ++ - python=3.8.13 + - pip=20.3 + - cudatoolkit=11.3 + - pytorch=1.11.0 @@ -23,6 +23,8 @@ dependencies: - torch-fidelity==0.3.0 - transformers==4.19.2