diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index c144a70..fb6157c 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -47,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=a2bea2f97aab6ef60afe6534611e646f66226868 +ARG SHA=ca3e5519e8b6dc020c5e7ae508738afb5dc6f3ec RUN </latent-diffusion/experiments/pretrained_models/project.yaml -fi - # force facexlib cache mkdir -p /cache/weights/ /stable-diffusion/gfpgan/ ln -sf /cache/weights/ /stable-diffusion/gfpgan/ diff --git a/services/hlky/userconfig_streamlit.yaml b/services/hlky/userconfig_streamlit.yaml index 7cf0020..51fa016 100644 --- a/services/hlky/userconfig_streamlit.yaml +++ b/services/hlky/userconfig_streamlit.yaml @@ -1,8 +1,8 @@ general: outdir: /outputs default_model: "Stable Diffusion v1.4" - default_model_path: "/cache/models/model.ckpt" + default_model_path: /cache/models/model.ckpt outdir_txt2img: /outputs/txt2img-samples outdir_img2img: /outputs/img2img-samples - optimized_turbo: true - enable_minimal_memory_usage : True + optimized: True + optimized_turbo: True diff --git a/services/lstein/Dockerfile b/services/lstein/Dockerfile index 5063747..8464c6c 100644 --- a/services/lstein/Dockerfile +++ b/services/lstein/Dockerfile @@ -23,7 +23,7 @@ conda clean -a -y EOF -ARG BRANCH=development SHA=50d607ffea3734072a80e38b09ba0c3758af5d40 +ARG BRANCH=development SHA=b40bfb5116b7fc618f78a0d152005ceb46153443 # this breaks on generation: # there is a new UI anyway, but it is not by any means ready. # ARG BRANCH=development SHA=bdbc76fcd4bd3362312dc91b087d9af66de423b1 diff --git a/services/lstein/mount.sh b/services/lstein/mount.sh index bae7a0b..0b31bdf 100755 --- a/services/lstein/mount.sh +++ b/services/lstein/mount.sh @@ -7,12 +7,11 @@ ROOT=/stable-diffusion mkdir -p "${ROOT}/models/ldm/stable-diffusion-v1/" ln -sf /cache/models/model.ckpt "${ROOT}/models/ldm/stable-diffusion-v1/model.ckpt" -if test -f /cache/models/GFPGANv1.3.pth; then - base="${ROOT}/src/gfpgan/experiments/pretrained_models/" - mkdir -p "${base}" - ln -sf /cache/models/GFPGANv1.3.pth "${base}/GFPGANv1.3.pth" - echo "Mounted GFPGANv1.3.pth" -fi +base="${ROOT}/src/gfpgan/experiments/pretrained_models/" +mkdir -p "${base}" +# TODO: "real" GFPGANv1.4.pth +ln -sf /cache/models/GFPGANv1.3.pth "${base}/GFPGANv1.4.pth" +echo "Mounted GFPGANv1.3.pth" # facexlib FACEX_WEIGHTS=/opt/conda/lib/python3.9/site-packages/facexlib/weights