up

Dockerfile

@@ -22,20 +22,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 RUN useradd -m huggingface
 
-USER huggingface
-
-WORKDIR /home/huggingface
-
+# RUN wget https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.5.24/Easy-Diffusion-Linux.zip && \
+#     unzip Easy-Diffusion-Linux.zip && \
+#     rm Easy-Diffusion-Linux.zip
 
-RUN wget https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.5.24/Easy-Diffusion-Linux.zip && \
-    unzip Easy-Diffusion-Linux.zip && \
-    rm Easy-Diffusion-Linux.zip
+EXPOSE 9000
 
-# ENTRYPOINT [ "docker-entrypoint.py" ]
-RUN cd easy-diffusion && \
-    ls -l
+RUN chown -R huggingface /home/huggingface/easy-diffusion
+RUN chmod -R u+x /home/huggingface/easy-diffusion
+     
+USER huggingface
 
-EXPOSE 9000
+WORKDIR /home/huggingface
 
-CMD [ "./start,sh" ]
+CMD [ "easy-diffusion/start.sh" ]
      

build.sh

@@ -1,95 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-CWD=$(basename "$PWD")
-
-set_gpu_arg() {
-    while [ "$#" -gt 0 ]; do
-        if [ "$1" = "--device" ] && [ "$2" = "cpu" ]; then
-            GPU_ARG=""
-            return
-        fi
-        shift
-    done
-    GPU_ARG="--gpus=all"
-}
-
-build() {
-    docker build . --tag "$CWD"
-}
-
-clean() {
-    docker system prune -f
-}
-
-dev() {
-    docker run --rm --gpus=all --entrypoint=sh \
-        -v huggingface:/home/huggingface/.cache/huggingface \
-        -v "$PWD"/input:/home/huggingface/input \
-        -v "$PWD"/output:/home/huggingface/output \
-        -it "$CWD"
-}
-
-pull() {
-    GHCR="ghcr.io/fboulnois/stable-diffusion-docker"
-    docker pull "$GHCR"
-    docker tag "$GHCR" "$CWD"
-}
-
-run() {
-    set_gpu_arg "$@"
-    docker run --rm ${GPU_ARG} \
-        -v huggingface:/home/huggingface/.cache/huggingface \
-        -v "$PWD"/input:/home/huggingface/input \
-        -v "$PWD"/output:/home/huggingface/output \
-        "$CWD" "$@"
-}
-
-tests() {
-    BASE_URL="https://raw.githubusercontent.com/fboulnois/repository-assets/main/assets/stable-diffusion-docker"
-    TEST_IMAGE="An_impressionist_painting_of_a_parakeet_eating_spaghetti_in_the_desert_full.png"
-    curl -sL "${BASE_URL}/${TEST_IMAGE}" > "$PWD/input/${TEST_IMAGE}"
-    run --skip --height 512 --width 640 "abstract art"
-    run --device cpu --onnx --image "${TEST_IMAGE}" --strength 0.6 "abstract art"
-    run --model "stabilityai/stable-diffusion-2" \
-        --skip --height 768 --width 768 "abstract art"
-    run --model "stabilityai/stable-diffusion-2-1" \
-        --skip --height 768 --width 768 "abstract art"
-    run --model "stabilityai/stable-diffusion-x4-upscaler" \
-        --image "${TEST_IMAGE}" --half --attention-slicing \
-        --xformers-memory-efficient-attention \
-        --prompt "An impressionist painting of a parakeet eating spaghetti in the desert"
-    run --model "stabilityai/stable-diffusion-2-depth" \
-        --height 768 --width 768 \
-        --image "${TEST_IMAGE}" --attention-slicing \
-        --xformers-memory-efficient-attention \
-        --negative-prompt "bad, ugly, deformed, malformed, mutated, bad anatomy" \
-        --prompt "a toucan"
-    run --model "timbrooks/instruct-pix2pix" \
-        --scale 7.0 --image-scale 2.0 \
-        --image "${TEST_IMAGE}" --attention-slicing \
-        --xformers-memory-efficient-attention \
-        --negative-prompt "bad, ugly, deformed, malformed, mutated, bad anatomy" \
-        --prompt "replace the sky with bricks"
-    run --model "dreamlike-art/dreamlike-diffusion-1.0" \
-        --skip --vae-tiling --xformers-memory-efficient-attention \
-        --height 1024 --width 1024 "abstract art"
-    run --model "runwayml/stable-diffusion-v1-5" \
-        --samples 2 --iters 2 --seed 42 \
-        --scheduler HeunDiscreteScheduler \
-        --scale 7.5 --steps 80 --attention-slicing \
-        --half --skip --negative-prompt "red roses" \
-        --prompt "bouquet of roses"
-}
-
-mkdir -p input output
-case ${1:-build} in
-    build) build ;;
-    clean) clean ;;
-    dev) dev "$@" ;;
-    pull) pull ;;
-    run) shift; run "$@" ;;
-    test) tests ;;
-    *) echo "$0: No command named '$1'" ;;
-esac

