From 4e9e04b24cdd2e7271ab988bebca221411304f0b Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Fri, 15 Nov 2024 17:35:13 -0500 Subject: [PATCH] update docker config and notes Signed-off-by: Vladimir Mandic --- CHANGELOG.md | 8 ++++---- Dockerfile | 16 +++++++++++++--- extensions-builtin/Lora/extra_networks_lora.py | 4 +++- wiki | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bac0f3756..6c25b49e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Change Log for SD.Next -## Update for 2024-11-12 +## Update for 2024-11-15 -### Highlights for 2024-11-13 +### Highlights for 2024-11-15 *What's New?* -First, a massive update to docs including new UI top-level **info** tab with access to [changelog](https://github.com/vladmandic/automatic/blob/master/CHANGELOG.md) and [wiki](https://github.com/vladmandic/automatic/wiki), many updates and new articles AND full **built-in search** capabilities +First, a massive update to docs including new UI top-level **info** tab with access to [changelog](https://github.com/vladmandic/automatic/blob/master/CHANGELOG.md) and [wiki](https://github.com/vladmandic/automatic/wiki), many updates and new articles AND full **built-in documentation search** capabilities **New integrations**: - [PuLID](https://github.com/ToTheBeginning/PuLID): Pure and Lightning ID Customization via Contrastive Alignment @@ -26,7 +26,7 @@ And quite a few more improvements and fixes since the last update - for full det [README](https://github.com/vladmandic/automatic/blob/master/README.md) | [CHANGELOG](https://github.com/vladmandic/automatic/blob/master/CHANGELOG.md) | [WiKi](https://github.com/vladmandic/automatic/wiki) | [Discord](https://discord.com/invite/sd-next-federal-batch-inspectors-1101998836328697867) -### Details for 2024-11-12 +### Details for 2024-11-15 - Docs: - new top-level **info** tab with access to [changelog](https://github.com/vladmandic/automatic/blob/master/CHANGELOG.md) and [wiki](https://github.com/vladmandic/automatic/wiki) diff --git a/Dockerfile b/Dockerfile index 8e19d145c..fbfc1eb9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,14 @@ # SD.Next Dockerfile FROM pytorch/pytorch:2.5.1-cuda12.4-cudnn9-runtime -# TBD add org info +LABEL org.opencontainers.image.vendor="SD.Next" LABEL org.opencontainers.image.authors="vladmandic" +LABEL org.opencontainers.image.url="https://github.com/vladmandic/automatic/" +LABEL org.opencontainers.image.documentation="https://github.com/vladmandic/automatic/wiki/Docker" +LABEL org.opencontainers.image.source="https://github.com/vladmandic/automatic/" +LABEL org.opencontainers.image.licenses="AGPL-3.0" +LABEL org.opencontainers.image.title="SD.Next" +LABEL org.opencontainers.image.description="SD.Next: Advanced Implementation of Stable Diffusion and other Diffusion-based generative image models" +LABEL org.opencontainers.image.base.name="https://hub.docker.com/pytorch/pytorch:2.5.1-cuda12.4-cudnn9-runtime" WORKDIR / COPY . . # stop pip and uv from caching @@ -14,9 +21,12 @@ ENV SD_NOHASHING=true # set data directories ENV SD_DATADIR="/mnt/data" ENV SD_MODELSDIR="/mnt/models" -# install dependencies +# minimum install RUN ["apt-get", "-y", "update"] -RUN ["apt-get", "-y", "install", "git", "build-essential"] +RUN ["apt-get", "-y", "install", "git", "build-essential", "google-perftools"] +RUN ["ldconfig"] +# tcmalloc is not required but it is highly recommended +ENV LD_PRELOAD=libtcmalloc.so.4 # sdnext will run all necessary pip install ops and then exit RUN ["python", "launch.py", "--debug", "--uv", "--use-cuda", "--log", "sdnext.log", "--test", "--optional"] # preinstall additional packages to avoid installation during runtime diff --git a/extensions-builtin/Lora/extra_networks_lora.py b/extensions-builtin/Lora/extra_networks_lora.py index 69b234df7..307d8cc13 100644 --- a/extensions-builtin/Lora/extra_networks_lora.py +++ b/extensions-builtin/Lora/extra_networks_lora.py @@ -26,7 +26,9 @@ def get_stepwise(param, step, steps): return v else: return m - return calculate_weight(sorted_positions(param), step, steps) + + stepwise = calculate_weight(sorted_positions(param), step, steps) + return stepwise class ExtraNetworkLora(extra_networks.ExtraNetwork): diff --git a/wiki b/wiki index 4ceff5627..82ca84bc9 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 4ceff56271ad78faa6ea2678494187d45f4e0fa6 +Subproject commit 82ca84bc91dd1c915393a96207cd3e5d848a388f