diff --git a/README.md b/README.md index 55c08a24..501d86f1 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: 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 diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index d2a29dec..8c5a248a 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 diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index bb05e9a4..86034432 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -106,7 +106,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.43 || ( 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 5f485fdf..a8ed26be 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -89,7 +89,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.43 ; then echo "Installed." else fail "sdkit install failed" diff --git a/ui/easydiffusion/device_manager.py b/ui/easydiffusion/device_manager.py index 69086577..4279cc46 100644 --- a/ui/easydiffusion/device_manager.py +++ b/ui/easydiffusion/device_manager.py @@ -142,16 +142,19 @@ 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 " 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): diff --git a/ui/index.html b/ui/index.html index 471bd39f..11d182b3 100644 --- a/ui/index.html +++ b/ui/index.html @@ -98,7 +98,7 @@