docker-entrypoint.py

@@ -1,286 +0,0 @@
-#!/usr/bin/env python
-import argparse, datetime, inspect, os, warnings
-import numpy as np
-import torch
-from PIL import Image
-from diffusers import (
-    OnnxStableDiffusionPipeline,
-    OnnxStableDiffusionInpaintPipeline,
-    OnnxStableDiffusionImg2ImgPipeline,
-    StableDiffusionDepth2ImgPipeline,
-    StableDiffusionPipeline,
-    StableDiffusionImg2ImgPipeline,
-    StableDiffusionInpaintPipeline,
-    StableDiffusionInstructPix2PixPipeline,
-    StableDiffusionUpscalePipeline,
-    schedulers,
-)
-
-
-def iso_date_time():
-    return datetime.datetime.now().isoformat()
-
-
-def load_image(path):
-    image = Image.open(os.path.join("input", path)).convert("RGB")
-    print(f"loaded image from {path}:", iso_date_time(), flush=True)
-    return image
-
-
-def remove_unused_args(p):
-    params = inspect.signature(p.pipeline).parameters.keys()
-    args = {
-        "prompt": p.prompt,
-        "negative_prompt": p.negative_prompt,
-        "image": p.image,
-        "mask_image": p.mask,
-        "height": p.height,
-        "width": p.width,
-        "num_images_per_prompt": p.samples,
-        "num_inference_steps": p.steps,
-        "guidance_scale": p.scale,
-        "image_guidance_scale": p.image_scale,
-        "strength": p.strength,
-        "generator": p.generator,
-    }
-    return {p: args[p] for p in params if p in args}
-
-
-def stable_diffusion_pipeline(p):
-    p.dtype = torch.float16 if p.half else torch.float32
-
-    if p.onnx:
-        p.diffuser = OnnxStableDiffusionPipeline
-        p.revision = "onnx"
-    else:
-        p.diffuser = StableDiffusionPipeline
-        p.revision = "fp16" if p.half else "main"
-
-    models = argparse.Namespace(
-        **{
-            "depth2img": ["stabilityai/stable-diffusion-2-depth"],
-            "pix2pix": ["timbrooks/instruct-pix2pix"],
-            "upscalers": ["stabilityai/stable-diffusion-x4-upscaler"],
-        }
-    )
-
-    if p.image is not None:
-        if p.revision == "onnx":
-            p.diffuser = OnnxStableDiffusionImg2ImgPipeline
-        elif p.model in models.depth2img:
-            p.diffuser = StableDiffusionDepth2ImgPipeline
-        elif p.model in models.pix2pix:
-            p.diffuser = StableDiffusionInstructPix2PixPipeline
-        elif p.model in models.upscalers:
-            p.diffuser = StableDiffusionUpscalePipeline
-        else:
-            p.diffuser = StableDiffusionImg2ImgPipeline
-        p.image = load_image(p.image)
-
-    if p.mask is not None:
-        if p.revision == "onnx":
-            p.diffuser = OnnxStableDiffusionInpaintPipeline
-        else:
-            p.diffuser = StableDiffusionInpaintPipeline
-        p.mask = load_image(p.mask)
-
-    if p.token is None:
-        with open("token.txt") as f:
-            p.token = f.read().replace("\n", "")
-
-    if p.seed == 0:
-        p.seed = torch.random.seed()
-
-    if p.revision == "onnx":
-        p.seed = p.seed >> 32 if p.seed > 2**32 - 1 else p.seed
-        p.generator = np.random.RandomState(p.seed)
-    else:
-        p.generator = torch.Generator(device=p.device).manual_seed(p.seed)
-
-    print("load pipeline start:", iso_date_time(), flush=True)
-
-    with warnings.catch_warnings():
-        warnings.filterwarnings("ignore", category=FutureWarning)
-        pipeline = p.diffuser.from_pretrained(
-            p.model,
-            torch_dtype=p.dtype,
-            revision=p.revision,
-            use_auth_token=p.token,
-        ).to(p.device)
-
-    if p.scheduler is not None:
-        scheduler = getattr(schedulers, p.scheduler)
-        pipeline.scheduler = scheduler.from_config(pipeline.scheduler.config)
-
-    if p.skip:
-        pipeline.safety_checker = None
-
-    if p.attention_slicing:
-        pipeline.enable_attention_slicing()
-
-    if p.xformers_memory_efficient_attention:
-        pipeline.enable_xformers_memory_efficient_attention()
-
-    if p.vae_tiling:
-        pipeline.vae.enable_tiling()
-
-    p.pipeline = pipeline
-
-    print("loaded models after:", iso_date_time(), flush=True)
-
-    return p
-
-
-def stable_diffusion_inference(p):
-    prefix = p.prompt.replace(" ", "_")[:170]
-    for j in range(p.iters):
-        result = p.pipeline(**remove_unused_args(p))
-
-        for i, img in enumerate(result.images):
-            idx = j * p.samples + i + 1
-            out = f"{prefix}__steps_{p.steps}__scale_{p.scale:.2f}__seed_{p.seed}__n_{idx}.png"
-            img.save(os.path.join("output", out))
-
-    print("completed pipeline:", iso_date_time(), flush=True)
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Create images from a text prompt.")
-    parser.add_argument(
-        "--attention-slicing",
-        action="store_true",
-        help="Use less memory at the expense of inference speed",
-    )
-    parser.add_argument(
-        "--device",
-        type=str,
-        nargs="?",
-        default="cuda",
-        help="The cpu or cuda device to use to render images",
-    )
-    parser.add_argument(
-        "--half",
-        action="store_true",
-        help="Use float16 (half-sized) tensors instead of float32",
-    )
-    parser.add_argument(
-        "--height", type=int, nargs="?", default=512, help="Image height in pixels"
-    )
-    parser.add_argument(
-        "--image",
-        type=str,
-        nargs="?",
-        help="The input image to use for image-to-image diffusion",
-    )
-    parser.add_argument(
-        "--image-scale",
-        type=float,
-        nargs="?",
-        help="How closely the image should follow the original image",
-    )
-    parser.add_argument(
-        "--iters",
-        type=int,
-        nargs="?",
-        default=1,
-        help="Number of times to run pipeline",
-    )
-    parser.add_argument(
-        "--mask",
-        type=str,
-        nargs="?",
-        help="The input mask to use for diffusion inpainting",
-    )
-    parser.add_argument(
-        "--model",
-        type=str,
-        nargs="?",
-        default="CompVis/stable-diffusion-v1-4",
-        help="The model used to render images",
-    )
-    parser.add_argument(
-        "--negative-prompt",
-        type=str,
-        nargs="?",
-        help="The prompt to not render into an image",
-    )
-    parser.add_argument(
-        "--onnx",
-        action="store_true",
-        help="Use the onnx runtime for inference",
-    )
-    parser.add_argument(
-        "--prompt", type=str, nargs="?", help="The prompt to render into an image"
-    )
-    parser.add_argument(
-        "--samples",
-        type=int,
-        nargs="?",
-        default=1,
-        help="Number of images to create per run",
-    )
-    parser.add_argument(
-        "--scale",
-        type=float,
-        nargs="?",
-        default=7.5,
-        help="How closely the image should follow the prompt",
-    )
-    parser.add_argument(
-        "--scheduler",
-        type=str,
-        nargs="?",
-        help="Override the scheduler used to denoise the image",
-    )
-    parser.add_argument(
-        "--seed", type=int, nargs="?", default=0, help="RNG seed for repeatability"
-    )
-    parser.add_argument(
-        "--skip",
-        action="store_true",
-        help="Skip the safety checker",
-    )
-    parser.add_argument(
-        "--steps", type=int, nargs="?", default=50, help="Number of sampling steps"
-    )
-    parser.add_argument(
-        "--strength",
-        type=float,
-        default=0.75,
-        help="Diffusion strength to apply to the input image",
-    )
-    parser.add_argument(
-        "--token", type=str, nargs="?", help="Huggingface user access token"
-    )
-    parser.add_argument(
-        "--vae-tiling",
-        action="store_true",
-        help="Use less memory when generating ultra-high resolution images",
-    )
-    parser.add_argument(
-        "--width", type=int, nargs="?", default=512, help="Image width in pixels"
-    )
-    parser.add_argument(
-        "--xformers-memory-efficient-attention",
-        action="store_true",
-        help="Use less memory but require the xformers library",
-    )
-    parser.add_argument(
-        "prompt0",
-        metavar="PROMPT",
-        type=str,
-        nargs="?",
-        help="The prompt to render into an image",
-    )
-
-    args = parser.parse_args()
-
-    if args.prompt0 is not None:
-        args.prompt = args.prompt0
-
-    pipeline = stable_diffusion_pipeline(args)
-    stable_diffusion_inference(pipeline)
-
-
-if __name__ == "__main__":
-    main()

