From 4adc6727cf38e937451c33c5a6769594c3dbb504 Mon Sep 17 00:00:00 2001
From: Abdullah Barhoum <ka70911@gmail.com>
Date: Sun, 11 Sep 2022 06:42:35 +0200
Subject: [PATCH] update folders

---
 docker-compose.yml                            | 43 +++++++++++++------
 .../AUTOMATIC1111}/Dockerfile                 |  6 ++-
 .../AUTOMATIC1111}/README.md                  |  0
 .../AUTOMATIC1111}/config.json                |  0
 .../AUTOMATIC1111}/docker-compose.yml         |  0
 .../AUTOMATIC1111}/info.py                    |  0
 .../AUTOMATIC1111}/mount.sh                   |  0
 {hlky => services/hlky}/Dockerfile            |  0
 {hlky => services/hlky}/info.py               |  0
 {hlky => services/hlky}/mount.sh              |  0
 {lstein => services/lstein}/Dockerfile        |  0
 {lstein => services/lstein}/README.md         |  0
 .../lstein}/docker-compose.yml                |  0
 13 files changed, 36 insertions(+), 13 deletions(-)
 rename {AUTOMATIC1111 => services/AUTOMATIC1111}/Dockerfile (89%)
 rename {AUTOMATIC1111 => services/AUTOMATIC1111}/README.md (100%)
 rename {AUTOMATIC1111 => services/AUTOMATIC1111}/config.json (100%)
 rename {AUTOMATIC1111 => services/AUTOMATIC1111}/docker-compose.yml (100%)
 rename {AUTOMATIC1111 => services/AUTOMATIC1111}/info.py (100%)
 rename {AUTOMATIC1111 => services/AUTOMATIC1111}/mount.sh (100%)
 mode change 100755 => 100644
 rename {hlky => services/hlky}/Dockerfile (100%)
 rename {hlky => services/hlky}/info.py (100%)
 rename {hlky => services/hlky}/mount.sh (100%)
 mode change 100755 => 100644
 rename {lstein => services/lstein}/Dockerfile (100%)
 rename {lstein => services/lstein}/README.md (100%)
 rename {lstein => services/lstein}/docker-compose.yml (100%)

diff --git a/docker-compose.yml b/docker-compose.yml
index 32b9ec3..dcc627f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,22 +1,12 @@
 version: '3.9'
 
-services:
-  model:
-    build:
-      context: ./hlky/
-      args:
-        # You can choose any commit sha from https://github.com/hlky/stable-diffusion/commits/main
-        # USE AT YOUR OWN RISK! otherwise just leave it empty.
-        BRANCH:
-        WEBUI_SHA:
+x-base_service: &base_service
     ports:
       - "7860:7860"
-    volumes:
+    volumes: &base_volumes
       - ./cache:/cache
       - ./output:/output
       - ./models:/models
-    environment:
-      - CLI_ARGS=--extra-models-cpu --optimized-turbo
     deploy:
       resources:
         reservations:
@@ -24,3 +14,32 @@ services:
               - driver: nvidia
                 device_ids: ['0']
                 capabilities: [gpu]
+
+name: webui-docker
+
+services:
+  hlky:
+    <<: *base_service
+    profiles: ["hlky"]
+    build: ./services/hlky/
+    environment:
+      - CLI_ARGS=--extra-models-cpu --optimized-turbo
+
+  automatic1111: &automatic
+    <<: *base_service
+    profiles: ["auto"]
+    build: ./services/AUTOMATIC1111
+    environment:
+      - CLI_ARGS=--medvram --opt-split-attention
+
+  automatic1111-cpu:
+    <<: *automatic
+    profiles: ["auto-cpu"]
+    deploy: {}
+    environment:
+      - CLI_ARGS=--no-half --precision full
+
+  lstein:
+    <<: *base_service
+    profiles: ["lstein"]
+    build: ./services/lstein/
diff --git a/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
similarity index 89%
rename from AUTOMATIC1111/Dockerfile
rename to services/AUTOMATIC1111/Dockerfile
index 0b4c04a..2413fff 100644
--- a/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -53,7 +53,11 @@ RUN pip install --prefer-binary -U --no-cache-dir opencv-python-headless markups
 ENV TRANSFORMERS_CACHE=/cache/transformers TORCH_HOME=/cache/torch CLI_ARGS=""
 
 COPY . /docker
-RUN chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py
+RUN chmod +x /docker/mount.sh && python3 /docker/info.py ${ROOT}/modules/ui.py && \
+  #TODO: hacks for cpu suppoort
+  find ${ROOT} -type f -name '*.py' -exec sed -i "s/torch\.has_cuda/torch.cuda.is_available()/g" {} \; && \
+  find ${ROOT} -type f -name '*.py' -exec sed -i "s/torch\.has_mps/False/g" {} \;
+
 
 WORKDIR ${WORKDIR}
 EXPOSE 7860
diff --git a/AUTOMATIC1111/README.md b/services/AUTOMATIC1111/README.md
similarity index 100%
rename from AUTOMATIC1111/README.md
rename to services/AUTOMATIC1111/README.md
diff --git a/AUTOMATIC1111/config.json b/services/AUTOMATIC1111/config.json
similarity index 100%
rename from AUTOMATIC1111/config.json
rename to services/AUTOMATIC1111/config.json
diff --git a/AUTOMATIC1111/docker-compose.yml b/services/AUTOMATIC1111/docker-compose.yml
similarity index 100%
rename from AUTOMATIC1111/docker-compose.yml
rename to services/AUTOMATIC1111/docker-compose.yml
diff --git a/AUTOMATIC1111/info.py b/services/AUTOMATIC1111/info.py
similarity index 100%
rename from AUTOMATIC1111/info.py
rename to services/AUTOMATIC1111/info.py
diff --git a/AUTOMATIC1111/mount.sh b/services/AUTOMATIC1111/mount.sh
old mode 100755
new mode 100644
similarity index 100%
rename from AUTOMATIC1111/mount.sh
rename to services/AUTOMATIC1111/mount.sh
diff --git a/hlky/Dockerfile b/services/hlky/Dockerfile
similarity index 100%
rename from hlky/Dockerfile
rename to services/hlky/Dockerfile
diff --git a/hlky/info.py b/services/hlky/info.py
similarity index 100%
rename from hlky/info.py
rename to services/hlky/info.py
diff --git a/hlky/mount.sh b/services/hlky/mount.sh
old mode 100755
new mode 100644
similarity index 100%
rename from hlky/mount.sh
rename to services/hlky/mount.sh
diff --git a/lstein/Dockerfile b/services/lstein/Dockerfile
similarity index 100%
rename from lstein/Dockerfile
rename to services/lstein/Dockerfile
diff --git a/lstein/README.md b/services/lstein/README.md
similarity index 100%
rename from lstein/README.md
rename to services/lstein/README.md
diff --git a/lstein/docker-compose.yml b/services/lstein/docker-compose.yml
similarity index 100%
rename from lstein/docker-compose.yml
rename to services/lstein/docker-compose.yml