From 807498698de9cbdb13a03a7eeeb1608c5cec031c Mon Sep 17 00:00:00 2001 From: Rob Ballantyne Date: Mon, 17 Jun 2024 00:32:20 +0100 Subject: [PATCH] Fix provisioning --- .../stable_diffusion/models/codeformer/.gitkeep | 0 .../stable_diffusion/models/controlnet/.gitkeep | 0 .../stable_diffusion/models/deepbooru/.gitkeep | 0 .../stable_diffusion/models/deforum/.gitkeep | 0 .../stable_diffusion/models/dreambooth/.gitkeep | 0 .../stable_diffusion/models/esrgan/.gitkeep | 0 .../stable_diffusion/models/gfpgan/.gitkeep | 0 .../models/hypernetworks/.gitkeep | 0 .../stable_diffusion/models/insightface/.gitkeep | 0 .../stable_diffusion/models/karlo/.gitkeep | 0 .../stable_diffusion/models/ldsr/.gitkeep | 0 .../stable_diffusion/models/lora/.gitkeep | 0 .../stable_diffusion/models/reactor/.gitkeep | 0 .../stable_diffusion/models/swinIR/.gitkeep | 0 .../storage/stable_diffusion/models/vae/.gitkeep | 0 .../stable_diffusion/models/vae_approx/.gitkeep | 0 config/provisioning/default.sh | 16 +++------------- 17 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/codeformer/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/controlnet/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/deepbooru/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/deforum/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/dreambooth/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/esrgan/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/gfpgan/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/hypernetworks/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/insightface/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/karlo/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/ldsr/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/lora/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/reactor/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/swinIR/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/vae/.gitkeep delete mode 100644 build/COPY_ROOT_99/opt/storage/stable_diffusion/models/vae_approx/.gitkeep diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/codeformer/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/codeformer/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/controlnet/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/controlnet/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/deepbooru/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/deepbooru/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/deforum/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/deforum/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/dreambooth/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/dreambooth/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/esrgan/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/esrgan/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/gfpgan/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/gfpgan/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/hypernetworks/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/hypernetworks/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/insightface/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/insightface/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/karlo/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/karlo/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/ldsr/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/ldsr/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/lora/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/lora/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/reactor/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/reactor/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/swinIR/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/swinIR/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/vae/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/vae/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/vae_approx/.gitkeep b/build/COPY_ROOT_99/opt/storage/stable_diffusion/models/vae_approx/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/config/provisioning/default.sh b/config/provisioning/default.sh index 37d72dd..a44c235 100755 --- a/config/provisioning/default.sh +++ b/config/provisioning/default.sh @@ -7,17 +7,11 @@ ### Edit the following arrays to suit your workflow - values must be quoted and separated by newlines or spaces. DISK_GB_REQUIRED=30 - -MAMBA_PACKAGES=( - #"package1" - #"package2=version" - ) PIP_PACKAGES=( #"package==version" ) - CHECKPOINT_MODELS=( "https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt" #"https://huggingface.co/stabilityai/stable-diffusion-2-1/resolve/main/v2-1_768-ema-pruned.ckpt" @@ -30,6 +24,8 @@ CHECKPOINT_MODELS=( function provisioning_start() { source /opt/ai-dock/etc/environment.sh + source /opt/ai-dock/bin/venv-set.sh kohya + DISK_GB_AVAILABLE=$(($(df --output=avail -m "${WORKSPACE}" | tail -n1) / 1000)) DISK_GB_USED=$(($(df --output=used -m "${WORKSPACE}" | tail -n1) / 1000)) DISK_GB_ALLOCATED=$(($DISK_GB_AVAILABLE + $DISK_GB_USED)) @@ -43,15 +39,9 @@ function provisioning_start() { provisioning_print_end } -function provisioning_get_mamba_packages() { - if [[ -n $MAMBA_PACKAGES ]]; then - $MAMBA_INSTALL -n kohya_ss ${MAMBA_PACKAGES[@]} - fi -} - function provisioning_get_pip_packages() { if [[ -n $PIP_PACKAGES ]]; then - micromamba run -n kohya_ss $PIP_INSTALL ${PIP_PACKAGES[@]} + "$KOHYA_VENV_PIP" install --no-cache-dir ${PIP_PACKAGES[@]} fi }