From 73135f2c1251434a84ff5ee173d88d8ef443bff9 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Fri, 24 Mar 2023 13:48:26 -0400 Subject: [PATCH] optimize model loader --- .../sd-extension-steps-animation | 2 +- extensions-builtin/sd-extension-system-info | 2 +- extensions-builtin/seed_travel | 2 +- modules/modelloader.py | 4 ++-- modules/sd_models.py | 19 +++++++++++-------- ui-config.json | 6 +++++- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/extensions-builtin/sd-extension-steps-animation b/extensions-builtin/sd-extension-steps-animation index 9a40ea6ae..95ebddc2d 160000 --- a/extensions-builtin/sd-extension-steps-animation +++ b/extensions-builtin/sd-extension-steps-animation @@ -1 +1 @@ -Subproject commit 9a40ea6ae2368d657274829a00d99170624889a7 +Subproject commit 95ebddc2d103132a0e79f09cbb51dfd18b57442c diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index 354478c88..9b07adb37 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit 354478c88790d32e3ad1ceed2a2d3467387b5ea7 +Subproject commit 9b07adb37d7955d21506cdc29def2d8abd9d2fb4 diff --git a/extensions-builtin/seed_travel b/extensions-builtin/seed_travel index c43baeeac..a72c836c5 160000 --- a/extensions-builtin/seed_travel +++ b/extensions-builtin/seed_travel @@ -1 +1 @@ -Subproject commit c43baeeac1a94e82a8ce4bdff5bd11bd03fed3e7 +Subproject commit a72c836c57d9c87259c3629ed9b15ff2732f0659 diff --git a/modules/modelloader.py b/modules/modelloader.py index e351d808a..e40e888c0 100644 --- a/modules/modelloader.py +++ b/modules/modelloader.py @@ -86,8 +86,8 @@ def cleanup_models(): root_path = script_path src_path = models_path dest_path = os.path.join(models_path, "Stable-diffusion") - move_files(src_path, dest_path, ".ckpt") - move_files(src_path, dest_path, ".safetensors") + # move_files(src_path, dest_path, ".ckpt") + # move_files(src_path, dest_path, ".safetensors") src_path = os.path.join(root_path, "ESRGAN") dest_path = os.path.join(models_path, "ESRGAN") move_files(src_path, dest_path) diff --git a/modules/sd_models.py b/modules/sd_models.py index 7115eea90..db19f4182 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -239,14 +239,17 @@ def read_metadata_from_safetensors(filename): def read_state_dict(checkpoint_file): - _, extension = os.path.splitext(checkpoint_file) - with rich.progress.open(checkpoint_file, 'rb') as f: - if extension.lower() == ".safetensors": - buffer = f.read() - pl_sd = safetensors.torch.load(buffer) - else: - buffer = io.BytesIO(f.read()) - pl_sd = torch.load(buffer, map_location='cpu') + if 'v1-5-pruned-emaonly.safetensors' in checkpoint_file: + pl_sd = safetensors.torch.load_file(checkpoint_file, device='cpu') + else: + _, extension = os.path.splitext(checkpoint_file) + with rich.progress.open(checkpoint_file, 'rb') as f: + if extension.lower() == ".safetensors": + buffer = f.read() + pl_sd = safetensors.torch.load(buffer) + else: + buffer = io.BytesIO(f.read()) + pl_sd = torch.load(buffer, map_location='cpu') sd = get_state_dict_from_checkpoint(pl_sd) return sd diff --git a/ui-config.json b/ui-config.json index f7b058f2a..7ced17691 100644 --- a/ui-config.json +++ b/ui-config.json @@ -1533,5 +1533,9 @@ "customscript/seed_travel.py/img2img/SSIM min threshold/value": 75, "customscript/seed_travel.py/img2img/SSIM min threshold/minimum": 0, "customscript/seed_travel.py/img2img/SSIM min threshold/maximum": 100, - "customscript/seed_travel.py/img2img/SSIM min threshold/step": 1 + "customscript/seed_travel.py/img2img/SSIM min threshold/step": 1, + "customscript/seed_travel.py/txt2img/Interpolation curve/visible": true, + "customscript/seed_travel.py/txt2img/Interpolation curve/value": "Linear", + "customscript/seed_travel.py/img2img/Interpolation curve/visible": true, + "customscript/seed_travel.py/img2img/Interpolation curve/value": "Linear" } \ No newline at end of file