From 3e546a34344804fcc67c10f6560f9c41d912d1ef Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sun, 16 Apr 2023 07:42:21 -0400 Subject: [PATCH] update requirements --- README.md | 1 - extensions-builtin/a1111-sd-webui-lycoris | 2 +- extensions-builtin/sd-extension-system-info | 2 +- extensions-builtin/sd-webui-controlnet | 2 +- modules/lycoris | 2 +- modules/ui_extra_networks_textual_inversion.py | 9 +++++---- requirements.txt | 6 +++--- setup.py | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 94a9edf64..8cc85f27c 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,6 @@ Hand-picked list of extensions that are deeply integrated into core workflows: - [Dynamic Thresholding](https://github.com/mcmonkeyprojects/sd-dynamic-thresholding) - [Steps Animation](https://github.com/vladmandic/sd-extension-steps-animation) - [Seed Travel](https://github.com/yownas/seed_travel) -- [Model Keyword](https://github.com/mix1009/model-keyword) - [Multi-Diffusion Upscaler](https://github.com/pkuliyi2015/multidiffusion-upscaler-for-automatic1111) ### User Interface diff --git a/extensions-builtin/a1111-sd-webui-lycoris b/extensions-builtin/a1111-sd-webui-lycoris index 040866b0f..a2d2ac40a 160000 --- a/extensions-builtin/a1111-sd-webui-lycoris +++ b/extensions-builtin/a1111-sd-webui-lycoris @@ -1 +1 @@ -Subproject commit 040866b0ffb80841e0ea2a7b780fd983cc622778 +Subproject commit a2d2ac40a31a9a8913c6838e7f863a72958e3bd3 diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index 3e528a56c..768a3987d 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit 3e528a56c3c3ca614d20767e0d00740b9b1c336c +Subproject commit 768a3987d3a1a4a17ce1cf5d0c9dcdd80183ad76 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index 33608671c..e900a87aa 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit 33608671cac0ead9e9e0206b9a613a66f95f5fb9 +Subproject commit e900a87aaaa03ff166cb7981999777094223ebe1 diff --git a/modules/lycoris b/modules/lycoris index 66a7fafad..53119eb85 160000 --- a/modules/lycoris +++ b/modules/lycoris @@ -1 +1 @@ -Subproject commit 66a7fafad3cbb14378fe548fca0153709cc59968 +Subproject commit 53119eb852b0450ab9294437d78dcdfa0d58a0dc diff --git a/modules/ui_extra_networks_textual_inversion.py b/modules/ui_extra_networks_textual_inversion.py index 7e488fdb2..b8dd408d8 100644 --- a/modules/ui_extra_networks_textual_inversion.py +++ b/modules/ui_extra_networks_textual_inversion.py @@ -18,11 +18,12 @@ class ExtraNetworksPageTextualInversion(ui_extra_networks.ExtraNetworksPage): if len(embeddings) == 0: # maybe not loaded yet, so lets just look them up for root, _dirs, fns in os.walk(shared.opts.embeddings_dir): for fn in fns: - embedding = Embedding(0, fn) - embedding.filename = os.path.join(root, fn) - embeddings.append(embedding) + if fn.lower().endswith(".pt"): + embedding = Embedding(0, fn) + embedding.filename = os.path.join(root, fn) + embeddings.append(embedding) for embedding in embeddings: - path, ext = os.path.splitext(embedding.filename) + path, _ext = os.path.splitext(embedding.filename) yield { "name": embedding.name, "filename": embedding.filename, diff --git a/requirements.txt b/requirements.txt index 8140b5cf1..3e74b039c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -accelerate addict aenum aiohttp @@ -30,7 +29,6 @@ numpy omegaconf open-clip-torch opencv-contrib-python -opencv-python piexif Pillow psutil @@ -43,7 +41,6 @@ safetensors scikit-image scipy tb_nightly -timm toml torch torchdiffeq @@ -53,6 +50,9 @@ tqdm voluptuous yapf +accelerate==0.18.0 +opencv-python==4.7.0.72 +timm==0.6.13 diffusers==0.15.0 einops==0.4.1 gradio==3.23.0 diff --git a/setup.py b/setup.py index c0a6ddfd3..7e8f931f4 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ def installed(package, friendly: str = None): if len(p) > 1: ok = ok and version == p[1] if not ok: - log.warning(f"Package wrong version: {p[0]} required {p[1]}") + log.warning(f"Package wrong version: {p[0]} {version} required {p[1]}") else: log.debug(f"Package version not found: {p[0]}") return ok @@ -192,7 +192,7 @@ def install_packages(): clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1") install(clip_package, 'clip') try: - xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers') + xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.17') install(f'--no-deps {xformers_package}') except Exception as e: log.error(f'Cannot install xformers package: {e}')