From cc356ce67d23e03a471547ef6f66776b477de4bd Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 22 Oct 2022 23:24:13 +0530 Subject: [PATCH 01/31] Initial commit of the new micromamba-based installer; This should work seamlessly for new and existing users; Also allows the installer to run on mac (but the installation will fail because the mac-specific environment.yaml hasn't been added yet) --- scripts/Developer Console.cmd | 21 +++++++-- scripts/Start Stable Diffusion UI.cmd | 28 +++++++---- scripts/bootstrap.bat | 53 +++++++++++++++++++++ scripts/bootstrap.sh | 67 +++++++++++++++++++++++++++ scripts/developer_console.sh | 20 ++++++-- scripts/on_env_start.bat | 3 +- scripts/on_env_start.sh | 1 + scripts/on_sd_start.bat | 3 +- scripts/on_sd_start.sh | 6 ++- scripts/start.sh | 19 ++++++-- 10 files changed, 194 insertions(+), 27 deletions(-) create mode 100644 scripts/bootstrap.bat create mode 100644 scripts/bootstrap.sh diff --git a/scripts/Developer Console.cmd b/scripts/Developer Console.cmd index e9bfb28b..e088a51f 100644 --- a/scripts/Developer Console.cmd +++ b/scripts/Developer Console.cmd @@ -2,13 +2,24 @@ echo "Opening Stable Diffusion UI - Developer Console.." & echo. -@call installer\Scripts\activate.bat +set PATH=C:\Windows\System32;%PATH% -@call conda-unpack +@rem set legacy and new installer's PATH, if they exist +if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%PATH% +if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%PATH% -@call conda --version -@call git --version +@rem Test the environment +echo "Environment Info:" +call where git +call git --version -@call conda activate .\stable-diffusion\env +call where python +call python --version + +call where conda +call conda --version + +@rem activate the environment +call conda activate .\stable-diffusion\env cmd /k \ No newline at end of file diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd index 8563f6b3..3a8100da 100644 --- a/scripts/Start Stable Diffusion UI.cmd +++ b/scripts/Start Stable Diffusion UI.cmd @@ -1,19 +1,27 @@ @echo off -@REM Delete the post-activate hook from the old installer -if exist "installer\etc\conda\activate.d\post_activate.bat" ( - echo. > installer\etc\conda\activate.d\post_activate.bat -) +set PATH=C:\Windows\System32;%PATH% -@call installer\Scripts\activate.bat +@rem set legacy installer's PATH, if it exists +if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%PATH% -@call conda-unpack +@rem Setup the packages required for the installer +call scripts\bootstrap.bat -@call conda --version -@call git --version +@rem set new installer's PATH, if it downloaded any packages +if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%PATH% -@cd installer +@rem Test the bootstrap +call where git +call git --version -@call ..\scripts\on_env_start.bat +call where python +call python --version + +call where conda +call conda --version + +@rem Download the rest of the installer and UI +call scripts\on_env_start.bat @pause diff --git a/scripts/bootstrap.bat b/scripts/bootstrap.bat new file mode 100644 index 00000000..8a231deb --- /dev/null +++ b/scripts/bootstrap.bat @@ -0,0 +1,53 @@ +@echo off + +@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). +@rem For users who already have git and conda, this step will be skipped. + +@rem This enables a user to install this project without manually installing conda and git. + +@rem config +set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba +set INSTALL_ENV_DIR=%cd%\installer_files\env +set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/releases/download/v1.1/micromamba.exe + +@rem figure out whether git and conda needs to be installed +if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%PATH% + +set PACKAGES_TO_INSTALL= + +call conda --version >.tmp1 2>.tmp2 +if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda + +call git --version >.tmp1 2>.tmp2 +if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git + +@rem (if necessary) install git and conda into a contained environment +if "%PACKAGES_TO_INSTALL%" NEQ "" ( + @rem download micromamba + if not exist "%MAMBA_ROOT_PREFIX%\micromamba.exe" ( + echo "Downloading micromamba from %MICROMAMBA_DOWNLOAD_URL% to %MAMBA_ROOT_PREFIX%\micromamba.exe" + + mkdir "%MAMBA_ROOT_PREFIX%" + call curl -L "%MICROMAMBA_DOWNLOAD_URL%" > "%MAMBA_ROOT_PREFIX%\micromamba.exe" + + @rem test the mamba binary + echo Micromamba version: + call "%MAMBA_ROOT_PREFIX%\micromamba.exe" --version + ) + + @rem create the installer env + if not exist "%INSTALL_ENV_DIR%" ( + call "%MAMBA_ROOT_PREFIX%\micromamba.exe" create -y --prefix "%INSTALL_ENV_DIR%" + ) + + echo "Packages to install:%PACKAGES_TO_INSTALL%" + + call "%MAMBA_ROOT_PREFIX%\micromamba.exe" install -y --prefix "%INSTALL_ENV_DIR%" -c conda-forge %PACKAGES_TO_INSTALL% + + if not exist "%INSTALL_ENV_DIR%" ( + echo "There was a problem while installing%PACKAGES_TO_INSTALL% using micromamba. Cannot continue." + pause + exit /b + ) +) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh new file mode 100644 index 00000000..da39f4c5 --- /dev/null +++ b/scripts/bootstrap.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +# This script will install git and conda (if not found on the PATH variable) +# using micromamba (an 8mb static-linked single-file binary, conda replacement). +# For users who already have git and conda, this step will be skipped. + +# This enables a user to install this project without manually installing conda and git. + + +OS_NAME=$(uname -s) +case "${OS_NAME}" in + Linux*) OS_NAME="linux";; + Darwin*) OS_NAME="osx";; + *) echo "Unknown OS: $OS_NAME! This script runs only on Linux or Mac" && exit +esac + +OS_ARCH=$(uname -m) +case "${OS_ARCH}" in + x86_64*) OS_ARCH="64";; + arm64*) OS_ARCH="arm64";; + *) echo "Unknown system architecture: $OS_ARCH! This script runs only on x86_64 or arm64" && exit +esac + +# https://mamba.readthedocs.io/en/latest/installation.html +if [ "$OS_NAME" == "linux" ] && [ "$OS_ARCH" == "arm64" ]; then OS_ARCH="aarch64"; fi + +# config +export MAMBA_ROOT_PREFIX="$(pwd)/installer_files/mamba" +INSTALL_ENV_DIR="$(pwd)/installer_files/env" +MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${OS_NAME}-${OS_ARCH}/latest" + +# figure out whether git and conda needs to be installed +if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi + +PACKAGES_TO_INSTALL="" + +if ! hash "conda" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi +if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi + +# (if necessary) install git and conda into a contained environment +if [ "$PACKAGES_TO_INSTALL" != "" ]; then + # download micromamba + if [ ! -e "$MAMBA_ROOT_PREFIX/micromamba" ]; then + echo "Downloading micromamba from $MICROMAMBA_DOWNLOAD_URL to $MAMBA_ROOT_PREFIX/micromamba" + + mkdir -p "$MAMBA_ROOT_PREFIX" + curl -L "$MICROMAMBA_DOWNLOAD_URL" | tar -xvj "$MAMBA_ROOT_PREFIX/micromamba" + + # test the mamba binary + echo "Micromamba version:" + "$MAMBA_ROOT_PREFIX/micromamba" --version + fi + + # create the installer env + if [ ! -e "$INSTALL_ENV_DIR" ]; then + "$MAMBA_ROOT_PREFIX/micromamba" create -y --prefix "$INSTALL_ENV_DIR" + fi + + echo "Packages to install:$PACKAGES_TO_INSTALL" + + "$MAMBA_ROOT_PREFIX/micromamba" install -y --prefix "$INSTALL_ENV_DIR" -c conda-forge $PACKAGES_TO_INSTALL + + if [ ! -e "$INSTALL_ENV_DIR" ]; then + echo "There was a problem while installing$PACKAGES_TO_INSTALL using micromamba. Cannot continue." + exit + fi +fi diff --git a/scripts/developer_console.sh b/scripts/developer_console.sh index d242d1f6..1fe016a9 100755 --- a/scripts/developer_console.sh +++ b/scripts/developer_console.sh @@ -4,13 +4,25 @@ if [ "$0" == "bash" ]; then echo "Opening Stable Diffusion UI - Developer Console.." echo "" - source installer/bin/activate + # set legacy and new installer's PATH, if they exist + if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi + if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi - conda-unpack - - conda --version + # test the environment + echo "Environment Info:" + which git git --version + which python + python --version + + which conda + conda --version + + # activate the environment + CONDA_BASEPATH=$(conda info --base) + source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) + conda activate ./stable-diffusion/env else bash --init-file developer_console.sh diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat index 0c8eb327..eb5aa06c 100644 --- a/scripts/on_env_start.bat +++ b/scripts/on_env_start.bat @@ -4,8 +4,6 @@ set PATH=C:\Windows\System32;%PATH% -@cd .. - if exist "scripts\config.bat" ( @call scripts\config.bat ) @@ -54,6 +52,7 @@ if "%update_branch%"=="" ( @xcopy sd-ui-files\ui ui /s /i /Y @copy sd-ui-files\scripts\on_sd_start.bat scripts\ /Y +@copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y @copy "sd-ui-files\scripts\Start Stable Diffusion UI.cmd" . /Y @copy "sd-ui-files\scripts\Developer Console.cmd" . /Y diff --git a/scripts/on_env_start.sh b/scripts/on_env_start.sh index 5c574e4c..eff27e57 100755 --- a/scripts/on_env_start.sh +++ b/scripts/on_env_start.sh @@ -36,6 +36,7 @@ fi rm -rf ui cp -Rf sd-ui-files/ui . cp sd-ui-files/scripts/on_sd_start.sh scripts/ +cp sd-ui-files/scripts/bootstrap.sh scripts/ cp sd-ui-files/scripts/start.sh . cp sd-ui-files/scripts/developer_console.sh . diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index feb73468..94ba6a89 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -1,11 +1,12 @@ @echo off @copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y +@copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y @REM Caution, this file will make your eyes and brain bleed. It's such an unholy mess. @REM Note to self: Please rewrite this in Python. For the sake of your own sanity. -@copy "sd-ui-files\scripts\Developer Console.cmd" . /Y +@REM remove the old version of the dev console script, if it's still present if exist "Open Developer Console.cmd" del "Open Developer Console.cmd" @call python -c "import os; import shutil; frm = 'sd-ui-files\\ui\\hotfix\\9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');" diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index e949dfcb..964ea051 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -1,10 +1,12 @@ #!/bin/bash cp sd-ui-files/scripts/on_env_start.sh scripts/ +cp sd-ui-files/scripts/bootstrap.sh scripts/ -source installer/etc/profile.d/conda.sh +CONDA_BASEPATH=$(conda info --base) +source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) -cp sd-ui-files/scripts/developer_console.sh . +# remove the old version of the dev console script, if it's still present if [ -e "open_dev_console.sh" ]; then rm "open_dev_console.sh" fi diff --git a/scripts/start.sh b/scripts/start.sh index e077593a..e5981434 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1,10 +1,23 @@ #!/bin/bash -source installer/bin/activate +# set legacy installer's PATH, if it exists +if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi -conda-unpack +# Setup the packages required for the installer +scripts/bootstrap.sh -conda --version +# set new installer's PATH, if it downloaded any packages +if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi + +# Test the bootstrap +which git git --version +which python +python --version + +which conda +conda --version + +# Download the rest of the installer and UI scripts/on_env_start.sh From e8d61225f53a6e27ef64176851c485c0029a0d41 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 22 Oct 2022 23:26:59 +0530 Subject: [PATCH 02/31] Make the linux installer executable --- scripts/bootstrap.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/bootstrap.sh diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh old mode 100644 new mode 100755 From 338c2243e36bcf2e57a8300ce2b1406d7d4379bf Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sat, 22 Oct 2022 23:28:43 +0530 Subject: [PATCH 03/31] Newline after printing env info in developer scripts --- scripts/Developer Console.cmd | 2 ++ scripts/developer_console.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/scripts/Developer Console.cmd b/scripts/Developer Console.cmd index e088a51f..288f2b8c 100644 --- a/scripts/Developer Console.cmd +++ b/scripts/Developer Console.cmd @@ -19,6 +19,8 @@ call python --version call where conda call conda --version +echo. + @rem activate the environment call conda activate .\stable-diffusion\env diff --git a/scripts/developer_console.sh b/scripts/developer_console.sh index 1fe016a9..53e4ed59 100755 --- a/scripts/developer_console.sh +++ b/scripts/developer_console.sh @@ -19,6 +19,8 @@ if [ "$0" == "bash" ]; then which conda conda --version + echo "" + # activate the environment CONDA_BASEPATH=$(conda info --base) source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) From 3772137c8f1b783ef363ca6e4d783aa139e6e776 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 10:23:43 +0530 Subject: [PATCH 04/31] Include usr/bin in the installer PATH; newlines at the end of all files --- scripts/Developer Console.cmd | 6 +++--- scripts/Start Stable Diffusion UI.cmd | 4 ++-- scripts/bootstrap.bat | 2 +- scripts/developer_console.sh | 2 +- scripts/on_env_start.bat | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/Developer Console.cmd b/scripts/Developer Console.cmd index 288f2b8c..81676136 100644 --- a/scripts/Developer Console.cmd +++ b/scripts/Developer Console.cmd @@ -5,8 +5,8 @@ echo "Opening Stable Diffusion UI - Developer Console.." & echo. set PATH=C:\Windows\System32;%PATH% @rem set legacy and new installer's PATH, if they exist -if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%PATH% -if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%PATH% +if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH% +if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH% @rem Test the environment echo "Environment Info:" @@ -24,4 +24,4 @@ echo. @rem activate the environment call conda activate .\stable-diffusion\env -cmd /k \ No newline at end of file +cmd /k diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd index 3a8100da..428da218 100644 --- a/scripts/Start Stable Diffusion UI.cmd +++ b/scripts/Start Stable Diffusion UI.cmd @@ -3,13 +3,13 @@ set PATH=C:\Windows\System32;%PATH% @rem set legacy installer's PATH, if it exists -if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%PATH% +if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH% @rem Setup the packages required for the installer call scripts\bootstrap.bat @rem set new installer's PATH, if it downloaded any packages -if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%PATH% +if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH% @rem Test the bootstrap call where git diff --git a/scripts/bootstrap.bat b/scripts/bootstrap.bat index 8a231deb..26d74b52 100644 --- a/scripts/bootstrap.bat +++ b/scripts/bootstrap.bat @@ -12,7 +12,7 @@ set INSTALL_ENV_DIR=%cd%\installer_files\env set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/releases/download/v1.1/micromamba.exe @rem figure out whether git and conda needs to be installed -if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%PATH% +if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH% set PACKAGES_TO_INSTALL= diff --git a/scripts/developer_console.sh b/scripts/developer_console.sh index 53e4ed59..b9f1341e 100755 --- a/scripts/developer_console.sh +++ b/scripts/developer_console.sh @@ -28,4 +28,4 @@ if [ "$0" == "bash" ]; then conda activate ./stable-diffusion/env else bash --init-file developer_console.sh -fi \ No newline at end of file +fi diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat index eb5aa06c..4d402fdc 100644 --- a/scripts/on_env_start.bat +++ b/scripts/on_env_start.bat @@ -58,4 +58,4 @@ if "%update_branch%"=="" ( @call scripts\on_sd_start.bat -@pause \ No newline at end of file +@pause From 6f3c66278380bcb3e13d4cab9526146922ad1258 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 10:28:27 +0530 Subject: [PATCH 05/31] Bump version --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index fdaf42af..63646123 100644 --- a/ui/index.html +++ b/ui/index.html @@ -18,7 +18,7 @@
  • From 1a2f37b0eca0d5728e424c4b3863960af3d8b704 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 10:38:01 +0530 Subject: [PATCH 06/31] Make the micromamba binary executable after download on linux --- scripts/bootstrap.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index da39f4c5..8b556aa4 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -46,6 +46,8 @@ if [ "$PACKAGES_TO_INSTALL" != "" ]; then mkdir -p "$MAMBA_ROOT_PREFIX" curl -L "$MICROMAMBA_DOWNLOAD_URL" | tar -xvj "$MAMBA_ROOT_PREFIX/micromamba" + chmod u+x "$MAMBA_ROOT_PREFIX/micromamba" + # test the mamba binary echo "Micromamba version:" "$MAMBA_ROOT_PREFIX/micromamba" --version From b6c6fef770bcec70d7ae538cee92e2dd00753ddc Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 10:47:44 +0530 Subject: [PATCH 07/31] Use findstr instead of grep on windows --- scripts/on_env_start.bat | 4 ++-- scripts/on_sd_start.bat | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat index 4d402fdc..a4df2e33 100644 --- a/scripts/on_env_start.bat +++ b/scripts/on_env_start.bat @@ -12,7 +12,7 @@ if "%update_branch%"=="" ( set update_branch=main ) -@>nul grep -c "conda_sd_ui_deps_installed" scripts\install_status.txt +@>nul findstr /m "conda_sd_ui_deps_installed" scripts\install_status.txt @if "%ERRORLEVEL%" NEQ "0" ( for /f "tokens=*" %%a in ('python -c "import os; parts = os.getcwd().split(os.path.sep); print(len(parts))"') do if "%%a" NEQ "2" ( echo. & echo "!!!! WARNING !!!!" & echo. @@ -26,7 +26,7 @@ if "%update_branch%"=="" ( ) ) -@>nul grep -c "sd_ui_git_cloned" scripts\install_status.txt +@>nul findstr /m "sd_ui_git_cloned" scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( @echo "Stable Diffusion UI's git repository was already installed. Updating from %update_branch%.." diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 94ba6a89..536bf5a9 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -15,7 +15,7 @@ if exist "%cd%\profile" ( set USERPROFILE=%cd%\profile ) -@>nul grep -c "sd_git_cloned" scripts\install_status.txt +@>nul findstr /m "sd_git_cloned" scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( @echo "Stable Diffusion's git repository was already installed. Updating.." @@ -51,7 +51,7 @@ if exist "%cd%\profile" ( @cd stable-diffusion -@>nul grep -c "conda_sd_env_created" ..\scripts\install_status.txt +@>nul findstr /m "conda_sd_env_created" ..\scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( @echo "Packages necessary for Stable Diffusion were already installed" @@ -93,7 +93,7 @@ if exist "%cd%\profile" ( set PATH=C:\Windows\System32;%PATH% -@>nul grep -c "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt +@>nul findstr /m "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( @echo "Packages necessary for GFPGAN (Face Correction) were already installed" ) else ( @@ -126,7 +126,7 @@ set PATH=C:\Windows\System32;%PATH% @echo conda_sd_gfpgan_deps_installed >> ..\scripts\install_status.txt ) -@>nul grep -c "conda_sd_esrgan_deps_installed" ..\scripts\install_status.txt +@>nul findstr /m "conda_sd_esrgan_deps_installed" ..\scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( @echo "Packages necessary for ESRGAN (Resolution Upscaling) were already installed" ) else ( @@ -153,7 +153,7 @@ set PATH=C:\Windows\System32;%PATH% @echo conda_sd_esrgan_deps_installed >> ..\scripts\install_status.txt ) -@>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt +@>nul findstr /m "conda_sd_ui_deps_installed" ..\scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( echo "Packages necessary for Stable Diffusion UI were already installed" ) else ( @@ -173,14 +173,14 @@ set PATH=C:\Windows\System32;%PATH% ) call WHERE uvicorn > .tmp -@>nul grep -c "uvicorn" .tmp +@>nul findstr /m "uvicorn" .tmp @if "%ERRORLEVEL%" NEQ "0" ( @echo. & echo "UI packages not found! 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 exit /b ) -@>nul grep -c "conda_sd_ui_deps_installed" ..\scripts\install_status.txt +@>nul findstr /m "conda_sd_ui_deps_installed" ..\scripts\install_status.txt @if "%ERRORLEVEL%" NEQ "0" ( @echo conda_sd_ui_deps_installed >> ..\scripts\install_status.txt ) @@ -318,7 +318,7 @@ echo. > "..\models\stable-diffusion\Put your custom ckpt files here.txt" -@>nul grep -c "sd_install_complete" ..\scripts\install_status.txt +@>nul findstr /m "sd_install_complete" ..\scripts\install_status.txt @if "%ERRORLEVEL%" NEQ "0" ( @echo sd_weights_downloaded >> ..\scripts\install_status.txt @echo sd_install_complete >> ..\scripts\install_status.txt From df14913c678b1adff6f78509e927d0a4a08ef8e8 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 11:16:28 +0530 Subject: [PATCH 08/31] Always install conda, don't use the system's version --- scripts/bootstrap.bat | 6 +++--- scripts/bootstrap.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap.bat b/scripts/bootstrap.bat index 26d74b52..bf4e2198 100644 --- a/scripts/bootstrap.bat +++ b/scripts/bootstrap.bat @@ -14,10 +14,10 @@ set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/release @rem figure out whether git and conda needs to be installed if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH% -set PACKAGES_TO_INSTALL= +set PACKAGES_TO_INSTALL= conda -call conda --version >.tmp1 2>.tmp2 -if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda +rem call conda --version >.tmp1 2>.tmp2 +rem if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda call git --version >.tmp1 2>.tmp2 if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 8b556aa4..ca3f86e6 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -32,9 +32,9 @@ MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${OS_NAME}-${OS_A # figure out whether git and conda needs to be installed if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi -PACKAGES_TO_INSTALL="" +PACKAGES_TO_INSTALL=" conda" -if ! hash "conda" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi +# if ! hash "conda" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi # (if necessary) install git and conda into a contained environment From a111d9b18a797ebd93fbe780b007d5bdbace0693 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 11:28:08 +0530 Subject: [PATCH 09/31] Supress detached head warning --- scripts/on_env_start.bat | 2 +- scripts/on_env_start.sh | 2 +- scripts/on_sd_start.bat | 4 ++-- scripts/on_sd_start.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/on_env_start.bat b/scripts/on_env_start.bat index a4df2e33..2919cb89 100644 --- a/scripts/on_env_start.bat +++ b/scripts/on_env_start.bat @@ -33,7 +33,7 @@ if "%update_branch%"=="" ( @cd sd-ui-files @call git reset --hard - @call git checkout "%update_branch%" + @call git -c advice.detachedHead=false checkout "%update_branch%" @call git pull @cd .. diff --git a/scripts/on_env_start.sh b/scripts/on_env_start.sh index eff27e57..64206d5b 100755 --- a/scripts/on_env_start.sh +++ b/scripts/on_env_start.sh @@ -16,7 +16,7 @@ if [ -f "scripts/install_status.txt" ] && [ `grep -c sd_ui_git_cloned scripts/in cd sd-ui-files git reset --hard - git checkout "$update_branch" + git -c advice.detachedHead=false checkout "$update_branch" git pull cd .. diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 536bf5a9..0418895d 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -23,7 +23,7 @@ if exist "%cd%\profile" ( @call git reset --hard @call git pull - @call git checkout f6cfebffa752ee11a7b07497b8529d5971de916c + @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c @call git apply ..\ui\sd_internal\ddim_callback.patch @call git apply ..\ui\sd_internal\env_yaml.patch @@ -41,7 +41,7 @@ if exist "%cd%\profile" ( ) @cd stable-diffusion - @call git checkout f6cfebffa752ee11a7b07497b8529d5971de916c + @call git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c @call git apply ..\ui\sd_internal\ddim_callback.patch @call git apply ..\ui\sd_internal\env_yaml.patch diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 964ea051..3ac9391e 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -23,7 +23,7 @@ if [ -e "scripts/install_status.txt" ] && [ `grep -c sd_git_cloned scripts/insta git reset --hard git pull - git checkout f6cfebffa752ee11a7b07497b8529d5971de916c + git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c git apply ../ui/sd_internal/ddim_callback.patch git apply ../ui/sd_internal/env_yaml.patch @@ -41,7 +41,7 @@ else fi cd stable-diffusion - git checkout f6cfebffa752ee11a7b07497b8529d5971de916c + git -c advice.detachedHead=false checkout f6cfebffa752ee11a7b07497b8529d5971de916c git apply ../ui/sd_internal/ddim_callback.patch git apply ../ui/sd_internal/env_yaml.patch From 80c9c1bb054c3d25811f0a34cc3b45e039ada799 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 11:36:31 +0530 Subject: [PATCH 10/31] Install a new conda only if not already present locally --- scripts/bootstrap.bat | 5 ++--- scripts/bootstrap.sh | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap.bat b/scripts/bootstrap.bat index bf4e2198..5e1ddc97 100644 --- a/scripts/bootstrap.bat +++ b/scripts/bootstrap.bat @@ -14,10 +14,9 @@ set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/release @rem figure out whether git and conda needs to be installed if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Library\bin;%INSTALL_ENV_DIR%\Scripts;%INSTALL_ENV_DIR%\Library\usr\bin;%PATH% -set PACKAGES_TO_INSTALL= conda +set PACKAGES_TO_INSTALL= -rem call conda --version >.tmp1 2>.tmp2 -rem if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda +if not exist "%INSTALL_ENV_DIR%\etc\profile.d\conda.sh" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda call git --version >.tmp1 2>.tmp2 if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index ca3f86e6..b1a153fb 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -32,9 +32,9 @@ MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${OS_NAME}-${OS_A # figure out whether git and conda needs to be installed if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi -PACKAGES_TO_INSTALL=" conda" +PACKAGES_TO_INSTALL="" -# if ! hash "conda" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi +if [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi # (if necessary) install git and conda into a contained environment From 5ff14d1fed5a71d43659fbfe89c0022a383ce309 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 11:57:23 +0530 Subject: [PATCH 11/31] Install conda only if it's not present in the legacy and new installer dir --- scripts/bootstrap.bat | 5 ++++- scripts/bootstrap.sh | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap.bat b/scripts/bootstrap.bat index 5e1ddc97..afe4564e 100644 --- a/scripts/bootstrap.bat +++ b/scripts/bootstrap.bat @@ -9,6 +9,7 @@ @rem config set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba set INSTALL_ENV_DIR=%cd%\installer_files\env +set LEGACY_INSTALL_ENV_DIR=%cd%\installer set MICROMAMBA_DOWNLOAD_URL=https://github.com/cmdr2/stable-diffusion-ui/releases/download/v1.1/micromamba.exe @rem figure out whether git and conda needs to be installed @@ -16,7 +17,9 @@ if exist "%INSTALL_ENV_DIR%" set PATH=%INSTALL_ENV_DIR%;%INSTALL_ENV_DIR%\Librar set PACKAGES_TO_INSTALL= -if not exist "%INSTALL_ENV_DIR%\etc\profile.d\conda.sh" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda +if not exist "%LEGACY_INSTALL_ENV_DIR%\etc\profile.d\conda.sh" ( + if not exist "%INSTALL_ENV_DIR%\etc\profile.d\conda.sh" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% conda +) call git --version >.tmp1 2>.tmp2 if "%ERRORLEVEL%" NEQ "0" set PACKAGES_TO_INSTALL=%PACKAGES_TO_INSTALL% git diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index b1a153fb..936af41f 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -27,6 +27,7 @@ if [ "$OS_NAME" == "linux" ] && [ "$OS_ARCH" == "arm64" ]; then OS_ARCH="aarch64 # config export MAMBA_ROOT_PREFIX="$(pwd)/installer_files/mamba" INSTALL_ENV_DIR="$(pwd)/installer_files/env" +LEGACY_INSTALL_ENV_DIR="$(pwd)/installer/env" MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${OS_NAME}-${OS_ARCH}/latest" # figure out whether git and conda needs to be installed @@ -34,7 +35,7 @@ if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi PACKAGES_TO_INSTALL="" -if [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi +if [ ! -e "$LEGACY_INSTALL_ENV_DIR/etc/profile.d/conda.sh" ] && [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi # (if necessary) install git and conda into a contained environment From d0b7f58e7ce463ca5097dc48f322b4ff51311c68 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 15:02:03 +0530 Subject: [PATCH 12/31] Fix a bug in the new linux installer's legacy path --- scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 936af41f..ea5fc6ba 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -27,7 +27,7 @@ if [ "$OS_NAME" == "linux" ] && [ "$OS_ARCH" == "arm64" ]; then OS_ARCH="aarch64 # config export MAMBA_ROOT_PREFIX="$(pwd)/installer_files/mamba" INSTALL_ENV_DIR="$(pwd)/installer_files/env" -LEGACY_INSTALL_ENV_DIR="$(pwd)/installer/env" +LEGACY_INSTALL_ENV_DIR="$(pwd)/installer" MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${OS_NAME}-${OS_ARCH}/latest" # figure out whether git and conda needs to be installed From 8d1adf4f8088a6797010fdedee207010f1adf3ef Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Sun, 23 Oct 2022 15:13:24 +0530 Subject: [PATCH 13/31] Fix the incorrect command used for downloading and extracting micromamba on linux/osx --- scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index ea5fc6ba..c110b11f 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -45,7 +45,7 @@ if [ "$PACKAGES_TO_INSTALL" != "" ]; then echo "Downloading micromamba from $MICROMAMBA_DOWNLOAD_URL to $MAMBA_ROOT_PREFIX/micromamba" mkdir -p "$MAMBA_ROOT_PREFIX" - curl -L "$MICROMAMBA_DOWNLOAD_URL" | tar -xvj "$MAMBA_ROOT_PREFIX/micromamba" + curl -L "$MICROMAMBA_DOWNLOAD_URL" | tar -xvj bin/micromamba -O > "$MAMBA_ROOT_PREFIX/micromamba" chmod u+x "$MAMBA_ROOT_PREFIX/micromamba" From 615c61e2303713d00d374772f402b763877cdb81 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 12:44:05 +0530 Subject: [PATCH 14/31] Fix a broken PYTHONPATH export in the linux script, used ; instead of : --- scripts/on_sd_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 3ac9391e..ca8e698f 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -305,7 +305,7 @@ fi printf "\n\nStable Diffusion is ready!\n\n" SD_PATH=`pwd` -export PYTHONPATH="$SD_PATH;$SD_PATH/env/lib/python3.8/site-packages" +export PYTHONPATH="$SD_PATH:$SD_PATH/env/lib/python3.8/site-packages" echo "PYTHONPATH=$PYTHONPATH" cd .. From 60c37a1fc75179eeaced58b248983c2f41f2579e Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 12:48:56 +0530 Subject: [PATCH 15/31] Set the PYTHONPATH before testing the SD installation --- scripts/on_sd_start.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index ca8e698f..bd820fc6 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -80,6 +80,8 @@ else exit fi + export PYTHONPATH="$(pwd):$(pwd)/env/lib/python3.8/site-packages" + out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"` if [ "$out_test" != "42" ]; then printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n 1. Run this installer again.\n 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n 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\n 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n" From 95f37b9d361616ed7036d5c2e15524a0c6db2e55 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 13:00:57 +0530 Subject: [PATCH 16/31] Use conda 4.14 in the new installer as well (like the previous installer did) --- scripts/bootstrap.sh | 2 +- scripts/on_sd_start.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index c110b11f..73ea08fd 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -35,7 +35,7 @@ if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi PACKAGES_TO_INSTALL="" -if [ ! -e "$LEGACY_INSTALL_ENV_DIR/etc/profile.d/conda.sh" ] && [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi +if [ ! -e "$LEGACY_INSTALL_ENV_DIR/etc/profile.d/conda.sh" ] && [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda=4.14"; fi if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi # (if necessary) install git and conda into a contained environment diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index bd820fc6..ca8e698f 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -80,8 +80,6 @@ else exit fi - export PYTHONPATH="$(pwd):$(pwd)/env/lib/python3.8/site-packages" - out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"` if [ "$out_test" != "42" ]; then printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n 1. Run this installer again.\n 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n 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\n 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n" From 153a6e2cb02dceab8ec87f82b5be3daf0e6de186 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 14:30:08 +0530 Subject: [PATCH 17/31] Temporarily disable sd_start for linux --- scripts/on_sd_start.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index ca8e698f..4e8c62e9 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -6,6 +6,11 @@ cp sd-ui-files/scripts/bootstrap.sh scripts/ CONDA_BASEPATH=$(conda info --base) source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) +echo "$CONDA_BASEPATH/etc/profile.d/conda.sh" + +read -p "Temp check" +exit + # remove the old version of the dev console script, if it's still present if [ -e "open_dev_console.sh" ]; then rm "open_dev_console.sh" From f3da326b77dcfa7f2ce8718bde03d39f1d3b5ca9 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 14:36:57 +0530 Subject: [PATCH 18/31] Remove debug logging --- scripts/on_sd_start.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 4e8c62e9..ca8e698f 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -6,11 +6,6 @@ cp sd-ui-files/scripts/bootstrap.sh scripts/ CONDA_BASEPATH=$(conda info --base) source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) -echo "$CONDA_BASEPATH/etc/profile.d/conda.sh" - -read -p "Temp check" -exit - # remove the old version of the dev console script, if it's still present if [ -e "open_dev_console.sh" ]; then rm "open_dev_console.sh" From 967c1a2da9c1e9bcf13cf4ef87eedd5d21574555 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 15:42:22 +0530 Subject: [PATCH 19/31] No need for conda 4.14, disable the broken test for torch --- scripts/bootstrap.sh | 2 +- scripts/on_sd_start.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 73ea08fd..c110b11f 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -35,7 +35,7 @@ if [ -e "$INSTALL_ENV_DIR" ]; then export PATH="$INSTALL_ENV_DIR/bin:$PATH"; fi PACKAGES_TO_INSTALL="" -if [ ! -e "$LEGACY_INSTALL_ENV_DIR/etc/profile.d/conda.sh" ] && [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda=4.14"; fi +if [ ! -e "$LEGACY_INSTALL_ENV_DIR/etc/profile.d/conda.sh" ] && [ ! -e "$INSTALL_ENV_DIR/etc/profile.d/conda.sh" ]; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL conda"; fi if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi # (if necessary) install git and conda into a contained environment diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index ca8e698f..100d2c03 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -80,12 +80,12 @@ else exit fi - out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"` - if [ "$out_test" != "42" ]; then - printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n 1. Run this installer again.\n 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n 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\n 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n" - read -p "Press any key to continue" - exit - fi + # out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"` + # if [ "$out_test" != "42" ]; then + # printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n 1. Run this installer again.\n 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n 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\n 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n" + # read -p "Press any key to continue" + # exit + # fi echo conda_sd_env_created >> ../scripts/install_status.txt fi From 0d38c8ae8fc52620a1ae5b8b334a038ca5745d28 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 16:38:08 +0530 Subject: [PATCH 20/31] Bring back the post-installation test for torch --- scripts/on_sd_start.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 100d2c03..ca8e698f 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -80,12 +80,12 @@ else exit fi - # out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"` - # if [ "$out_test" != "42" ]; then - # printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n 1. Run this installer again.\n 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n 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\n 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n" - # read -p "Press any key to continue" - # exit - # fi + out_test=`python -c "import torch; import ldm; import transformers; import numpy; import antlr4; print(42)"` + if [ "$out_test" != "42" ]; then + printf "\n\nDependency test failed! Error installing the packages necessary for Stable Diffusion. Sorry about that, please try to:\n 1. Run this installer again.\n 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n 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\n 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n" + read -p "Press any key to continue" + exit + fi echo conda_sd_env_created >> ../scripts/install_status.txt fi From 538dcec34817fbf5eaa5ed2ee28e7ceeeb08b054 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 17:26:33 +0530 Subject: [PATCH 21/31] deactivate any pre-activated conda environments before installing --- scripts/on_sd_start.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index ca8e698f..d0036f51 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -6,6 +6,11 @@ cp sd-ui-files/scripts/bootstrap.sh scripts/ CONDA_BASEPATH=$(conda info --base) source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) +# deactivate any pre-activated conda environments +for i in $(seq ${CONDA_SHLVL}); do + conda deactivate +done + # remove the old version of the dev console script, if it's still present if [ -e "open_dev_console.sh" ]; then rm "open_dev_console.sh" From a281efef0445f157c94698ddb4663013a82e6609 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 18:07:29 +0530 Subject: [PATCH 22/31] deactivate any pre-activated conda environments, by returning to (base) and then deactivating that. On Windows and Linux --- scripts/on_sd_start.bat | 4 ++++ scripts/on_sd_start.sh | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 0418895d..096538f6 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -68,6 +68,10 @@ if exist "%cd%\profile" ( set TMP=%cd%\tmp set TEMP=%cd%\tmp + @REM deactivate any pre-activated conda environments, by returning to (base) and then deactivating that + call conda activate + call conda deactivate + @call conda env create --prefix env -f environment.yaml || ( @echo. & echo "Error installing the packages necessary for Stable Diffusion. 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 diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index d0036f51..55e00d22 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -6,11 +6,6 @@ cp sd-ui-files/scripts/bootstrap.sh scripts/ CONDA_BASEPATH=$(conda info --base) source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) -# deactivate any pre-activated conda environments -for i in $(seq ${CONDA_SHLVL}); do - conda deactivate -done - # remove the old version of the dev console script, if it's still present if [ -e "open_dev_console.sh" ]; then rm "open_dev_console.sh" @@ -67,6 +62,10 @@ else # prevent conda from using packages from the user's home directory, to avoid conflicts export PYTHONNOUSERSITE=1 + # deactivate any pre-activated conda environments, by returning to (base) and then deactivating that + conda activate + conda deactivate + if conda env create --prefix env --force -f environment.yaml ; then echo "Installed. Testing.." else From 0c2d227da144b4be760d6dc74b13048226552547 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 19:21:26 +0530 Subject: [PATCH 23/31] Activate the installer env while starting up, like the previous installer did in the start script --- scripts/Start Stable Diffusion UI.cmd | 3 +++ scripts/on_sd_start.bat | 4 ---- scripts/on_sd_start.sh | 7 ------- scripts/start.sh | 6 ++++++ 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd index 428da218..c0880c0f 100644 --- a/scripts/Start Stable Diffusion UI.cmd +++ b/scripts/Start Stable Diffusion UI.cmd @@ -11,6 +11,9 @@ call scripts\bootstrap.bat @rem set new installer's PATH, if it downloaded any packages if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH% +@rem activate the installer env +conda activate + @rem Test the bootstrap call where git call git --version diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 096538f6..0418895d 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -68,10 +68,6 @@ if exist "%cd%\profile" ( set TMP=%cd%\tmp set TEMP=%cd%\tmp - @REM deactivate any pre-activated conda environments, by returning to (base) and then deactivating that - call conda activate - call conda deactivate - @call conda env create --prefix env -f environment.yaml || ( @echo. & echo "Error installing the packages necessary for Stable Diffusion. 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 diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 55e00d22..84cd7887 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -3,9 +3,6 @@ cp sd-ui-files/scripts/on_env_start.sh scripts/ cp sd-ui-files/scripts/bootstrap.sh scripts/ -CONDA_BASEPATH=$(conda info --base) -source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) - # remove the old version of the dev console script, if it's still present if [ -e "open_dev_console.sh" ]; then rm "open_dev_console.sh" @@ -62,10 +59,6 @@ else # prevent conda from using packages from the user's home directory, to avoid conflicts export PYTHONNOUSERSITE=1 - # deactivate any pre-activated conda environments, by returning to (base) and then deactivating that - conda activate - conda deactivate - if conda env create --prefix env --force -f environment.yaml ; then echo "Installed. Testing.." else diff --git a/scripts/start.sh b/scripts/start.sh index e5981434..9bc23c07 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -9,6 +9,12 @@ scripts/bootstrap.sh # set new installer's PATH, if it downloaded any packages if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi +# activate the installer env +CONDA_BASEPATH=$(conda info --base) +source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error + +conda activate + # Test the bootstrap which git git --version From f732fa97360df6c9261d5fa90846c8b5d6eabdd3 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 20:26:46 +0530 Subject: [PATCH 24/31] Use call to start the conda script; activate the installer env first even in the developer console --- scripts/Developer Console.cmd | 3 +++ scripts/Start Stable Diffusion UI.cmd | 2 +- scripts/developer_console.sh | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/Developer Console.cmd b/scripts/Developer Console.cmd index 81676136..6b70b54f 100644 --- a/scripts/Developer Console.cmd +++ b/scripts/Developer Console.cmd @@ -8,6 +8,9 @@ set PATH=C:\Windows\System32;%PATH% if exist "installer" set PATH=%cd%\installer;%cd%\installer\Library\bin;%cd%\installer\Scripts;%cd%\installer\Library\usr\bin;%PATH% if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH% +@rem activate the installer env +call conda activate + @rem Test the environment echo "Environment Info:" call where git diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd index c0880c0f..5453a606 100644 --- a/scripts/Start Stable Diffusion UI.cmd +++ b/scripts/Start Stable Diffusion UI.cmd @@ -12,7 +12,7 @@ call scripts\bootstrap.bat if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH% @rem activate the installer env -conda activate +call conda activate @rem Test the bootstrap call where git diff --git a/scripts/developer_console.sh b/scripts/developer_console.sh index b9f1341e..a36c6a14 100755 --- a/scripts/developer_console.sh +++ b/scripts/developer_console.sh @@ -8,6 +8,12 @@ if [ "$0" == "bash" ]; then if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi + # activate the installer env + CONDA_BASEPATH=$(conda info --base) + source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error + + conda activate + # test the environment echo "Environment Info:" which git From 1b4ba3b3969270a5ab0d97891ca5a3ca8d132f71 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 11:26:10 +0530 Subject: [PATCH 25/31] Update the build scripts for generating the installers --- build.bat | 58 +++++++++++++++++++++++++++------------------------- build.sh | 61 +++++++++++++++++++++++++------------------------------ 2 files changed, 58 insertions(+), 61 deletions(-) diff --git a/build.bat b/build.bat index 96232c0a..01ba4046 100644 --- a/build.bat +++ b/build.bat @@ -8,40 +8,42 @@ set /p answer=Are you a developer of this project (Y/N)? if /i "%answer:~,1%" NEQ "Y" exit /b -@set PYTHONNOUSERSITE=1 +mkdir dist\win\stable-diffusion-ui +mkdir dist\linux-mac\stable-diffusion-ui -@mkdir dist\stable-diffusion-ui +@rem copy the installer files for Windows -@echo "Downloading components for the installer.." +copy scripts\on_env_start.bat dist\win\stable-diffusion-ui\scripts\ +copy scripts\bootstrap.bat dist\win\stable-diffusion-ui\scripts\ +copy "scripts\Start Stable Diffusion UI.cmd" dist\win\stable-diffusion-ui\ +copy LICENSE dist\win\stable-diffusion-ui\ +copy "CreativeML Open RAIL-M License" dist\win\stable-diffusion-ui\ +copy "\How to install and run.txt" dist\win\stable-diffusion-ui\ +echo. > dist\win\stable-diffusion-ui\scripts\install_status.txt -@call conda env create --prefix installer -f environment.yaml -@call conda activate .\installer +@rem copy the installer files for Linux and Mac -@echo "Creating a distributable package.." +copy scripts\on_env_start.sh dist\linux-mac\stable-diffusion-ui\scripts\ +copy scripts\bootstrap.sh dist\linux-mac\stable-diffusion-ui\scripts\ +copy scripts\start.sh dist\linux-mac\stable-diffusion-ui\ +copy LICENSE dist\linux-mac\stable-diffusion-ui\ +copy "CreativeML Open RAIL-M License" dist\linux-mac\stable-diffusion-ui\ +copy "\How to install and run.txt" dist\linux-mac\stable-diffusion-ui\ +echo. > dist\linux-mac\stable-diffusion-ui\scripts\install_status.txt -@call conda install -c conda-forge -y conda-pack -@call conda pack --n-threads -1 --prefix installer --format tar +@rem make the zip -@cd dist\stable-diffusion-ui -@mkdir installer +cd dist\win +call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-win-x64.zip +cd ..\.. -@call tar -xf ..\..\installer.tar -C installer +cd dist\linux-mac +call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-linux-x64.zip +call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-linux-arm64.zip +call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-mac-x64.zip +call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-mac-arm64.zip +cd ..\.. -@mkdir scripts +echo "Build ready. Upload the zip files inside the 'dist' folder." -@copy ..\..\scripts\on_env_start.bat scripts\ -@copy "..\..\scripts\Start Stable Diffusion UI.cmd" . -@copy ..\..\LICENSE . -@copy "..\..\CreativeML Open RAIL-M License" . -@copy "..\..\How to install and run.txt" . -@echo. > scripts\install_status.txt - -@echo "Build ready. Zip the 'dist\stable-diffusion-ui' folder." - -@echo "Cleaning up.." - -@cd ..\.. - -@rmdir /s /q installer - -@del installer.tar \ No newline at end of file +pause diff --git a/build.sh b/build.sh index 577dcb8b..00a8e9a5 100755 --- a/build.sh +++ b/build.sh @@ -11,45 +11,40 @@ case $yn in * ) exit;; esac -export PYTHONNOUSERSITE=1 +mkdir -p dist/win/stable-diffusion-ui +mkdir -p dist/linux-mac/stable-diffusion-ui -mkdir -p dist/stable-diffusion-ui +# copy the installer files for Windows -echo "Downloading components for the installer.." +cp scripts/on_env_start.bat dist/win/stable-diffusion-ui/scripts/ +cp scripts/bootstrap.bat dist/win/stable-diffusion-ui/scripts/ +cp "scripts/Start Stable Diffusion UI.cmd" dist/win/stable-diffusion-ui/ +cp LICENSE dist/win/stable-diffusion-ui/ +cp "CreativeML Open RAIL-M License" dist/win/stable-diffusion-ui/ +cp "/How to install and run.txt" dist/win/stable-diffusion-ui/ +echo. > dist/win/stable-diffusion-ui/scripts/install_status.txt -source ~/miniconda3/etc/profile.d/conda.sh +# copy the installer files for Linux and Mac -conda install -c conda-forge -y conda-pack +cp scripts/on_env_start.sh dist/linux-mac/stable-diffusion-ui/scripts/ +cp scripts/bootstrap.sh dist/linux-mac/stable-diffusion-ui/scripts/ +cp scripts/start.sh dist/linux-mac/stable-diffusion-ui/ +cp LICENSE dist/linux-mac/stable-diffusion-ui/ +cp "CreativeML Open RAIL-M License" dist/linux-mac/stable-diffusion-ui/ +cp "/How to install and run.txt" dist/linux-mac/stable-diffusion-ui/ +echo. > dist/linux-mac/stable-diffusion-ui/scripts/install_status.txt -conda env create --prefix installer -f environment.yaml -conda activate ./installer - -echo "Creating a distributable package.." - -conda pack --n-threads -1 --prefix installer --format tar - -cd dist/stable-diffusion-ui -mkdir installer - -tar -xf ../../installer.tar -C installer - -mkdir scripts - -cp ../../scripts/on_env_start.sh scripts/ -cp ../../scripts/start.sh . -cp ../../LICENSE . -cp "../../CreativeML Open RAIL-M License" . -cp "../../How to install and run.txt" . -echo "" > scripts/install_status.txt - -chmod u+x start.sh - -echo "Build ready. Zip the 'dist/stable-diffusion-ui' folder." - -echo "Cleaning up.." +# make the zip +cd dist/win +zip -r ../stable-diffusion-ui-win-x64.zip stable-diffusion-ui cd ../.. -rm -rf installer +cd dist/linux-mac +zip -r ../stable-diffusion-ui-linux-x64.zip stable-diffusion-ui +zip -r ../stable-diffusion-ui-linux-arm64.zip stable-diffusion-ui +zip -r ../stable-diffusion-ui-mac-x64.zip stable-diffusion-ui +zip -r ../stable-diffusion-ui-mac-arm64.zip stable-diffusion-ui +cd ../.. -rm installer.tar \ No newline at end of file +echo "Build ready. Upload the zip files inside the 'dist' folder." From da9af8673f99cf51a10dee4d1b8ae1d7d6ecfc41 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 11:27:34 +0530 Subject: [PATCH 26/31] Create the scripts folder in the installers --- build.bat | 4 ++-- build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index 01ba4046..329d9cab 100644 --- a/build.bat +++ b/build.bat @@ -8,8 +8,8 @@ set /p answer=Are you a developer of this project (Y/N)? if /i "%answer:~,1%" NEQ "Y" exit /b -mkdir dist\win\stable-diffusion-ui -mkdir dist\linux-mac\stable-diffusion-ui +mkdir dist\win\stable-diffusion-ui\scripts +mkdir dist\linux-mac\stable-diffusion-ui\scripts @rem copy the installer files for Windows diff --git a/build.sh b/build.sh index 00a8e9a5..19968553 100755 --- a/build.sh +++ b/build.sh @@ -11,8 +11,8 @@ case $yn in * ) exit;; esac -mkdir -p dist/win/stable-diffusion-ui -mkdir -p dist/linux-mac/stable-diffusion-ui +mkdir -p dist/win/stable-diffusion-ui/scripts +mkdir -p dist/linux-mac/stable-diffusion-ui/scripts # copy the installer files for Windows From a83b3f840875def2235cdaf3d7d4eebf1bf75b82 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 11:28:45 +0530 Subject: [PATCH 27/31] typo in the help copy script --- build.bat | 4 ++-- build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index 329d9cab..729d233d 100644 --- a/build.bat +++ b/build.bat @@ -18,7 +18,7 @@ copy scripts\bootstrap.bat dist\win\stable-diffusion-ui\scripts\ copy "scripts\Start Stable Diffusion UI.cmd" dist\win\stable-diffusion-ui\ copy LICENSE dist\win\stable-diffusion-ui\ copy "CreativeML Open RAIL-M License" dist\win\stable-diffusion-ui\ -copy "\How to install and run.txt" dist\win\stable-diffusion-ui\ +copy "How to install and run.txt" dist\win\stable-diffusion-ui\ echo. > dist\win\stable-diffusion-ui\scripts\install_status.txt @rem copy the installer files for Linux and Mac @@ -28,7 +28,7 @@ copy scripts\bootstrap.sh dist\linux-mac\stable-diffusion-ui\scripts\ copy scripts\start.sh dist\linux-mac\stable-diffusion-ui\ copy LICENSE dist\linux-mac\stable-diffusion-ui\ copy "CreativeML Open RAIL-M License" dist\linux-mac\stable-diffusion-ui\ -copy "\How to install and run.txt" dist\linux-mac\stable-diffusion-ui\ +copy "How to install and run.txt" dist\linux-mac\stable-diffusion-ui\ echo. > dist\linux-mac\stable-diffusion-ui\scripts\install_status.txt @rem make the zip diff --git a/build.sh b/build.sh index 19968553..8c408d7a 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ cp scripts/bootstrap.bat dist/win/stable-diffusion-ui/scripts/ cp "scripts/Start Stable Diffusion UI.cmd" dist/win/stable-diffusion-ui/ cp LICENSE dist/win/stable-diffusion-ui/ cp "CreativeML Open RAIL-M License" dist/win/stable-diffusion-ui/ -cp "/How to install and run.txt" dist/win/stable-diffusion-ui/ +cp "How to install and run.txt" dist/win/stable-diffusion-ui/ echo. > dist/win/stable-diffusion-ui/scripts/install_status.txt # copy the installer files for Linux and Mac @@ -31,7 +31,7 @@ cp scripts/bootstrap.sh dist/linux-mac/stable-diffusion-ui/scripts/ cp scripts/start.sh dist/linux-mac/stable-diffusion-ui/ cp LICENSE dist/linux-mac/stable-diffusion-ui/ cp "CreativeML Open RAIL-M License" dist/linux-mac/stable-diffusion-ui/ -cp "/How to install and run.txt" dist/linux-mac/stable-diffusion-ui/ +cp "How to install and run.txt" dist/linux-mac/stable-diffusion-ui/ echo. > dist/linux-mac/stable-diffusion-ui/scripts/install_status.txt # make the zip From d4d5b5a75c43c65d84d214e28f0007223e66de6e Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 11:40:27 +0530 Subject: [PATCH 28/31] Fix the echo script --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 8c408d7a..e71370bf 100755 --- a/build.sh +++ b/build.sh @@ -22,7 +22,7 @@ cp "scripts/Start Stable Diffusion UI.cmd" dist/win/stable-diffusion-ui/ cp LICENSE dist/win/stable-diffusion-ui/ cp "CreativeML Open RAIL-M License" dist/win/stable-diffusion-ui/ cp "How to install and run.txt" dist/win/stable-diffusion-ui/ -echo. > dist/win/stable-diffusion-ui/scripts/install_status.txt +echo "" > dist/win/stable-diffusion-ui/scripts/install_status.txt # copy the installer files for Linux and Mac @@ -32,7 +32,7 @@ cp scripts/start.sh dist/linux-mac/stable-diffusion-ui/ cp LICENSE dist/linux-mac/stable-diffusion-ui/ cp "CreativeML Open RAIL-M License" dist/linux-mac/stable-diffusion-ui/ cp "How to install and run.txt" dist/linux-mac/stable-diffusion-ui/ -echo. > dist/linux-mac/stable-diffusion-ui/scripts/install_status.txt +echo "" > dist/linux-mac/stable-diffusion-ui/scripts/install_status.txt # make the zip From dcb27e7de8041ef6336d4090676ba2156b594724 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 11:45:43 +0530 Subject: [PATCH 29/31] Build the win installer on windows, and linux/mac installer on linux/mac --- build.bat | 28 ++++++++++++++-------------- build.sh | 22 +++++++++++----------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build.bat b/build.bat index 729d233d..64d4f944 100644 --- a/build.bat +++ b/build.bat @@ -9,7 +9,7 @@ set /p answer=Are you a developer of this project (Y/N)? if /i "%answer:~,1%" NEQ "Y" exit /b mkdir dist\win\stable-diffusion-ui\scripts -mkdir dist\linux-mac\stable-diffusion-ui\scripts +@REM mkdir dist\linux-mac\stable-diffusion-ui\scripts @rem copy the installer files for Windows @@ -23,13 +23,13 @@ echo. > dist\win\stable-diffusion-ui\scripts\install_status.txt @rem copy the installer files for Linux and Mac -copy scripts\on_env_start.sh dist\linux-mac\stable-diffusion-ui\scripts\ -copy scripts\bootstrap.sh dist\linux-mac\stable-diffusion-ui\scripts\ -copy scripts\start.sh dist\linux-mac\stable-diffusion-ui\ -copy LICENSE dist\linux-mac\stable-diffusion-ui\ -copy "CreativeML Open RAIL-M License" dist\linux-mac\stable-diffusion-ui\ -copy "How to install and run.txt" dist\linux-mac\stable-diffusion-ui\ -echo. > dist\linux-mac\stable-diffusion-ui\scripts\install_status.txt +@REM copy scripts\on_env_start.sh dist\linux-mac\stable-diffusion-ui\scripts\ +@REM copy scripts\bootstrap.sh dist\linux-mac\stable-diffusion-ui\scripts\ +@REM copy scripts\start.sh dist\linux-mac\stable-diffusion-ui\ +@REM copy LICENSE dist\linux-mac\stable-diffusion-ui\ +@REM copy "CreativeML Open RAIL-M License" dist\linux-mac\stable-diffusion-ui\ +@REM copy "How to install and run.txt" dist\linux-mac\stable-diffusion-ui\ +@REM echo. > dist\linux-mac\stable-diffusion-ui\scripts\install_status.txt @rem make the zip @@ -37,12 +37,12 @@ cd dist\win call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-win-x64.zip cd ..\.. -cd dist\linux-mac -call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-linux-x64.zip -call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-linux-arm64.zip -call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-mac-x64.zip -call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-mac-arm64.zip -cd ..\.. +@REM cd dist\linux-mac +@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-linux-x64.zip +@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-linux-arm64.zip +@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-mac-x64.zip +@REM call powershell Compress-Archive -Path stable-diffusion-ui -DestinationPath ..\stable-diffusion-ui-mac-arm64.zip +@REM cd ..\.. echo "Build ready. Upload the zip files inside the 'dist' folder." diff --git a/build.sh b/build.sh index e71370bf..6b493330 100755 --- a/build.sh +++ b/build.sh @@ -11,18 +11,18 @@ case $yn in * ) exit;; esac -mkdir -p dist/win/stable-diffusion-ui/scripts +# mkdir -p dist/win/stable-diffusion-ui/scripts mkdir -p dist/linux-mac/stable-diffusion-ui/scripts # copy the installer files for Windows -cp scripts/on_env_start.bat dist/win/stable-diffusion-ui/scripts/ -cp scripts/bootstrap.bat dist/win/stable-diffusion-ui/scripts/ -cp "scripts/Start Stable Diffusion UI.cmd" dist/win/stable-diffusion-ui/ -cp LICENSE dist/win/stable-diffusion-ui/ -cp "CreativeML Open RAIL-M License" dist/win/stable-diffusion-ui/ -cp "How to install and run.txt" dist/win/stable-diffusion-ui/ -echo "" > dist/win/stable-diffusion-ui/scripts/install_status.txt +# cp scripts/on_env_start.bat dist/win/stable-diffusion-ui/scripts/ +# cp scripts/bootstrap.bat dist/win/stable-diffusion-ui/scripts/ +# cp "scripts/Start Stable Diffusion UI.cmd" dist/win/stable-diffusion-ui/ +# cp LICENSE dist/win/stable-diffusion-ui/ +# cp "CreativeML Open RAIL-M License" dist/win/stable-diffusion-ui/ +# cp "How to install and run.txt" dist/win/stable-diffusion-ui/ +# echo "" > dist/win/stable-diffusion-ui/scripts/install_status.txt # copy the installer files for Linux and Mac @@ -36,9 +36,9 @@ echo "" > dist/linux-mac/stable-diffusion-ui/scripts/install_status.txt # make the zip -cd dist/win -zip -r ../stable-diffusion-ui-win-x64.zip stable-diffusion-ui -cd ../.. +# cd dist/win +# zip -r ../stable-diffusion-ui-win-x64.zip stable-diffusion-ui +# cd ../.. cd dist/linux-mac zip -r ../stable-diffusion-ui-linux-x64.zip stable-diffusion-ui From 137e519b6674dc9c84e63b90c549a80a5d540d77 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 12:15:58 +0530 Subject: [PATCH 30/31] Move the installer activation to on_sd_start --- scripts/Start Stable Diffusion UI.cmd | 3 --- scripts/on_sd_start.bat | 11 +++++++---- scripts/on_sd_start.sh | 6 ++++++ scripts/start.sh | 6 ------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/Start Stable Diffusion UI.cmd b/scripts/Start Stable Diffusion UI.cmd index 5453a606..428da218 100644 --- a/scripts/Start Stable Diffusion UI.cmd +++ b/scripts/Start Stable Diffusion UI.cmd @@ -11,9 +11,6 @@ call scripts\bootstrap.bat @rem set new installer's PATH, if it downloaded any packages if exist "installer_files\env" set PATH=%cd%\installer_files\env;%cd%\installer_files\env\Library\bin;%cd%\installer_files\env\Scripts;%cd%\installer_files\Library\usr\bin;%PATH% -@rem activate the installer env -call conda activate - @rem Test the bootstrap call where git call git --version diff --git a/scripts/on_sd_start.bat b/scripts/on_sd_start.bat index 0418895d..75395f0a 100644 --- a/scripts/on_sd_start.bat +++ b/scripts/on_sd_start.bat @@ -3,6 +3,13 @@ @copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y @copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y +if exist "%cd%\profile" ( + set USERPROFILE=%cd%\profile +) + +@rem activate the installer env +call conda activate + @REM Caution, this file will make your eyes and brain bleed. It's such an unholy mess. @REM Note to self: Please rewrite this in Python. For the sake of your own sanity. @@ -11,10 +18,6 @@ if exist "Open Developer Console.cmd" del "Open Developer Console.cmd" @call python -c "import os; import shutil; frm = 'sd-ui-files\\ui\\hotfix\\9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');" -if exist "%cd%\profile" ( - set USERPROFILE=%cd%\profile -) - @>nul findstr /m "sd_git_cloned" scripts\install_status.txt @if "%ERRORLEVEL%" EQU "0" ( @echo "Stable Diffusion's git repository was already installed. Updating.." diff --git a/scripts/on_sd_start.sh b/scripts/on_sd_start.sh index 84cd7887..83035e1b 100755 --- a/scripts/on_sd_start.sh +++ b/scripts/on_sd_start.sh @@ -3,6 +3,12 @@ cp sd-ui-files/scripts/on_env_start.sh scripts/ cp sd-ui-files/scripts/bootstrap.sh scripts/ +# activate the installer env +CONDA_BASEPATH=$(conda info --base) +source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error + +conda activate + # remove the old version of the dev console script, if it's still present if [ -e "open_dev_console.sh" ]; then rm "open_dev_console.sh" diff --git a/scripts/start.sh b/scripts/start.sh index 9bc23c07..e5981434 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -9,12 +9,6 @@ scripts/bootstrap.sh # set new installer's PATH, if it downloaded any packages if [ -e "installer_files/env" ]; then export PATH="$(pwd)/installer_files/env/bin:$PATH"; fi -# activate the installer env -CONDA_BASEPATH=$(conda info --base) -source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # avoids the 'shell not initialized' error - -conda activate - # Test the bootstrap which git git --version From 1f0db48487ad679485b061534ab0834525a29314 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 12:53:22 +0530 Subject: [PATCH 31/31] Bump version --- ui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.html b/ui/index.html index 63646123..02dbcbdd 100644 --- a/ui/index.html +++ b/ui/index.html @@ -18,7 +18,7 @@