From b9f436812b9babe5a3655f9b19a5cd5d27903cc5 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 7 Mar 2023 19:40:58 +0530 Subject: [PATCH] Download the default CLIP model during NSIS installation; Allow setting the path to an existing installation, which will be used for creating the installer executable --- NSIS/.gitignore | 1 + NSIS/nsisconf.nsh | 1 + NSIS/sdui.nsi | 14 ++++++++++---- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 NSIS/.gitignore create mode 100644 NSIS/nsisconf.nsh diff --git a/NSIS/.gitignore b/NSIS/.gitignore new file mode 100644 index 00000000..b883f1fd --- /dev/null +++ b/NSIS/.gitignore @@ -0,0 +1 @@ +*.exe diff --git a/NSIS/nsisconf.nsh b/NSIS/nsisconf.nsh new file mode 100644 index 00000000..665945b1 --- /dev/null +++ b/NSIS/nsisconf.nsh @@ -0,0 +1 @@ +!define EXISTING_INSTALLATION_DIR "D:\path\to\installed\easy-diffusion" \ No newline at end of file diff --git a/NSIS/sdui.nsi b/NSIS/sdui.nsi index eec64c35..6735ede2 100644 --- a/NSIS/sdui.nsi +++ b/NSIS/sdui.nsi @@ -17,6 +17,8 @@ RequestExecutionLevel user !include "LogicLib.nsh" !include "nsDialogs.nsh" +!include "nsisconf.nsh" + Var Dialog Var Label Var Button @@ -203,13 +205,14 @@ Section "MainSection" SEC01 File "..\How to install and run.txt" File "..\LICENSE" File "..\scripts\Start Stable Diffusion UI.cmd" - File /r "D:\path\to\installed\folder\installer_files" + File /r "${EXISTING_INSTALLATION_DIR}\installer_files" + File /r "${EXISTING_INSTALLATION_DIR}\profile" + File /r "${EXISTING_INSTALLATION_DIR}\sd-ui-files" SetOutPath "$INSTDIR\scripts" File "..\scripts\bootstrap.bat" - File "..\scripts\install_status.txt" + File "${EXISTING_INSTALLATION_DIR}\scripts\install_status.txt" File "..\scripts\on_env_start.bat" File "C:\windows\system32\curl.exe" - CreateDirectory "$INSTDIR\profile" CreateDirectory "$INSTDIR\models" CreateDirectory "$INSTDIR\models\stable-diffusion" CreateDirectory "$INSTDIR\models\gfpgan" @@ -232,7 +235,10 @@ Section "MainSection" SEC01 DetailPrint 'Downloading the default VAE (sd-vae-ft-mse-original) model...' NScurl::http get "https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt" "$INSTDIR\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" /CANCEL /INSIST /END - + + DetailPrint 'Downloading the CLIP model (clip-vit-large-patch14)...' + NScurl::http get "https://huggingface.co/openai/clip-vit-large-patch14/resolve/8d052a0f05efbaefbc9e8786ba291cfdf93e5bff/pytorch_model.bin" "$INSTDIR\profile\.cache\huggingface\hub\models--openai--clip-vit-large-patch14\snapshots\8d052a0f05efbaefbc9e8786ba291cfdf93e5bff\pytorch_model.bin" /CANCEL /INSIST /END + SectionEnd ;---------------------------------------------------------------------------------------------------------