Unverified Commit b7a6e34c authored by Patrick von Platen's avatar Patrick von Platen Committed by GitHub
Browse files

[From single file] Make sure that controlnet stays False for from_single_file (#4181)

* fix from signle file

* Make sure converison always works with safetensors
parent 47b33464
...@@ -931,7 +931,7 @@ def convert_open_clip_checkpoint( ...@@ -931,7 +931,7 @@ def convert_open_clip_checkpoint(
continue continue
if key[len(prefix) :] in textenc_conversion_map: if key[len(prefix) :] in textenc_conversion_map:
if key.endswith("text_projection"): if key.endswith("text_projection"):
value = checkpoint[key].T value = checkpoint[key].T.contiguous()
else: else:
value = checkpoint[key] value = checkpoint[key]
...@@ -1285,9 +1285,7 @@ def download_from_original_stable_diffusion_ckpt( ...@@ -1285,9 +1285,7 @@ def download_from_original_stable_diffusion_ckpt(
if image_size is None: if image_size is None:
image_size = 512 image_size = 512
if controlnet is None: if controlnet is None and "control_stage_config" in original_config.model.params:
controlnet = "control_stage_config" in original_config.model.params
controlnet = convert_controlnet_checkpoint( controlnet = convert_controlnet_checkpoint(
checkpoint, original_config, checkpoint_path, image_size, upcast_attention, extract_ema checkpoint, original_config, checkpoint_path, image_size, upcast_attention, extract_ema
) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment