diff --git a/extensions-builtin/clip-interrogator-ext b/extensions-builtin/clip-interrogator-ext index 04208d88f..0f9a6d1a9 160000 --- a/extensions-builtin/clip-interrogator-ext +++ b/extensions-builtin/clip-interrogator-ext @@ -1 +1 @@ -Subproject commit 04208d88fb37990e6da43da08a2f113d51c8c0b9 +Subproject commit 0f9a6d1a933818f9a3af59a7e32e49afb1772657 diff --git a/extensions-builtin/sd-dynamic-thresholding b/extensions-builtin/sd-dynamic-thresholding index 360ec2da0..7a9f2694f 160000 --- a/extensions-builtin/sd-dynamic-thresholding +++ b/extensions-builtin/sd-dynamic-thresholding @@ -1 +1 @@ -Subproject commit 360ec2da066f19c188b67d77443e39f46a488b6e +Subproject commit 7a9f2694f40ff73974a7a7e818d523b5f056103d diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index 278ddf810..354478c88 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit 278ddf810a913eb87202c3e6035c36cb8a26267d +Subproject commit 354478c88790d32e3ad1ceed2a2d3467387b5ea7 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index dbdd6b1b0..2f0e67329 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit dbdd6b1b027b8dd02c1f13310f82cf359c617dc6 +Subproject commit 2f0e67329d4090b5eab452908285c6b4ab508547 diff --git a/extensions-builtin/seed_travel b/extensions-builtin/seed_travel index afb8992fc..c43baeeac 160000 --- a/extensions-builtin/seed_travel +++ b/extensions-builtin/seed_travel @@ -1 +1 @@ -Subproject commit afb8992fc19a9bf79a6f484e272e335a756e3082 +Subproject commit c43baeeac1a94e82a8ce4bdff5bd11bd03fed3e7 diff --git a/modules/extras.py b/modules/extras.py index 56d17e0fa..6f3e083ed 100644 --- a/modules/extras.py +++ b/modules/extras.py @@ -132,14 +132,14 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_ if theta_func2: shared.state.textinfo = f"Loading B" print(f"Loading {secondary_model_info.filename}...") - theta_1 = sd_models.read_state_dict(secondary_model_info.filename, map_location='cpu') + theta_1 = sd_models.read_state_dict(secondary_model_info.filename) else: theta_1 = None if theta_func1: shared.state.textinfo = f"Loading C" print(f"Loading {tertiary_model_info.filename}...") - theta_2 = sd_models.read_state_dict(tertiary_model_info.filename, map_location='cpu') + theta_2 = sd_models.read_state_dict(tertiary_model_info.filename) shared.state.textinfo = 'Merging B and C' shared.state.sampling_steps = len(theta_1.keys()) @@ -161,7 +161,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_ shared.state.textinfo = f"Loading {primary_model_info.filename}..." print(f"Loading {primary_model_info.filename}...") - theta_0 = sd_models.read_state_dict(primary_model_info.filename, map_location='cpu') + theta_0 = sd_models.read_state_dict(primary_model_info.filename) print("Merging...") shared.state.textinfo = 'Merging A and B' diff --git a/modules/sd_models.py b/modules/sd_models.py index e7e30d42a..7115eea90 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -243,13 +243,10 @@ def read_state_dict(checkpoint_file): with rich.progress.open(checkpoint_file, 'rb') as f: if extension.lower() == ".safetensors": buffer = f.read() - # load function always loads to cpu anyhow and model gets moved as needed pl_sd = safetensors.torch.load(buffer) - elif extension.lower() == ".ckpt": - buffer = io.BytesIO(f.read()) - pl_sd = torch.load(buffer) else: - raise Exception(f"Unknown model type: {extension}") + 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/wiki b/wiki index febb4552b..7ceddbb37 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit febb4552bc6ce387024095ece3a3af1ac08eee8a +Subproject commit 7ceddbb37bdb6b83c6cbdded557675fe3f9e52da