diff --git a/examples/community/README.md b/examples/community/README.md index 9fad6ecbf690..98780edeccf7 100755 --- a/examples/community/README.md +++ b/examples/community/README.md @@ -2870,10 +2870,14 @@ The original repo can be found at [repo](https://github.com/PRIS-CV/DemoFusion). - `show_image` (`bool`, defaults to False): Determine whether to show intermediate results during generation. ``` -from pipeline_demofusion_sdxl import DemoFusionSDXLPipeline +from diffusers import DiffusionPipeline -model_ckpt = "stabilityai/stable-diffusion-xl-base-1.0" -pipe = DemoFusionSDXLPipeline.from_pretrained(model_ckpt, torch_dtype=torch.float16) +pipe = DiffusionPipeline.from_pretrained( + "stabilityai/stable-diffusion-xl-base-1.0", + custom_pipeline="pipeline_demofusion_sdxl", + custom_revision="main", + torch_dtype=torch.float16, +) pipe = pipe.to("cuda") prompt = "Envision a portrait of an elderly woman, her face a canvas of time, framed by a headscarf with muted tones of rust and cream. Her eyes, blue like faded denim. Her attire, simple yet dignified." diff --git a/examples/community/pipeline_demofusion_sdxl.py b/examples/community/pipeline_demofusion_sdxl.py index 5a81320219a5..98508b7ff89c 100644 --- a/examples/community/pipeline_demofusion_sdxl.py +++ b/examples/community/pipeline_demofusion_sdxl.py @@ -36,7 +36,9 @@ if is_invisible_watermark_available(): - from .watermark import StableDiffusionXLWatermarker + from diffusers.pipelines.stable_diffusion_xl.watermark import ( + StableDiffusionXLWatermarker, + ) logger = logging.get_logger(__name__) # pylint: disable=invalid-name diff --git a/setup.py b/setup.py index bf0d40f77abe..ddb2afd64c51 100644 --- a/setup.py +++ b/setup.py @@ -118,7 +118,7 @@ "pytest-timeout", "pytest-xdist", "python>=3.8.0", - "ruff>=0.1.5,<=0.2", + "ruff==0.1.5", "safetensors>=0.3.1", "sentencepiece>=0.1.91,!=0.1.92", "GitPython<3.1.19", diff --git a/src/diffusers/dependency_versions_table.py b/src/diffusers/dependency_versions_table.py index ab9212458895..7891984b0c5d 100644 --- a/src/diffusers/dependency_versions_table.py +++ b/src/diffusers/dependency_versions_table.py @@ -30,7 +30,7 @@ "pytest-timeout": "pytest-timeout", "pytest-xdist": "pytest-xdist", "python": "python>=3.8.0", - "ruff": "ruff>=0.1.5,<=0.2", + "ruff": "ruff==0.1.5", "safetensors": "safetensors>=0.3.1", "sentencepiece": "sentencepiece>=0.1.91,!=0.1.92", "GitPython": "GitPython<3.1.19", diff --git a/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py b/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py index 30eb8d2ceafc..6960ba6c4516 100644 --- a/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py +++ b/src/diffusers/pipelines/stable_diffusion/convert_from_ckpt.py @@ -446,7 +446,7 @@ def convert_ldm_unet_checkpoint( new_checkpoint["add_embedding.linear_2.bias"] = unet_state_dict["label_emb.0.2.bias"] # Relevant to StableDiffusionUpscalePipeline - if "num_class_embeds" in config: + if (config["num_class_embeds"] is not None) and ("label_emb.weight" in unet_state_dict): new_checkpoint["class_embedding.weight"] = unet_state_dict["label_emb.weight"] new_checkpoint["conv_in.weight"] = unet_state_dict["input_blocks.0.0.weight"]