Update versions (#86)

- auto:
5a1951f175
  - Now with LDSR support
- hlky:
fa6a31b23c
- lstein: prepare for new UI

Closes #85
This commit is contained in:
AbdBarho 2022-09-21 19:10:27 +02:00 committed by GitHub
parent a96285d10b
commit a8c85b4699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 16 deletions

View File

@ -39,7 +39,7 @@ services:
- *v2
- ./services/AUTOMATIC1111/config.json:/stable-diffusion-webui/config.json
environment:
- CLI_ARGS=--medvram
- CLI_ARGS=--allow-code --medvram
automatic1111-cpu:
<<: *automatic

View File

@ -3,14 +3,17 @@
FROM alpine/git:2.36.2 as download
RUN git clone --depth 1 https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion
RUN git clone --depth 1 https://github.com/sczhou/CodeFormer.git repositories/CodeFormer
RUN git clone --depth 1 https://github.com/salesforce/BLIP.git repositories/BLIP
RUN git clone https://github.com/CompVis/stable-diffusion.git repositories/stable-diffusion && cd repositories/stable-diffusion && git reset --hard 69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc
RUN git clone https://github.com/sczhou/CodeFormer.git repositories/CodeFormer && cd repositories/CodeFormer && git reset --hard c5b4593074ba6214284d6acd5f1719b6c5d739af
RUN git clone https://github.com/salesforce/BLIP.git repositories/BLIP && cd repositories/BLIP && git reset --hard 48211a1594f1321b00f14c9f7a5b4813144b2fb9
RUN git clone https://github.com/Hafiidz/latent-diffusion.git repositories/latent-diffusion && cd repositories/latent-diffusion && git reset --hard abf33e7002d59d9085081bce93ec798dcabd49af
RUN <<EOF
# because taming-transformers is huge
git config --global http.postBuffer 1048576000
git clone --depth 1 https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
git clone https://github.com/CompVis/taming-transformers.git repositories/taming-transformers
git reset --hard 24268930bf1dce879235a7fddd0b2355b84d7ea6
rm -rf repositories/taming-transformers/data repositories/taming-transformers/assets
EOF
@ -44,7 +47,7 @@ RUN pip install --prefer-binary --no-cache-dir -r ${ROOT}/repositories/CodeForme
# Note: don't update the sha of previous versions because the install will take forever
# instead, update the repo state in a later step
ARG SHA=dd911a47b3c3313b3938b700eb26cbd5bb3e1c95
ARG SHA=5a1951f17567022612aef5302fb650923a06fb54
RUN <<EOF
cd stable-diffusion-webui
git pull --rebase

View File

@ -54,5 +54,14 @@
"enable_quantization": false,
"enable_batch_seeds": true,
"memmon_poll_rate": 8,
"sd_model_checkpoint": null
"sd_model_checkpoint": null,
"SWIN_tile": 192,
"SWIN_tile_overlap": 8,
"ldsr_steps": 30,
"ldsr_pre_down": 1,
"ldsr_post_down": 1,
"upscaler_for_hires_fix": null,
"js_modal_lightbox": true,
"js_modal_lightbox_initialy_zoomed": true,
"use_original_name_batch": false
}

View File

@ -6,6 +6,9 @@ declare -A MODELS
MODELS["${WORKDIR}/models/ldm/stable-diffusion-v1/model.ckpt"]=model.ckpt
MODELS["${ROOT}/GFPGANv1.3.pth"]=GFPGANv1.3.pth
MODELS["${WORKDIR}/repositories/latent-diffusion/experiments/pretrained_models/model.chkpt"]=LDSR.ckpt
MODELS["${WORKDIR}/repositories/latent-diffusion/experiments/pretrained_models/project.yaml"]=LDSR.yaml
MODELS_DIR=/cache/models

View File

@ -23,10 +23,8 @@ EOF
# Note: don't update the sha of previous versions because the install will take forever
# instead, update the repo state in a later step
ARG BRANCH=master
# ARG SHA=833a91047df999302f699637768741cecee9c37b
# ARG BRANCH=dev
ARG SHA=17748cbc9c34df44d0381c42e4f0fe1903089438
# ARG BRANCH=master SHA=833a91047df999302f699637768741cecee9c37b
ARG BRANCH=dev SHA=fa6a31b23c38b41541ed9af19201e6f8355ac165
RUN <<EOF
cd stable-diffusion
git fetch
@ -59,4 +57,4 @@ EXPOSE 7860
# run, -u to not buffer stdout / stderr
CMD /docker/mount.sh && \
python3 -u scripts/webui.py --outdir /output --ckpt /cache/models/model.ckpt --ldsr-dir /latent-diffusion --inbrowser ${CLI_ARGS}
# STREAMLIT_SERVER_PORT=7860 python -m streamlit run scripts/webui_streamlit.py
# STREAMLIT_SERVER_PORT=7860 python -m streamlit run scripts/webui_streamlit.py

View File

@ -14,9 +14,9 @@ RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clea
RUN <<EOF
git clone https://github.com/lstein/stable-diffusion.git
git clone https://github.com/invoke-ai/InvokeAI.git stable-diffusion
cd stable-diffusion
git reset --hard e994073b5bdfa3c77313681c5944be1544eb65b6
git reset --hard a1739a73b48bfe98b6abcb67f5a0197a9ad270e0
sed -i -- 's/python=3.8.5/python=3.9/g' environment.yaml
conda env update --file environment.yaml -n base
conda clean -a -y
@ -24,7 +24,9 @@ EOF
ARG BRANCH=development SHA=50d607ffea3734072a80e38b09ba0c3758af5d40
# ARG BRANCH=main SHA=89da371f4841f7e05da5a1672459d700c3920784
# this breaks on generation:
# there is a new UI anyway, but it is not by any means ready.
# ARG BRANCH=development SHA=bdbc76fcd4bd3362312dc91b087d9af66de423b1
RUN <<EOF
cd stable-diffusion
git fetch
@ -51,4 +53,4 @@ EXPOSE 7860
CMD /docker/mount.sh && \
python3 -u scripts/dream.py --outdir /output --web --host 0.0.0.0 --port 7860 ${CLI_ARGS}
#python3 -u backend/server.py
# python3 -u backend/server.py --host 0.0.0.0 --port 9090