scripts/bootstrap.sh

@@ -0,0 +1,93 @@
+#!/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.
+
+source ./scripts/functions.sh
+
+set -o pipefail
+
+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";;
+    aarch64*)     OS_ARCH="arm64";;
+    *)          echo "Unknown system architecture: $OS_ARCH! This script runs only on x86_64 or arm64" && exit
+esac
+
+if ! which curl; then fail "'curl' not found. Please install curl."; fi
+if ! which tar; then fail "'tar' not found. Please install tar."; fi
+if ! which bzip2; then fail "'bzip2' not found. Please install bzip2."; fi
+
+if pwd | grep ' '; then fail "The installation directory's path contains a space character. Conda will fail to install. Please change the directory."; fi
+
+# 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"
+LEGACY_INSTALL_ENV_DIR="$(pwd)/installer"
+MICROMAMBA_DOWNLOAD_URL="https://micro.mamba.pm/api/micromamba/${OS_NAME}-${OS_ARCH}/latest"
+umamba_exists="F"
+
+# 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 [ ! -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 python=3.8.5"; fi
+if ! hash "git" &>/dev/null; then PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL git"; fi
+
+if "$MAMBA_ROOT_PREFIX/micromamba" --version &>/dev/null; then umamba_exists="T"; fi
+
+# (if necessary) install git and conda into a contained environment
+if [ "$PACKAGES_TO_INSTALL" != "" ]; then
+    # download micromamba
+    if [ "$umamba_exists" == "F" ]; 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 -O bin/micromamba > "$MAMBA_ROOT_PREFIX/micromamba"
+
+        if [ "$?" != "0" ]; then
+            echo
+            echo "EE micromamba download failed"
+            echo "EE If the lines above contain 'bzip2: Cannot exec', your system doesn't have bzip2 installed"
+            echo "EE If there are network errors, please check your internet setup"
+            fail "micromamba download failed"
+        fi
+
+        chmod u+x "$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" || fail "unable to create the install environment"
+    fi
+   
+    if [ ! -e "$INSTALL_ENV_DIR" ]; then
+        fail "There was a problem while installing$PACKAGES_TO_INSTALL using micromamba. Cannot continue."
+    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 [ "$?" != "0" ]; then
+        fail "Installation of the packages '$PACKAGES_TO_INSTALL' failed."
+    fi
+fi

