From 6bff97d6fadae06cd18a145049a352de5827dba5 Mon Sep 17 00:00:00 2001 From: patriceac <48073125+patriceac@users.noreply.github.com> Date: Mon, 30 Jan 2023 23:09:36 -0800 Subject: [PATCH 01/13] Removing the ':' after the tooltip icon This colon after the tooltip icon just feels out of place. --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index 2f92b90a..5c76cc88 100644 --- a/ui/index.html +++ b/ui/index.html @@ -95,7 +95,7 @@
- +
From b7047dafb20eee43f2c67cc99f0bfb1c9deb5fb3 Mon Sep 17 00:00:00 2001 From: Fernando Isnaldo Silva de Faria Date: Fri, 3 Feb 2023 16:36:49 -0300 Subject: [PATCH 02/13] Fix aarch64 (arm64) verification --- scripts/bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 6a929133..a5f013a1 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -21,6 +21,7 @@ OS_ARCH=$(uname -m) case "${OS_ARCH}" in x86_64*) OS_ARCH="64";; arm64*) OS_ARCH="arm64";; + aarch64*) OS_ARCH="arm64";; *) echo "Unknown system architecture: $OS_ARCH! This script runs only on x86_64 or arm64" && exit esac From 63c5de26120e9f993c4210f8514982d0fa2582df Mon Sep 17 00:00:00 2001 From: JeLuF Date: Thu, 9 Feb 2023 01:46:32 +0100 Subject: [PATCH 03/13] Add T500 to list of full precision cards --- ui/easydiffusion/device_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/easydiffusion/device_manager.py b/ui/easydiffusion/device_manager.py index 786512ea..77fcbaea 100644 --- a/ui/easydiffusion/device_manager.py +++ b/ui/easydiffusion/device_manager.py @@ -125,7 +125,7 @@ def needs_to_force_full_precision(context): return True device_name = context.device_name.lower() - return (('nvidia' in device_name or 'geforce' in device_name or 'quadro' in device_name) and (' 1660' in device_name or ' 1650' in device_name or ' t400' in device_name or ' t550' in device_name or ' t600' in device_name or ' t1000' in device_name or ' t1200' in device_name or ' t2000' in device_name)) + return (('nvidia' in device_name or 'geforce' in device_name or 'quadro' in device_name) and (' 1660' in device_name or ' 1650' in device_name or ' t400' in device_name or ' t500' in device_name or ' t550' in device_name or ' t600' in device_name or ' t1000' in device_name or ' t1200' in device_name or ' t2000' in device_name)) def get_max_vram_usage_level(device): if device != 'cpu': From c35a731a60e378879fa5842bc73378c4a5ef13ee Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Thu, 9 Feb 2023 19:56:18 +0530 Subject: [PATCH 04/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 55c08a24..94897c8b 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ Does not require technical knowledge, does not require pre-installed software. 1 Click the download button for your operating system:

- - + +

## On Windows: From 14fb115fc82929cb0718e1b5b161eab89f1bddff Mon Sep 17 00:00:00 2001 From: JeLuF Date: Thu, 9 Feb 2023 20:25:27 +0100 Subject: [PATCH 05/13] Link to LINUX.zip --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94897c8b..501d86f1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Click the download button for your operating system:

- +

## On Windows: From 071a4d6f37b99a4f635c5214776c4b6853a1ee01 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Fri, 10 Feb 2023 18:04:43 +0530 Subject: [PATCH 06/13] Use a fixed sdkit version, to avoid bumping to the latest sdkit version in the main branch --- scripts/on_sd_start.bat | 2 +- scripts/on_sd_start.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 5b778aa3..80d2e2c6 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -92,7 +92,7 @@ if "%ERRORLEVEL%" EQU "0" ( set PYTHONNOUSERSITE=1 set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages - call python -m pip install --upgrade sdkit -q || ( + call python -m pip install --upgrade sdkit==1.0.35 -q || ( echo "Error updating sdkit" ) ) diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index c15af743..33ca4afd 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -80,7 +80,7 @@ if python ../scripts/check_modules.py sdkit sdkit.models ldm transformers numpy export PYTHONNOUSERSITE=1 export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages" - python -m pip install --upgrade sdkit -q + python -m pip install --upgrade sdkit==1.0.35 -q fi else echo "Installing sdkit: https://pypi.org/project/sdkit/" From fe7e398eb4517d1d6d8465cba6afad78b121c18e Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Fri, 10 Feb 2023 19:01:03 +0530 Subject: [PATCH 07/13] sdkit message --- ui/index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/index.html b/ui/index.html index 65f97090..5bb28f3f 100644 --- a/ui/index.html +++ b/ui/index.html @@ -280,6 +280,10 @@ You can also add modifiers like "Realistic", "Pencil Sketch", "ArtStation" etc by browsing through the "Image Modifiers" section and selecting the desired modifiers.

Click "Image Settings" for additional settings like seed, image size, number of images to generate etc.

Enjoy! :) +
+
+
+ 🚀 Powered by sdkit - an easy way to use Stable Diffusion in your own programs! Made with ❤️ by the creators of Easy Diffusion.
From ab7ba356395a026152ffab0314d46141c54ec1c7 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Fri, 10 Feb 2023 22:54:02 +0530 Subject: [PATCH 08/13] Revert "sdkit message" This reverts commit 6ab3133b33a873f82fac1eb5b34ac8355e05f93c. --- ui/index.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ui/index.html b/ui/index.html index 5bb28f3f..65f97090 100644 --- a/ui/index.html +++ b/ui/index.html @@ -280,10 +280,6 @@ You can also add modifiers like "Realistic", "Pencil Sketch", "ArtStation" etc by browsing through the "Image Modifiers" section and selecting the desired modifiers.

