From 82ff8681cc540dc074d91f5488097de1757745c9 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Tue, 11 Feb 2025 18:51:15 -0500 Subject: [PATCH] update docker info Signed-off-by: Vladimir Mandic --- CHANGELOG.md | 4 +++- Dockerfile => configs/Dockerfile.cuda | 4 ++-- configs/Dockerfile.ipex | 2 ++ configs/Dockerfile.rocm | 2 ++ modules/modelloader.py | 4 ++-- wiki | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) rename Dockerfile => configs/Dockerfile.cuda (95%) create mode 100644 configs/Dockerfile.ipex create mode 100644 configs/Dockerfile.rocm diff --git a/CHANGELOG.md b/CHANGELOG.md index cd924f493..9551cd370 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,9 @@ - **UI**: - force browser cache-invalidate on page load - **Docs** - - New [outpaint](https://github.com/vladmandic/sdnext/wiki/Outpaint) step-by-step guide + - New [Outpaint](https://github.com/vladmandic/sdnext/wiki/Outpaint) step-by-step guide + - Updated [Docker](https://github.com/vladmandic/sdnext/wiki/Docker) guide + includes build and publish and both local and cloud examples - **Backend** - **Torch** - for **zluda** set default to `torch==2.6.0+cu118` diff --git a/Dockerfile b/configs/Dockerfile.cuda similarity index 95% rename from Dockerfile rename to configs/Dockerfile.cuda index d31b17a36..9462cbee4 100644 --- a/Dockerfile +++ b/configs/Dockerfile.cuda @@ -2,7 +2,7 @@ # docs: # base image -FROM pytorch/pytorch:2.5.1-cuda12.4-cudnn9-runtime +FROM pytorch/pytorch:2.6.0-cuda12.6-cudnn9-runtime # metadata LABEL org.opencontainers.image.vendor="SD.Next" @@ -13,7 +13,7 @@ LABEL org.opencontainers.image.source="https://github.com/vladmandic/sdnext/" 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" +LABEL org.opencontainers.image.base.name="https://hub.docker.com/pytorch/pytorch:2.6.0-cuda12.6-cudnn9-runtime" LABEL org.opencontainers.image.version="latest" # minimum install diff --git a/configs/Dockerfile.ipex b/configs/Dockerfile.ipex new file mode 100644 index 000000000..38362d11f --- /dev/null +++ b/configs/Dockerfile.ipex @@ -0,0 +1,2 @@ +# SD.Next Dockerfile +# docs: diff --git a/configs/Dockerfile.rocm b/configs/Dockerfile.rocm new file mode 100644 index 000000000..38362d11f --- /dev/null +++ b/configs/Dockerfile.rocm @@ -0,0 +1,2 @@ +# SD.Next Dockerfile +# docs: diff --git a/modules/modelloader.py b/modules/modelloader.py index b89ce3e35..f3621fdc3 100644 --- a/modules/modelloader.py +++ b/modules/modelloader.py @@ -111,7 +111,7 @@ def download_civit_model_thread(model_name: str, model_url: str, model_path: str starting_pos = os.path.getsize(temp_file) headers['Range'] = f'bytes={starting_pos}-' if token is None: - token = shared.opts.civit_token + token = shared.opts.civitai_token if token is not None and len(token) > 0: headers['Authorization'] = f'Bearer {token}' @@ -398,7 +398,7 @@ def load_civitai(model: str, url: str): return name # already downloaded else: shared.log.debug(f'Reference download start: model="{name}"') - download_civit_model_thread(model_name=model, model_url=url, model_path='', model_type='safetensors', token=shared.opts.civit_token) + download_civit_model_thread(model_name=model, model_url=url, model_path='', model_type='safetensors', token=shared.opts.civitai_token) shared.log.debug(f'Reference download complete: model="{name}"') sd_models.list_models() info = sd_models.get_closet_checkpoint_match(name) diff --git a/wiki b/wiki index 69cee7888..80b43575a 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 69cee788891ef65aaf918da59e0a36aae522f4e0 +Subproject commit 80b43575ac976e311983ffe0c37887158016ea94