diff --git a/.gitmodules b/.gitmodules index e2e136ecd..b8e09ee74 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,9 +36,6 @@ [submodule "extensions-builtin/sd-webui-controlnet"] path = extensions-builtin/sd-webui-controlnet url = https://github.com/Mikubill/sd-webui-controlnet -[submodule "modules/locon"] - path = modules/locon - url = https://github.com/KohakuBlueleaf/LoCon [submodule "modules/lycoris"] path = modules/lycoris url = https://github.com/KohakuBlueleaf/LyCORIS diff --git a/.vscode/settings.json b/.vscode/settings.json index 37b51dde3..b33634779 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,6 +3,8 @@ "./modules/lora", "./repositories/BLIP", "./repositories/CodeFormer", + "./repositories/k-diffusion", + "./repositories/taming-transformers", "./repositories/stable-diffusion-stability-ai" ], "python.analysis.typeCheckingMode": "off" diff --git a/README.md b/README.md index 16fd00fac..f72ff24d4 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ Fork does differ in few things: - Uses simplified folder structure e.g. `/train`, `/outputs/*` - Modified training templates -- Built-in `LoRA`, `Custom Diffusion`, `Dreambooth` training +- Built-in `LoRA`, `LyCORIS`, `Custom Diffusion`, `Dreambooth` training Only Python library which is not auto-updated is `PyTorch` itself as that is very system specific For some Torch optimizations notes, see Wiki diff --git a/cli/train-lora.py b/cli/train-lora.py index 75630f11d..56a68443c 100755 --- a/cli/train-lora.py +++ b/cli/train-lora.py @@ -268,10 +268,6 @@ if __name__ == '__main__': time.sleep(1) if args.lycoris: - # python3 sd-scripts/train_network.py --network_module locon.locon_kohya --network_dim "RANK_FOR_TRANSFORMER" --network_alpha "ALPHA_FOR_TRANSFORMER" --network_args "conv_dim=RANK_FOR_CONV" "conv_alpha=ALPHA_FOR_CONV" "dropout=DROPOUT_RATE" - # options.network_dim = 'RANK_FOR_TRANSFORMER' - # options.network_alpha = 'ALPHA_FOR_TRANSFORMER' - # options.network_args = ['conv_dim=RANK_FOR_CONV', 'conv_alpha=ALPHA_FOR_CONV', 'dropout=DROPOUT_RATE'] log.info({ 'using lycoris network': True }) options.network_module = 'lycoris.kohya' if not args.notrain: diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index d4c535021..78a20ac98 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit d4c535021c80b585a5ae6973ad6d5d63a1199d78 +Subproject commit 78a20ac98469db71b660a8e066238927e264d0bf diff --git a/extensions-builtin/seed_travel b/extensions-builtin/seed_travel index 07c948cbf..84d8ee799 160000 --- a/extensions-builtin/seed_travel +++ b/extensions-builtin/seed_travel @@ -1 +1 @@ -Subproject commit 07c948cbf5530b24728961d97c6ae28d7a7e78c0 +Subproject commit 84d8ee799c627c4ee6751fb703734ef7e6819093 diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index fe445ddf2..b186ad208 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit fe445ddf26d3b311f563e0763c7f3041fc5391cf +Subproject commit b186ad208823b0f6d2449a3816d5fc06268ed38a diff --git a/modules/locon b/modules/locon deleted file mode 160000 index 559cb1ece..000000000 --- a/modules/locon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 559cb1ece20cba722009ee843b3935e746f5c969 diff --git a/wiki b/wiki index f967dcb69..ffb91e421 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit f967dcb69119f214b24e05fb1ff818dd230820c7 +Subproject commit ffb91e42140165d5515b95976e61dc45f85c2444