Merge pull request PaddlePaddle#49 from lxp521125/develop

通过WebUIStableDiffusionPipeline.from_pretrained_original_ckpt加载模型因为contronet报错修复
WAYKEN-TSE · Aug 9, 2023 · 6b33637 · 6b33637
2 parents 8c6dddf + f738274
commit 6b33637
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ppdiffusers/examples/community/webui_stable_diffusion.py b/ppdiffusers/examples/community/webui_stable_diffusion.py
@@ -378,11 +378,11 @@ def __init__(
             text_encoder: CLIPTextModel,
             tokenizer: CLIPTokenizer,
             unet: UNet2DConditionModel,
-            controlnet: Union[ControlNetModel, List[ControlNetModel], Tuple[
-                ControlNetModel], MultiControlNetModel],
             scheduler: KarrasDiffusionSchedulers,
             safety_checker: StableDiffusionSafetyChecker,
             feature_extractor: CLIPFeatureExtractor,
+            controlnet: Union[ControlNetModel, List[ControlNetModel], Tuple[
+                ControlNetModel], MultiControlNetModel] = None,
             requires_safety_checker: bool=True, ):
         super().__init__()