CUDA support, updated ComfyUI to support SD3, updated readme

services/AUTOMATIC1111-cuda/Dockerfile

@@ -0,0 +1,76 @@
+FROM alpine/git:2.36.2 as download
+
+COPY clone.sh /clone.sh
+
+
+RUN . /clone.sh stable-diffusion-stability-ai https://github.com/Stability-AI/stablediffusion.git cf1d67a6fd5ea1aa600c4df58e5b47da45f6bdbf \
+  && rm -rf assets data/**/*.png data/**/*.jpg data/**/*.gif
+
+RUN . /clone.sh CodeFormer https://github.com/sczhou/CodeFormer.git c5b4593074ba6214284d6acd5f1719b6c5d739af \
+  && rm -rf assets inputs
+
+RUN . /clone.sh BLIP https://github.com/salesforce/BLIP.git 48211a1594f1321b00f14c9f7a5b4813144b2fb9
+RUN . /clone.sh k-diffusion https://github.com/crowsonkb/k-diffusion.git ab527a9a6d347f364e3d185ba6d714e22d80cb3c
+RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interrogator 2cf03aaf6e704197fd0dae7c7f96aa59cf1b11c9
+RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f
+
+
+FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime
+
+ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
+
+RUN --mount=type=cache,target=/var/cache/apt,Z \
+  apt-get update && \
+  # we need those
+  apt-get install -y fonts-dejavu-core rsync git jq moreutils aria2 cargo\
+  # extensions needs those
+  ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev build-essential
+
+
+WORKDIR /
+RUN --mount=type=cache,target=/root/.cache/pip,Z \
+  git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \
+  cd stable-diffusion-webui && \
+  git checkout tags/v1.9.3 && \
+  pip install --upgrade pip && \
+  pip install -r requirements.txt && \
+  pip install pytorch_lightning==1.7.7 torchmetrics==0.11.4 pydantic==1.10.11 && \
+  mkdir repositories && cd repositories && \
+  git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets.git
+
+ENV ROOT=/stable-diffusion-webui
+
+COPY --from=download /repositories/ ${ROOT}/repositories/
+RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/clip_interrogator/data/* ${ROOT}/interrogate
+RUN --mount=type=cache,target=/root/.cache/pip,Z \
+  pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
+
+RUN --mount=type=cache,target=/root/.cache/pip,Z \
+  # pip install pyngrok xformers==0.0.23.post1 \
+  pip install pyngrok \
+  git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
+  git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
+  git+https://github.com/mlfoundations/open_clip.git@v2.20.0
+
+# there seems to be a memory leak (or maybe just memory not being freed fast enough) that is fixed by this version of malloc
+# maybe move this up to the dependencies list.
+RUN apt-get -y install libgoogle-perftools-dev && apt-get clean
+ENV LD_PRELOAD=libtcmalloc.so
+
+COPY . /docker
+
+RUN \
+  # mv ${ROOT}/style.css ${ROOT}/user.css && \
+  # one of the ugliest hacks I ever wrote \
+#   ls /opt/conda/lib/python3.12/site-packages && \
+#   which python3 && \
+#   pip show gradio && \
+  sed -i 's/in_app_dir = .*/in_app_dir = True/g' /opt/conda/envs/py_3.10/lib/python3.10/site-packages/gradio/routes.py && \
+  git config --global --add safe.directory '*'
+
+WORKDIR ${ROOT}
+# ENV NVIDIA_VISIBLE_DEVICES=all
+ENV CLI_ARGS=""
+EXPOSE 7860
+ENTRYPOINT ["/docker/entrypoint.sh"]
+CMD python -u webui.py --listen --port 7860 ${CLI_ARGS}

services/AUTOMATIC1111-rocm/Dockerfile

@@ -15,7 +15,6 @@ RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interr
 RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f
 
 
-# FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime
 FROM rocm/pytorch:rocm6.1_ubuntu22.04_py3.10_pytorch_2.1.2
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
@@ -32,7 +31,6 @@ WORKDIR /
 RUN --mount=type=cache,target=/root/.cache/pip,Z \
   git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \
   cd stable-diffusion-webui && \
