From 1e419faeb1585506adba21e862a409abdbb5bcd2 Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Thu, 20 Jul 2023 21:47:42 +0000 Subject: [PATCH 1/2] fix from signle file --- src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py b/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py index 0eeb80f12dfc..836df004cc47 100644 --- a/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py +++ b/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py @@ -1285,9 +1285,7 @@ def download_from_original_stable_diffusion_ckpt( if image_size is None: image_size = 512 - if controlnet is None: - controlnet = "control_stage_config" in original_config.model.params - + if controlnet is None and "control_stage_config" in original_config.model.params: controlnet = convert_controlnet_checkpoint( checkpoint, original_config, checkpoint_path, image_size, upcast_attention, extract_ema ) From 8dba19547564b6c826eac71baed38aef20cb234a Mon Sep 17 00:00:00 2001 From: Patrick von Platen Date: Thu, 20 Jul 2023 21:54:30 +0000 Subject: [PATCH 2/2] Make sure converison always works with safetensors --- src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py b/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py index 836df004cc47..8524d26cd386 100644 --- a/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py +++ b/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py @@ -931,7 +931,7 @@ def convert_open_clip_checkpoint( continue if key[len(prefix) :] in textenc_conversion_map: if key.endswith("text_projection"): - value = checkpoint[key].T + value = checkpoint[key].T.contiguous() else: value = checkpoint[key]