Unverified Commit 3fc10ded authored by Peter @sHTiF Stefcek's avatar Peter @sHTiF Stefcek Committed by GitHub
Browse files

add fix to be able use StableDiffusionXLAdapterPipeline.from_single_file (#5547)

parent 5b087e82
...@@ -2727,6 +2727,7 @@ class FromSingleFileMixin: ...@@ -2727,6 +2727,7 @@ class FromSingleFileMixin:
text_encoder = kwargs.pop("text_encoder", None) text_encoder = kwargs.pop("text_encoder", None)
vae = kwargs.pop("vae", None) vae = kwargs.pop("vae", None)
controlnet = kwargs.pop("controlnet", None) controlnet = kwargs.pop("controlnet", None)
adapter = kwargs.pop("adapter", None)
tokenizer = kwargs.pop("tokenizer", None) tokenizer = kwargs.pop("tokenizer", None)
torch_dtype = kwargs.pop("torch_dtype", None) torch_dtype = kwargs.pop("torch_dtype", None)
...@@ -2819,6 +2820,7 @@ class FromSingleFileMixin: ...@@ -2819,6 +2820,7 @@ class FromSingleFileMixin:
model_type=model_type, model_type=model_type,
stable_unclip=stable_unclip, stable_unclip=stable_unclip,
controlnet=controlnet, controlnet=controlnet,
adapter=adapter,
from_safetensors=from_safetensors, from_safetensors=from_safetensors,
extract_ema=extract_ema, extract_ema=extract_ema,
image_size=image_size, image_size=image_size,
......
...@@ -1145,6 +1145,7 @@ def download_from_original_stable_diffusion_ckpt( ...@@ -1145,6 +1145,7 @@ def download_from_original_stable_diffusion_ckpt(
stable_unclip_prior: Optional[str] = None, stable_unclip_prior: Optional[str] = None,
clip_stats_path: Optional[str] = None, clip_stats_path: Optional[str] = None,
controlnet: Optional[bool] = None, controlnet: Optional[bool] = None,
adapter: Optional[bool] = None,
load_safety_checker: bool = True, load_safety_checker: bool = True,
pipeline_class: DiffusionPipeline = None, pipeline_class: DiffusionPipeline = None,
local_files_only=False, local_files_only=False,
...@@ -1723,6 +1724,18 @@ def download_from_original_stable_diffusion_ckpt( ...@@ -1723,6 +1724,18 @@ def download_from_original_stable_diffusion_ckpt(
scheduler=scheduler, scheduler=scheduler,
force_zeros_for_empty_prompt=True, force_zeros_for_empty_prompt=True,
) )
elif adapter:
pipe = pipeline_class(
vae=vae,
text_encoder=text_encoder,
tokenizer=tokenizer,
text_encoder_2=text_encoder_2,
tokenizer_2=tokenizer_2,
unet=unet,
adapter=adapter,
scheduler=scheduler,
force_zeros_for_empty_prompt=True,
)
else: else:
pipe = pipeline_class( pipe = pipeline_class(
vae=vae, vae=vae,
......
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