Click "Image Settings" for additional settings like seed, image size, number of images to generate etc.

Enjoy! :) -
-
-
- 🚀 Powered by sdkit - an easy way to use Stable Diffusion in your own programs! Made with ❤️ by the creators of Easy Diffusion.
From 7ce223771d22b771b0e32f84802c52d73d312161 Mon Sep 17 00:00:00 2001 From: JeLuF Date: Sun, 12 Feb 2023 10:07:53 +0100 Subject: [PATCH 09/13] Add k40m to list of FP32 cards (#863) https://discord.com/channels/1014774730907209781/1073819636329631754 --- ui/easydiffusion/device_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/easydiffusion/device_manager.py b/ui/easydiffusion/device_manager.py index 77fcbaea..edd74b3c 100644 --- a/ui/easydiffusion/device_manager.py +++ b/ui/easydiffusion/device_manager.py @@ -125,7 +125,7 @@ def needs_to_force_full_precision(context): return True device_name = context.device_name.lower() - return (('nvidia' in device_name or 'geforce' in device_name or 'quadro' in device_name) and (' 1660' in device_name or ' 1650' in device_name or ' t400' in device_name or ' t500' in device_name or ' t550' in device_name or ' t600' in device_name or ' t1000' in device_name or ' t1200' in device_name or ' t2000' in device_name)) + return (('nvidia' in device_name or 'geforce' in device_name or 'quadro' in device_name) and (' 1660' in device_name or ' 1650' in device_name or ' t400' in device_name or ' t500' in device_name or ' t550' in device_name or ' t600' in device_name or ' t1000' in device_name or ' t1200' in device_name or ' t2000' in device_name)) or ('tesla k40m' in device_name) def get_max_vram_usage_level(device): if device != 'cpu': From 9fb5cac5d449f3d3f2a62f2aadd4f55af0f3bec6 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Thu, 16 Feb 2023 19:21:51 +0530 Subject: [PATCH 10/13] Bypass incorrect ERRORLEVEL values in nested code blocks by using something called delayedexpansion. Ugh --- scripts/bootstrap.bat | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap.bat b/scripts/bootstrap.bat index c58ddcce..d3cdd19f 100644 --- a/scripts/bootstrap.bat +++ b/scripts/bootstrap.bat @@ -1,4 +1,5 @@ @echo off +setlocal enabledelayedexpansion @rem This script will install git and conda (if not found on the PATH variable) @rem using micromamba (an 8mb static-linked single-file binary, conda replacement). @@ -28,10 +29,10 @@ if not exist "%LEGACY_INSTALL_ENV_DIR%\etc\profile.d\conda.sh" ( ) call git --version >.tmp1 2>.tmp2 -if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git +if "!ERRORLEVEL!" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version >.tmp1 2>.tmp2 -if "%ERRORLEVEL%" EQU "0" set umamba_exists=T +if "!ERRORLEVEL!" EQU "0" set umamba_exists=T @rem (if necessary) install git and conda into a contained environment if "%PACKAGES_TO_INSTALL%" NEQ "" ( @@ -42,7 +43,7 @@ if "%PACKAGES_TO_INSTALL%" NEQ "" ( mkdir "%MAMBA_ROOT_PREFIX%" call curl -Lk "%MICROMAMBA_DOWNLOAD_URL%" > "%MAMBA_ROOT_PREFIX%\micromamba.exe" - if "%ERRORLEVEL%" NEQ "0" ( + if "!ERRORLEVEL!" NEQ "0" ( echo "There was a problem downloading micromamba. Cannot continue." pause exit /b From 51b6a2fd2aee901a761fb84d5db316aaad62e4c1 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 18 Feb 2023 14:17:28 +0530 Subject: [PATCH 11/13] Pin the version of stable-diffusion-sdkit used, to avoid untested releases from getting used --- scripts/on_sd_start.bat | 2 +- scripts/on_sd_start.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 80d2e2c6..81ac2d00 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -113,7 +113,7 @@ if "%ERRORLEVEL%" EQU "0" ( call python -c "from importlib.metadata import version; print('sdkit version:', version('sdkit'))" @rem upgrade stable-diffusion-sdkit -call python -m pip install --upgrade stable-diffusion-sdkit -q || ( +call python -m pip install --upgrade stable-diffusion-sdkit==2.1.1 -q || ( echo "Error updating stable-diffusion-sdkit" ) call python -c "from importlib.metadata import version; print('stable-diffusion version:', version('stable-diffusion-sdkit'))" diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 33ca4afd..0a57ae2b 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -98,7 +98,7 @@ fi python -c "from importlib.metadata import version; print('sdkit version:', version('sdkit'))" # upgrade stable-diffusion-sdkit -python -m pip install --upgrade stable-diffusion-sdkit -q +python -m pip install --upgrade stable-diffusion-sdkit==2.1.1 -q python -c "from importlib.metadata import version; print('stable-diffusion version:', version('stable-diffusion-sdkit'))" # install rich From 6a2c2152e2807d714eb3445469de5574fd9cf620 Mon Sep 17 00:00:00 2001 From: JeLuF Date: Sat, 18 Feb 2023 14:05:55 +0100 Subject: [PATCH 12/13] =?UTF-8?q?=F0=9F=94=A5=20Installer:=20Fix=20ESRGAN?= =?UTF-8?q?=20anime=20model's=20path?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The size check fails on every installation. The path name of the check wasn't changed when the model was moved to the models directory. --- scripts/on_sd_start.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 81ac2d00..c66e516a 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -279,7 +279,7 @@ call WHERE uvicorn > .tmp @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > ..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth @if exist "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth" ( - for %%I in ("RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" NEQ "17938799" ( + for %%I in ("..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" NEQ "17938799" ( echo. & echo "Error: The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: %%~zI" & echo. echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo. pause From 91c4b5865c81dea0c2e1eef7d97993040b75caa6 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 21 Feb 2023 10:40:17 +0530 Subject: [PATCH 13/13] Pin the sdkit version during fresh installs --- scripts/on_sd_start.bat | 2 +- scripts/on_sd_start.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index c66e516a..17fc74a8 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -103,7 +103,7 @@ if "%ERRORLEVEL%" EQU "0" ( set PYTHONNOUSERSITE=1 set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages - call python -m pip install sdkit || ( + call python -m pip install sdkit==1.0.35 || ( echo "Error installing sdkit. Sorry about that, please try to:" & echo " 1. Run this installer again." & echo " 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo " 3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo " 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" pause exit /b diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 0a57ae2b..958eaa7c 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -88,7 +88,7 @@ else export PYTHONNOUSERSITE=1 export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages" - if python -m pip install sdkit ; then + if python -m pip install sdkit==1.0.35 ; then echo "Installed." else fail "sdkit install failed"