Skip to content

Commit 161fd52

Browse files
authored
Bump Versions (#127)
### Update versions - auto: AUTOMATIC1111/stable-diffusion-webui@6a9ea5b - hlky: Sygil-Dev/sygil-webui@2215a3b - lstein: invoke-ai/InvokeAI@79e79b7 - Now is back with v2! Closes #123
1 parent 3b3c244 commit 161fd52

File tree

7 files changed

+24
-17
lines changed

7 files changed

+24
-17
lines changed

README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,20 @@ Screenshots:
4040
| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
4141
| ![](https://user-images.githubusercontent.com/24505302/189541298-f902b021-a1eb-4e4b-b2eb-b6a696a8ec80.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541295-7d7f2162-2189-4e0a-abbd-703f4779e1cd.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541294-aa7f7735-a973-4e17-ada0-1fe3acbb1772.jpg) |
4242

43-
<!--
43+
44+
4445
### lstein
4546

46-
[lstein's fork](https://github.com/lstein/stable-diffusion) is very mature when it comes to the cli, and the WebUI has potential.
47+
[lstein's fork](https://github.com/invoke-ai/InvokeAI) is one of the earliest with a wonderful WebUI.
48+
- Text to image, with many samplers
49+
- Image to image
50+
- 4GB GPU support
51+
- More coming!
52+
- [Full feature list here](https://github.com/invoke-ai/InvokeAI#features)
4753

4854
| Text to image | Image to image | Extras |
4955
| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
50-
| ![](https://user-images.githubusercontent.com/24505302/190662506-dabdc967-93af-4d78-8533-394604d29ba4.jpg) | ![](https://user-images.githubusercontent.com/24505302/190662557-7640d9f0-30d8-4527-97b0-07d3f48108d4.jpg) | ![](https://user-images.githubusercontent.com/24505302/190662588-37a01fad-f993-4674-9ae6-8714aa229f7b.jpg) |
51-
-->
56+
| ![](https://user-images.githubusercontent.com/24505302/195158552-39f58cb6-cfcc-4141-9995-a626e3760752.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158553-152a0ab8-c0fd-4087-b121-4823bcd8d6b5.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158548-e118206e-c519-4915-85d6-4c248eb10fc0.jpg) |
5257

5358
## Setup & Usage
5459

data/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111
/SwinIR
1212
/ScuNET
1313
/LDSR
14+
/Hypernetworks
1415
/embeddings

services/AUTOMATIC1111/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ RUN git clone https://github.com/CompVis/stable-diffusion.git repositories/stabl
77

88
RUN git clone https://github.com/sczhou/CodeFormer.git repositories/CodeFormer && cd repositories/CodeFormer && git reset --hard c5b4593074ba6214284d6acd5f1719b6c5d739af
99
RUN git clone https://github.com/salesforce/BLIP.git repositories/BLIP && cd repositories/BLIP && git reset --hard 48211a1594f1321b00f14c9f7a5b4813144b2fb9
10-
RUN git clone https://github.com/Hafiidz/latent-diffusion.git repositories/latent-diffusion && cd repositories/latent-diffusion && git reset --hard abf33e7002d59d9085081bce93ec798dcabd49af
10+
# RUN git clone https://github.com/Hafiidz/latent-diffusion.git repositories/latent-diffusion && cd repositories/latent-diffusion && git reset --hard abf33e7002d59d9085081bce93ec798dcabd49af
1111

1212
RUN <<EOF
1313
# because taming-transformers is huge
1414
git config --global http.postBuffer 1048576000
1515
git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
16+
cd repositories/taming-transformers
1617
git reset --hard 24268930bf1dce879235a7fddd0b2355b84d7ea6
17-
rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
18+
rm -rf data assets
1819
EOF
1920

2021
RUN git clone https://github.com/crowsonkb/k-diffusion.git repositories/k-diffusion && cd repositories/k-diffusion && git reset --hard f4e99857772fc3a126ba886aadf795a332774878
@@ -48,18 +49,18 @@ RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeForme
4849
# Note: don't update the sha of previous versions because the install will take forever
4950
# instead, update the repo state in a later step
5051

51-
ARG SHA=050a6a798cec90ae2f881c2ddd3f0221e69907dc
52+
ARG SHA=6a9ea5b41cf92cd9e980349bb5034439f4e7a58b
5253
RUN <<EOF
5354
cd stable-diffusion-webui
5455
git pull --rebase
5556
git reset --hard ${SHA}
5657
pip install --prefer-binary --no-cache-dir -r requirements_versions.txt
57-
pip install --prefer-binary --no-cache-dir -r requirements.txt
5858
EOF
5959

6060
RUN pip install --prefer-binary --no-cache-dir opencv-python-headless \
6161
git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \
62-
git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1
62+
git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \
63+
pyngrok
6364
#xformers
6465

6566

services/AUTOMATIC1111/mount.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ MOUNTS["${ROOT}/models/RealESRGAN"]="/data/RealESRGAN"
1616
MOUNTS["${ROOT}/models/SwinIR"]="/data/SwinIR"
1717
MOUNTS["${ROOT}/models/ScuNET"]="/data/ScuNET"
1818
MOUNTS["${ROOT}/models/LDSR"]="/data/LDSR"
19+
MOUNTS["${ROOT}/models/hypernetworks"]="/data/Hypernetworks"
1920

2021
MOUNTS["${ROOT}/embeddings"]="/data/embeddings"
2122

services/hlky/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ conda clean -a -y
2222
EOF
2323

2424

25-
ARG BRANCH=dev SHA=fe6e72fde79214aa848d47afe74487d9855b8643
25+
ARG BRANCH=dev SHA=2215a3b40325ac53d65c22e181eb59ef22ff0586
2626
RUN <<EOF
2727
cd stable-diffusion
2828
git fetch

services/lstein/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ ENV PIP_EXISTS_ACTION=w
1717
RUN <<EOF
1818
git clone https://github.com/invoke-ai/InvokeAI.git stable-diffusion
1919
cd stable-diffusion
20-
git reset --hard 8a8be92eac17e0ef699528157596b2336bdee532
21-
sed -i -- 's/python=3.8.5/python=3.9/g' environment.yaml
20+
git reset --hard 79e79b78aaeedb49afcc795e0e00eebfdbedee96
2221
git config --global http.postBuffer 1048576000
23-
conda env update --file environment.yaml -n base
22+
conda env update --file environment.yml -n base
2423
conda clean -a -y
2524
EOF
2625

2726

28-
ARG BRANCH=development SHA=31869885d9d3ee1e62c1109fb141e828e9a0e833
27+
ARG BRANCH=main SHA=79e79b78aaeedb49afcc795e0e00eebfdbedee96
2928
RUN <<EOF
3029
cd stable-diffusion
3130
git fetch
@@ -36,7 +35,7 @@ conda env update --file environment.yml -n base
3635
conda clean -a -y
3736
EOF
3837

39-
RUN pip uninstall opencv-python -y && pip install --prefer-binary --force-reinstall --no-cache-dir opencv-python-headless transformers==4.19.2
38+
RUN pip uninstall opencv-python -y && pip install --prefer-binary --force-reinstall --no-cache-dir opencv-python-headless
4039

4140
COPY . /docker/
4241
RUN <<EOF
@@ -50,4 +49,4 @@ WORKDIR /stable-diffusion
5049
EXPOSE 7860
5150

5251
CMD /docker/mount.sh && \
53-
python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
52+
python3 -u scripts/invoke.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}

services/lstein/mount.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MOUNTS["/root/.cache"]=/data/.cache
99
# ui specific
1010
MOUNTS["${PWD}/models/ldm/stable-diffusion-v1/model.ckpt"]=/data/StableDiffusion/model.ckpt
1111
MOUNTS["${PWD}/src/gfpgan/experiments/pretrained_models/GFPGANv1.4.pth"]=/data/GFPGAN/GFPGANv1.4.pth
12-
MOUNTS["${PWD}/ldm/dream/restoration/codeformer/weights"]=/data/CodeFormer
12+
MOUNTS["${PWD}/ldm/invoke/restoration/codeformer/weights"]=/data/CodeFormer
1313
# hacks
1414
MOUNTS["/opt/conda/lib/python3.9/site-packages/facexlib/weights"]=/data/.cache
1515
MOUNTS["/opt/conda/lib/python3.9/site-packages/realesrgan/weights"]=/data/RealESRGAN

0 commit comments

Comments
 (0)