-#  git reset --hard cf2772fab0af5573da775e7437e6acdca424f26e && \
   git checkout tags/v1.9.3 && \
   pip install --upgrade pip && \
   pip install -r requirements.txt && \

services/AUTOMATIC1111-rocm/clone.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -Eeuox pipefail
+
+mkdir -p /repositories/"$1"
+cd /repositories/"$1"
+git init
+git remote add origin "$2"
+git fetch origin "$3" --depth=1
+git reset --hard "$3"
+rm -rf .git

services/AUTOMATIC1111-rocm/config.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+
+"""Checks and sets default values for config.json before starting the container."""
+
+import json
+import re
+import os.path
+import sys
+
+DEFAULT_FILEPATH = '/data/config/auto/config.json'
+
+DEFAULT_OUTDIRS = {
+  "outdir_samples": "",
+  "outdir_txt2img_samples": "/output/txt2img",
+  "outdir_img2img_samples": "/output/img2img",
+  "outdir_extras_samples": "/output/extras",
+  "outdir_grids": "",
+  "outdir_txt2img_grids": "/output/txt2img-grids",
+  "outdir_img2img_grids": "/output/img2img-grids",
+  "outdir_save": "/output/saved",
+  "outdir_init_images": "/output/init-images",
+}
+RE_VALID_OUTDIR = re.compile(r"(^/output(/\.?[\w\-\_]+)+/?$)|(^\s?$)")
+
+DEFAULT_OTHER = {
+  "font": "DejaVuSans.ttf",
+}
+
+def dict_to_json_file(target_file: str, data: dict):
+  """Write dictionary to specified json file"""
+
+  with open(target_file, 'w') as f:
+    json.dump(data, f)
+
+def json_file_to_dict(config_file: str) -> dict|None:
+   """Load json file into a dictionary. Return None if file does not exist."""
+
+   if os.path.isfile(config_file):
+    with open(config_file, 'r') as f:
+      return json.load(f)
+   else:
+      return None
+
+def replace_if_invalid(value: str, replacement: str, pattern: str|re.Pattern[str]) -> str:
+  """Returns original value if valid, fallback value if invalid"""
+
+  if re.match(pattern, value):
+    return value
+  else:
+    return replacement
+
+def check_and_replace_config(config_file: str, target_file: str = None):
+  """Checks given file for invalid values. Replaces those with fallback values (default: overwrites file)."""
+
+  # Get current user config, or empty if file does not exists
+  data = json_file_to_dict(config_file) or {}
+
+  # Check and fix output directories
+  for k, def_val in DEFAULT_OUTDIRS.items():
+    if k not in data:
+      data[k] = def_val
+    else:
+      data[k] = replace_if_invalid(value=data[k], replacement=def_val, pattern=RE_VALID_OUTDIR)
+
+  # Check and fix other default settings
+  for k, def_val in DEFAULT_OTHER.items():
+    if k not in data:
+      data[k] = def_val
+
+  # Write results to file
+  dict_to_json_file(target_file or config_file, data)
+
+if __name__ == '__main__':
+  if len(sys.argv) > 1:
+    check_and_replace_config(*sys.argv[1:])
+  else:
+    check_and_replace_config(DEFAULT_FILEPATH)
+

services/AUTOMATIC1111-rocm/entrypoint.sh