scripts/functions.sh

@@ -0,0 +1,39 @@
+#
+# utility functions for all scripts
+#
+
+fail() {
+    echo
+    echo "EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE"
+    echo
+    if [ "$1" != "" ]; then
+        echo ERROR: $1
+    else
+        echo An error occurred.
+    fi
+    cat <<EOF
+
+Error downloading Stable Diffusion UI. Sorry about that, please try to:
+ 1. Run this installer again.
+ 2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting
+ 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
+ 4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues
+
+Thanks!
+
+
+EOF
+    read -p "Press any key to continue"
+    exit 1
+
+}
+
+filesize() {
+    case "$(uname -s)" in
+        Linux*)     stat -c "%s" $1;;
+        Darwin*)    stat -f "%z" $1;;
+        *)          echo "Unknown OS: $OS_NAME! This script runs only on Linux or Mac" && exit
+    esac
+}
+
+

scripts/install_status.txt

@@ -0,0 +1 @@
+

scripts/on_env_start.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+source ./scripts/functions.sh
+
+printf "\n\nEasy Diffusion\n\n"
+
+if [ -f "scripts/config.sh" ]; then
+    source scripts/config.sh
+fi
+
+if [ "$update_branch" == "" ]; then
+    export update_branch="main"
+fi
+
+if [ -f "scripts/install_status.txt" ] && [ `grep -c sd_ui_git_cloned scripts/install_status.txt` -gt "0" ]; then
+    echo "Easy Diffusion's git repository was already installed. Updating from $update_branch.."
+
+    cd sd-ui-files
+
+    git reset --hard
+    git -c advice.detachedHead=false checkout "$update_branch"
+    git pull
+
+    cd ..
+else
+    printf "\n\nDownloading Easy Diffusion..\n\n"
+    printf "Using the $update_branch channel\n\n"
+
+    if git clone -b "$update_branch" https://github.com/cmdr2/stable-diffusion-ui.git sd-ui-files ; then
+        echo sd_ui_git_cloned >> scripts/install_status.txt
+    else
+        fail "git clone failed"
+    fi
+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/check_modules.py scripts/
+cp sd-ui-files/scripts/start.sh .
+cp sd-ui-files/scripts/developer_console.sh .
+cp sd-ui-files/scripts/functions.sh scripts/
+
+exec ./scripts/on_sd_start.sh

start.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+if [ -f "on_sd_start.bat" ]; then
+    echo ================================================================================
+    echo
+    echo !!!! WARNING !!!!
+    echo
+    echo It looks like you\'re trying to run the installation script from a source code
+    echo download. This will not work.
+    echo
+    echo Recommended: Please close this window and download the installer from
+    echo https://stable-diffusion-ui.github.io/docs/installation/
+    echo
+    echo ================================================================================
+    echo
+    read
+    exit 1
+fi
+
+
+# set legacy installer's PATH, if it exists
+if [ -e "installer" ]; then export PATH="$(pwd)/installer/bin:$PATH"; fi
+
+# Setup the packages required for the installer
+scripts/bootstrap.sh || exit 1
+
+# 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 || exit 1
+
+which conda
+conda --version || exit 1
+
+# Download the rest of the installer and UI
+chmod +x scripts/*.sh
+scripts/on_env_start.sh