From 5f48a8e5e1ddfca4cab3f7cf6c91797ad21a5664 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 16 Feb 2023 09:22:59 -0500 Subject: [PATCH] update --- README.md | 29 +++++++++++++++++++++++++---- automatic.sh | 21 ++++++++++++--------- config.json | 1 + extensions-builtin/seed_travel | 2 +- modules/lora | 2 +- 5 files changed, 40 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index c0255f188..28d832883 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,12 @@ Simplified start script: `automatic.sh` Additionally print environment info during startup Example: - Version: c07487a Tue Jan 24 08:04:31 2023 -0500 - Platform: Ubuntu 22.04.1 LTS 5.15.79.1-microsoft-standard-WSL2 x86_64 - Python 3.10.6 - Torch: 2.0.0.dev20230118+cu118 CUDA: 11.8 cuDNN: 8700 GPU: NVIDIA GeForce RTX 3060 Arch: (8, 6) + Version: b0b326f3 Wed Feb 15 09:07:04 2023 -0500 + Repository: https://github.com/vladmandic/automatic + Last Merge: Sun Feb 5 07:03:27 2023 -0500 Merge pull request #35 from AUTOMATIC1111/master + Platform: Ubuntu 22.04.1 LTS 5.15.83.1-microsoft-standard-WSL2 x86_64 + nVIDIA: NVIDIA GeForce RTX 3060, 528.49 + Python: 3.10.6 Torch: 2.0.0.dev20230211+cu118 CUDA: 11.8 cuDNN: 8700 GPU: NVIDIA GeForce RTX 3060 Arch: (8, 6) > ./automatic.sh public @@ -58,6 +60,25 @@ Simplified start script: `automatic.sh` > cd automatic > ./automatic.sh install + SD server: install + Installing general requirements + Installing versioned requirements + Updating submodules + Modules: + - 6c76a48 Mon Feb 13 00:03:00 2023 -0800 https://github.com/mcmonkeyprojects/sd-dynamic-thresholding + - a528cd5 Tue Jan 31 07:57:07 2023 -0500 https://github.com/vladmandic/sd-extension-aesthetic-scorer + - 7cf0e3a Tue Feb 7 07:39:40 2023 -0500 https://github.com/vladmandic/sd-extension-steps-animation + - b5d8e6a Thu Feb 9 15:25:18 2023 -0500 https://github.com/vladmandic/sd-extension-system-info + - 7a998ed Wed Feb 8 07:21:52 2023 -0500 https://github.com/Akegarasu/sd-webui-model-converter + - 0a5c897 Thu Feb 16 11:08:00 2023 +0100 https://github.com/yownas/seed_travel + - c8efd35 Mon Feb 13 21:51:25 2023 +0100 https://github.com/AlUlkesh/stable-diffusion-webui-images-browser + - 14d7b24 Thu Feb 16 22:35:47 2023 +0900 https://github.com/kohya-ss/sd-scripts + - b351828 Tue Feb 14 11:47:19 2023 -0500 https://github.com/vladmandic/automatic.wiki + Updating extensions + Extensions: + - e5b773a Sat Feb 11 19:38:18 2023 +0500 https://github.com/klimaleksus/stable-diffusion-webui-embedding-merge + - 0f3f699 Fri Dec 9 11:50:47 2022 +0800 https://github.com/yfszzx/stable-diffusion-webui-inspiration +
## Differences diff --git a/automatic.sh b/automatic.sh index e29ff52ee..1691b2b18 100755 --- a/automatic.sh +++ b/automatic.sh @@ -1,14 +1,15 @@ #!/bin/env bash -TF_CPP_MIN_LOG_LEVEL=2 -FORCE_CUDA="1" -ATTN_PRECISION=fp16 -PYTORCH_CUDA_ALLOC_CONF=garbage_collection_threshold:0.9,max_split_size_mb:512 +export TF_CPP_MIN_LOG_LEVEL=2 +export FORCE_CUDA="1" +export ATTN_PRECISION=fp16 +export PYTORCH_CUDA_ALLOC_CONF=garbage_collection_threshold:0.9,max_split_size_mb:512 +export CUDA_LAUNCH_BLOCKING=0 +export CUDA_CACHE_DISABLE=0 +export CUDA_AUTO_BOOST=1 +export CUDA_DEVICE_DEFAULT_PERSISTING_L2_CACHE_PERCENTAGE_LIMIT=0 +export LD_PRELOAD=libtcmalloc.so # TORCH_CUDA_ARCH_LIST="8.6" -CUDA_LAUNCH_BLOCKING=0 -CUDA_CACHE_DISABLE=0 -CUDA_AUTO_BOOST=1 -CUDA_DEVICE_DEFAULT_PERSISTING_L2_CACHE_PERCENTAGE_LIMIT=0 if [ "$PYTHON" == "" ]; then PYTHON=$(which python) @@ -48,10 +49,12 @@ URL=$(git remote get-url origin) LSB=$(lsb_release -ds 2>/dev/null) UNAME=$(uname -rm 2>/dev/null) MERGE=$(git log --pretty=format:"%ad %s" | grep "Merge pull" | head -1) +SMI=$(nvidia-smi --query-gpu=name,driver_version --format=csv,noheader --id=0 2>/dev/null) echo "Version: $VER" echo "Repository: $URL" echo "Last Merge: $MERGE" echo "Platform: $LSB $UNAME" +echo "nVIDIA: $SMI" "$PYTHON" -c 'import torch; import platform; print("Python:", platform.python_version(), "Torch:", torch.__version__, "CUDA:", torch.version.cuda, "cuDNN:", torch.backends.cudnn.version(), "GPU:", torch.cuda.get_device_name(torch.cuda.current_device()), "Arch:", torch.cuda.get_device_capability());' if [ "$MODE" == install ]; then @@ -66,7 +69,7 @@ if [ "$MODE" == install ]; then echo "Updating submodules" git submodule update --init --recursive git submodule update --rebase --remote - echo "Modules:" + echo "Submodules:" git submodule foreach --quiet 'VER=$(git log -1 --pretty=format:"%h %ad"); URL=$(git remote get-url origin); echo "- $VER $URL"' echo "Updating extensions" diff --git a/config.json b/config.json index 2610c92f7..2bac5a05b 100644 --- a/config.json +++ b/config.json @@ -20,6 +20,7 @@ "directories_max_prompt_words": 8, "disable_weights_auto_swap": false, "disabled_extensions": [ + "openOutpaint-webUI-extension", "ScuNET" ], "do_not_add_watermark": true, diff --git a/extensions-builtin/seed_travel b/extensions-builtin/seed_travel index 791b43b5a..0a5c89796 160000 --- a/extensions-builtin/seed_travel +++ b/extensions-builtin/seed_travel @@ -1 +1 @@ -Subproject commit 791b43b5a2737ab2550e6eb18a8873ebd5b77b27 +Subproject commit 0a5c89796b296b1498f13e0468f9f4ebbff8226a diff --git a/modules/lora b/modules/lora index 82713e9aa..14d7b2461 160000 --- a/modules/lora +++ b/modules/lora @@ -1 +1 @@ -Subproject commit 82713e9aa62d9a28b17b3920b2b9bccd74051f9b +Subproject commit 14d7b2461973932fffc18d8c71f1fb876875d871