@@ -0,0 +1,85 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+# TODO: move all mkdir -p ?
+mkdir -p /data/config/auto/scripts/
+# mount scripts individually
+
+echo $ROOT
+ls -lha $ROOT
+
+find "${ROOT}/scripts/" -maxdepth 1 -type l -delete
+cp -vrfTs /data/config/auto/scripts/ "${ROOT}/scripts/"
+
+# Set up config file
+python /docker/config.py /data/config/auto/config.json
+
+if [ ! -f /data/config/auto/ui-config.json ]; then
+  echo '{}' >/data/config/auto/ui-config.json
+fi
+
+if [ ! -f /data/config/auto/styles.csv ]; then
+  touch /data/config/auto/styles.csv
+fi
+
+# copy models from original models folder
+mkdir -p /data/models/VAE-approx/ /data/models/karlo/
+
+rsync -a --info=NAME ${ROOT}/models/VAE-approx/ /data/models/VAE-approx/
+rsync -a --info=NAME ${ROOT}/models/karlo/ /data/models/karlo/
+
+declare -A MOUNTS
+
+MOUNTS["/root/.cache"]="/data/.cache"
+MOUNTS["${ROOT}/models"]="/data/models"
+
+MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
+MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json"
+MOUNTS["${ROOT}/ui-config.json"]="/data/config/auto/ui-config.json"
+MOUNTS["${ROOT}/styles.csv"]="/data/config/auto/styles.csv"
+MOUNTS["${ROOT}/extensions"]="/data/config/auto/extensions"
+MOUNTS["${ROOT}/config_states"]="/data/config/auto/config_states"
+
+# extra hacks
+MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache"
+
+for to_path in "${!MOUNTS[@]}"; do
+  set -Eeuo pipefail
+  from_path="${MOUNTS[${to_path}]}"
+  rm -rf "${to_path}"
+  if [ ! -f "$from_path" ]; then
+    mkdir -vp "$from_path"
+  fi
+  mkdir -vp "$(dirname "${to_path}")"
+  ln -sT "${from_path}" "${to_path}"
+  echo Mounted $(basename "${from_path}")
+done
+
+echo "Installing extension dependencies (if any)"
+
+# because we build our container as root:
+chown -R root ~/.cache/
+chmod 766 ~/.cache/
+
+shopt -s nullglob
+# For install.py, please refer to https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Developing-extensions#installpy
+list=(./extensions/*/install.py)
+for installscript in "${list[@]}"; do
+  EXTNAME=$(echo $installscript | cut -d '/' -f 3)
+  # Skip installing dependencies if extension is disabled in config
+  if $(jq -e ".disabled_extensions|any(. == \"$EXTNAME\")" config.json); then
+    echo "Skipping disabled extension ($EXTNAME)"
+    continue
+  fi
+  PYTHONPATH=${ROOT} python "$installscript"
+done
+
+if [ -f "/data/config/auto/startup.sh" ]; then
+  pushd ${ROOT}
+  echo "Running startup script"
+  . /data/config/auto/startup.sh
+  popd
+fi
+
+exec "$@"

services/comfy-cuda/Dockerfile

@@ -0,0 +1,23 @@
+FROM pytorch/pytorch:2.3.0-cuda12.1-cudnn8-runtime
+
+ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
+
+RUN apt-get update && apt-get install -y git cargo nasm && apt-get clean
+
+ENV ROOT=/stable-diffusion
+RUN --mount=type=cache,target=/root/.cache/pip,Z \
+  git clone --recursive https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \
+  cd ${ROOT} && \
+  git checkout master && \
+  git reset --hard 5eb98f00927ace00b6b3d01ed9c76b113fc4ec9f && \
+  pip install -r requirements.txt
+
+WORKDIR ${ROOT}
+COPY . /docker/
+RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${ROOT}
+
+ENV NVIDIA_VISIBLE_DEVICES=all PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
+ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
+EXPOSE 7860
+ENTRYPOINT ["/docker/entrypoint.sh"]
+CMD python -u main.py --listen --port 7860 ${CLI_ARGS}

services/comfy-cuda/entrypoint.sh

@@ -8,6 +8,8 @@ declare -A MOUNTS
 
 MOUNTS["/root/.cache"]="/data/.cache"
 MOUNTS["${ROOT}/input"]="/data/config/comfy/input"
+MOUNTS["${ROOT}/custom_nodes"]="/data/config/comfy/custom_nodes"
+MOUNTS["${ROOT}/my_workflows"]="/data/config/comfy/my_workflows"
 MOUNTS["${ROOT}/output"]="/output/comfy"
 
 for to_path in "${!MOUNTS[@]}"; do
@@ -22,6 +24,14 @@ for to_path in "${!MOUNTS[@]}"; do
   echo Mounted $(basename "${from_path}")
 done
 
+if [ -z "$(ls -A /data/config/comfy/custom_nodes/ComfyUI_UltimateSDUpscale)" ]; then
+  git -C /data/config/comfy/custom_nodes clone https://github.com/ssitu/ComfyUI_UltimateSDUpscale --recursive
+fi
+
+if [ -z "$(ls -A /data/config/comfy/custom_nodes/comfyui-workspace-manager)" ]; then
+  git -C /data/config/comfy/custom_nodes clone https://github.com/11cafe/comfyui-workspace-manager.git
+fi
+
 if [ -f "/data/config/comfy/startup.sh" ]; then
   pushd ${ROOT}
   . /data/config/comfy/startup.sh

services/comfy-rocm/Dockerfile

@@ -1,4 +1,3 @@
-# FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime
 FROM rocm/pytorch:rocm6.1_ubuntu22.04_py3.10_pytorch_2.1.2
 
 ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1
@@ -10,14 +9,13 @@ RUN --mount=type=cache,target=/root/.cache/pip,Z \
   git clone --recursive https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \
   cd ${ROOT} && \
   git checkout master && \
-#   git reset --hard d1f3637a5a944d0607b899babd8ff11d87100503 && \
+  git reset --hard 5eb98f00927ace00b6b3d01ed9c76b113fc4ec9f && \
   pip install -r requirements.txt
 
 WORKDIR ${ROOT}
 COPY . /docker/
 RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${ROOT}
 
-# ENV NVIDIA_VISIBLE_DEVICES=all PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
 ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS=""
 EXPOSE 7860
 ENTRYPOINT ["/docker/entrypoint.sh"]

services/comfy-rocm/entrypoint.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+mkdir -vp /data/config/comfy/custom_nodes
+
+declare -A MOUNTS
+
+MOUNTS["/root/.cache"]="/data/.cache"
+MOUNTS["${ROOT}/input"]="/data/config/comfy/input"
+MOUNTS["${ROOT}/custom_nodes"]="/data/config/comfy/custom_nodes"
+MOUNTS["${ROOT}/my_workflows"]="/data/config/comfy/my_workflows"
+MOUNTS["${ROOT}/output"]="/output/comfy"
+
+for to_path in "${!MOUNTS[@]}"; do
+  set -Eeuo pipefail
+  from_path="${MOUNTS[${to_path}]}"
+  rm -rf "${to_path}"
+  if [ ! -f "$from_path" ]; then
+    mkdir -vp "$from_path"
+  fi
+  mkdir -vp "$(dirname "${to_path}")"
+  ln -sT "${from_path}" "${to_path}"
+  echo Mounted $(basename "${from_path}")
+done
+
+if [ -z "$(ls -A /data/config/comfy/custom_nodes/ComfyUI_UltimateSDUpscale)" ]; then
+  git -C /data/config/comfy/custom_nodes clone https://github.com/ssitu/ComfyUI_UltimateSDUpscale --recursive
+fi
+
+if [ -z "$(ls -A /data/config/comfy/custom_nodes/comfyui-workspace-manager)" ]; then
+  git -C /data/config/comfy/custom_nodes clone https://github.com/11cafe/comfyui-workspace-manager.git
+fi
+
+if [ -f "/data/config/comfy/startup.sh" ]; then
+  pushd ${ROOT}
+  . /data/config/comfy/startup.sh
+  popd
+fi
+
+exec "$@"

services/comfy-rocm/extra_model_paths.yaml

@@ -0,0 +1,25 @@
+a111:
+  base_path: /data
+
+  checkpoints: models/Stable-diffusion
+  configs: models/Stable-diffusion
+  vae: models/VAE
+  loras: models/Lora
+  upscale_models: |
+    models/RealESRGAN
+    models/ESRGAN
+    models/SwinIR
+    models/GFPGAN
+  hypernetworks: models/hypernetworks
+  controlnet: models/ControlNet
+  gligen: models/GLIGEN
+  clip: models/CLIPEncoder
+  embeddings: embeddings
+
+  custom_nodes: config/comfy/custom_nodes
+
+  # TODO: I am unsure about these, need more testing
+  # style_models: config/comfy/style_models
+  # t2i_adapter: config/comfy/t2i_adapter
+  # clip_vision: config/comfy/clip_vision
+  # diffusers: config/comfy/diffusers