diff --git a/src/diffusers/pipelines/allegro/pipeline_allegro.py b/src/diffusers/pipelines/allegro/pipeline_allegro.py index 42083378d465..7289e97ed1ae 100644 --- a/src/diffusers/pipelines/allegro/pipeline_allegro.py +++ b/src/diffusers/pipelines/allegro/pipeline_allegro.py @@ -198,6 +198,10 @@ def __init__( scheduler: KarrasDiffusionSchedulers, ): super().__init__() + self._guidance_scale = 7.5 + self._num_timesteps = 0 + self._current_timestep = None + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -843,8 +847,6 @@ def __call__( negative_prompt_attention_mask, ) self._guidance_scale = guidance_scale - self._current_timestep = None - self._interrupt = False # 2. Default height and width to transformer if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff.py index 091b6db713ba..30b6f378f4a6 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff.py @@ -136,6 +136,11 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(unet, UNet2DConditionModel): unet = UNetMotionModel.from_unet2d(unet, motion_adapter) @@ -714,7 +719,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, (str, dict)): diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_controlnet.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_controlnet.py index 70180ccf0650..2507bb59dffb 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_controlnet.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_controlnet.py @@ -172,6 +172,11 @@ def __init__( image_encoder: Optional[CLIPVisionModelWithProjection] = None, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(unet, UNet2DConditionModel): unet = UNetMotionModel.from_unet2d(unet, motion_adapter) @@ -877,7 +882,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, (str, dict)): diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py index 56d319027595..ec8979553b3c 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sdxl.py @@ -299,6 +299,13 @@ def __init__( force_zeros_for_empty_prompt: bool = True, ): super().__init__() + self._guidance_scale = 5.0 + self._guidance_rescale = 0.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._denoising_end = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(unet, UNet2DConditionModel): unet = UNetMotionModel.from_unet2d(unet, motion_adapter) @@ -1083,7 +1090,6 @@ def __call__( self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py index 46d650efe8b6..55439272c0ec 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_sparsectrl.py @@ -184,6 +184,10 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 if isinstance(unet, UNet2DConditionModel): unet = UNetMotionModel.from_unet2d(unet, motion_adapter) diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video.py index 51a9a31c4259..b34cb37db1fc 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video.py @@ -239,6 +239,11 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(unet, UNet2DConditionModel): unet = UNetMotionModel.from_unet2d(unet, motion_adapter) @@ -883,7 +888,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, (str, dict)): diff --git a/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video_controlnet.py b/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video_controlnet.py index c3ac7df2cc8c..fdede69257f3 100644 --- a/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video_controlnet.py +++ b/src/diffusers/pipelines/animatediff/pipeline_animatediff_video2video_controlnet.py @@ -262,6 +262,11 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(unet, UNet2DConditionModel): unet = UNetMotionModel.from_unet2d(unet, motion_adapter) @@ -1086,7 +1091,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, (str, dict)): diff --git a/src/diffusers/pipelines/aura_flow/pipeline_aura_flow.py b/src/diffusers/pipelines/aura_flow/pipeline_aura_flow.py index 1d75e4bef31e..590ee76262d9 100644 --- a/src/diffusers/pipelines/aura_flow/pipeline_aura_flow.py +++ b/src/diffusers/pipelines/aura_flow/pipeline_aura_flow.py @@ -154,6 +154,9 @@ def __init__( scheduler: FlowMatchEulerDiscreteScheduler, ): super().__init__() + self._guidance_scale = 3.5 + self._attention_kwargs = None + self._num_timesteps = 0 self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler diff --git a/src/diffusers/pipelines/bria/pipeline_bria.py b/src/diffusers/pipelines/bria/pipeline_bria.py index a22a756005ac..f6c191bf0b0e 100644 --- a/src/diffusers/pipelines/bria/pipeline_bria.py +++ b/src/diffusers/pipelines/bria/pipeline_bria.py @@ -123,6 +123,12 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, feature_extractor: CLIPImageProcessor = None, ): + super().__init__() + self._guidance_scale = 5.0 + self._attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 + self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/bria_fibo/pipeline_bria_fibo.py b/src/diffusers/pipelines/bria_fibo/pipeline_bria_fibo.py index 8fd29756b290..6fd08559e538 100644 --- a/src/diffusers/pipelines/bria_fibo/pipeline_bria_fibo.py +++ b/src/diffusers/pipelines/bria_fibo/pipeline_bria_fibo.py @@ -107,6 +107,11 @@ def __init__( scheduler=scheduler, ) + self._guidance_scale = 5.0 + self._joint_attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 + self.vae_scale_factor = 16 self.image_processor = VaeImageProcessor(vae_scale_factor=self.vae_scale_factor * 2) self.default_sample_size = 64 diff --git a/src/diffusers/pipelines/chroma/pipeline_chroma.py b/src/diffusers/pipelines/chroma/pipeline_chroma.py index ed6c2c2105b6..f7dfbfdb4d4d 100644 --- a/src/diffusers/pipelines/chroma/pipeline_chroma.py +++ b/src/diffusers/pipelines/chroma/pipeline_chroma.py @@ -190,6 +190,11 @@ def __init__( feature_extractor: CLIPImageProcessor = None, ): super().__init__() + self._guidance_scale = 5.0 + self._joint_attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/chroma/pipeline_chroma_img2img.py b/src/diffusers/pipelines/chroma/pipeline_chroma_img2img.py index 470c746e4146..9e90683a530c 100644 --- a/src/diffusers/pipelines/chroma/pipeline_chroma_img2img.py +++ b/src/diffusers/pipelines/chroma/pipeline_chroma_img2img.py @@ -202,6 +202,11 @@ def __init__( feature_extractor: CLIPImageProcessor = None, ): super().__init__() + self._guidance_scale = 5.0 + self._joint_attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/chronoedit/pipeline_chronoedit.py b/src/diffusers/pipelines/chronoedit/pipeline_chronoedit.py index 79f6580fbed6..b331e74b3b71 100644 --- a/src/diffusers/pipelines/chronoedit/pipeline_chronoedit.py +++ b/src/diffusers/pipelines/chronoedit/pipeline_chronoedit.py @@ -167,6 +167,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 5.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/cogvideo/pipeline_cogvideox.py b/src/diffusers/pipelines/cogvideo/pipeline_cogvideox.py index 245c794c9c93..34c516e0bb59 100644 --- a/src/diffusers/pipelines/cogvideo/pipeline_cogvideox.py +++ b/src/diffusers/pipelines/cogvideo/pipeline_cogvideox.py @@ -185,6 +185,11 @@ def __init__( scheduler: Union[CogVideoXDDIMScheduler, CogVideoXDPMScheduler], ): super().__init__() + self._guidance_scale = 6 + self._num_timesteps = 0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -631,8 +636,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False # 2. Default call parameters if prompt is not None and isinstance(prompt, str): @@ -737,7 +740,7 @@ def __call__( # perform guidance if use_dynamic_cfg: - self._guidance_scale = 1 + guidance_scale * ( + self._guidance_scale = 6 + guidance_scale * ( (1 - math.cos(math.pi * ((num_inference_steps - t.item()) / num_inference_steps) ** 5.0)) / 2 ) if do_classifier_free_guidance: diff --git a/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_fun_control.py b/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_fun_control.py index 456f0bda1644..12f6c3c3a163 100644 --- a/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_fun_control.py +++ b/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_fun_control.py @@ -192,6 +192,11 @@ def __init__( scheduler: KarrasDiffusionSchedulers, ): super().__init__() + self._guidance_scale = 6 + self._num_timesteps = 0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -684,8 +689,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False # 2. Default call parameters if prompt is not None and isinstance(prompt, str): @@ -803,7 +806,7 @@ def __call__( # perform guidance if use_dynamic_cfg: - self._guidance_scale = 1 + guidance_scale * ( + self._guidance_scale = 6 + guidance_scale * ( (1 - math.cos(math.pi * ((num_inference_steps - t.item()) / num_inference_steps) ** 5.0)) / 2 ) if do_classifier_free_guidance: diff --git a/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_image2video.py b/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_image2video.py index 321f0f073fe7..4b9abb0c1feb 100644 --- a/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_image2video.py +++ b/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_image2video.py @@ -198,6 +198,11 @@ def __init__( scheduler: Union[CogVideoXDDIMScheduler, CogVideoXDPMScheduler], ): super().__init__() + self._guidance_scale = 6 + self._num_timesteps = 0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False self.register_modules( tokenizer=tokenizer, @@ -728,9 +733,7 @@ def __call__( negative_prompt_embeds=negative_prompt_embeds, ) self._guidance_scale = guidance_scale - self._current_timestep = None self._attention_kwargs = attention_kwargs - self._interrupt = False # 2. Default call parameters if prompt is not None and isinstance(prompt, str): @@ -847,7 +850,7 @@ def __call__( # perform guidance if use_dynamic_cfg: - self._guidance_scale = 1 + guidance_scale * ( + self._guidance_scale = 6 + guidance_scale * ( (1 - math.cos(math.pi * ((num_inference_steps - t.item()) / num_inference_steps) ** 5.0)) / 2 ) if do_classifier_free_guidance: diff --git a/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_video2video.py b/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_video2video.py index e27c572020d6..44a453ad2656 100644 --- a/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_video2video.py +++ b/src/diffusers/pipelines/cogvideo/pipeline_cogvideox_video2video.py @@ -207,6 +207,11 @@ def __init__( scheduler: Union[CogVideoXDDIMScheduler, CogVideoXDPMScheduler], ): super().__init__() + self._guidance_scale = 6 + self._num_timesteps = 0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -704,8 +709,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False # 2. Default call parameters if prompt is not None and isinstance(prompt, str): @@ -818,7 +821,7 @@ def __call__( # perform guidance if use_dynamic_cfg: - self._guidance_scale = 1 + guidance_scale * ( + self._guidance_scale = 6 + guidance_scale * ( (1 - math.cos(math.pi * ((num_inference_steps - t.item()) / num_inference_steps) ** 5.0)) / 2 ) if do_classifier_free_guidance: diff --git a/src/diffusers/pipelines/cogview3/pipeline_cogview3plus.py b/src/diffusers/pipelines/cogview3/pipeline_cogview3plus.py index 46f60d24a467..cd198a349cf0 100644 --- a/src/diffusers/pipelines/cogview3/pipeline_cogview3plus.py +++ b/src/diffusers/pipelines/cogview3/pipeline_cogview3plus.py @@ -156,6 +156,9 @@ def __init__( scheduler: Union[CogVideoXDDIMScheduler, CogVideoXDPMScheduler], ): super().__init__() + self._guidance_scale = 5.0 + self._num_timesteps = 0 + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -534,7 +537,6 @@ def __call__( negative_prompt_embeds, ) self._guidance_scale = guidance_scale - self._interrupt = False # 2. Default call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/cogview4/pipeline_cogview4.py b/src/diffusers/pipelines/cogview4/pipeline_cogview4.py index 9a2d555538d5..275245f88162 100644 --- a/src/diffusers/pipelines/cogview4/pipeline_cogview4.py +++ b/src/diffusers/pipelines/cogview4/pipeline_cogview4.py @@ -168,6 +168,11 @@ def __init__( scheduler: FlowMatchEulerDiscreteScheduler, ): super().__init__() + self._guidance_scale = 5.0 + self._num_timesteps = 0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -535,8 +540,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False # Default call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/cogview4/pipeline_cogview4_control.py b/src/diffusers/pipelines/cogview4/pipeline_cogview4_control.py index 2d6785f791db..59c2f238a44a 100644 --- a/src/diffusers/pipelines/cogview4/pipeline_cogview4_control.py +++ b/src/diffusers/pipelines/cogview4/pipeline_cogview4_control.py @@ -170,6 +170,11 @@ def __init__( scheduler: FlowMatchEulerDiscreteScheduler, ): super().__init__() + self._guidance_scale = 5.0 + self._num_timesteps = 0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -567,8 +572,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False # Default call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/consisid/pipeline_consisid.py b/src/diffusers/pipelines/consisid/pipeline_consisid.py index 3e6c149d7f80..96aa2052eaa8 100644 --- a/src/diffusers/pipelines/consisid/pipeline_consisid.py +++ b/src/diffusers/pipelines/consisid/pipeline_consisid.py @@ -288,6 +288,10 @@ def __init__( scheduler: CogVideoXDPMScheduler, ): super().__init__() + self._guidance_scale = 6.0 + self._num_timesteps = 0 + self._attention_kwargs = None + self._interrupt = False self.register_modules( tokenizer=tokenizer, @@ -808,7 +812,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._interrupt = False # 2. Default call parameters if prompt is not None and isinstance(prompt, str): @@ -916,7 +919,7 @@ def __call__( # perform guidance if use_dynamic_cfg: - self._guidance_scale = 1 + guidance_scale * ( + self._guidance_scale = 6.0 + guidance_scale * ( ( 1 - math.cos( diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet.py index e2fb32688392..5e5e7f682852 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet.py @@ -223,6 +223,11 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if safety_checker is None and requires_safety_checker: logger.warning( @@ -1100,7 +1105,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_img2img.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_img2img.py index 12cc6f630d80..7d889c129eef 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_img2img.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_img2img.py @@ -201,6 +201,11 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if safety_checker is None and requires_safety_checker: logger.warning( @@ -1092,7 +1097,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint.py index 6de8e5747b02..1a69b432f92c 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint.py @@ -204,6 +204,11 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if safety_checker is None and requires_safety_checker: logger.warning( @@ -1206,7 +1211,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint_sd_xl.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint_sd_xl.py index fb09d04832f3..a24c7ef8e206 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint_sd_xl.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint_sd_xl.py @@ -253,6 +253,11 @@ def __init__( image_encoder: Optional[CLIPVisionModelWithProjection] = None, ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = MultiControlNetModel(controlnet) @@ -1444,7 +1449,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl.py index 283c3f92390c..5d0889fedb64 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl.py @@ -265,6 +265,12 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._denoising_end = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = MultiControlNetModel(controlnet) @@ -1249,7 +1255,6 @@ def __call__( self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl_img2img.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl_img2img.py index 94c4c394465b..7108a0c17082 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl_img2img.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl_img2img.py @@ -258,6 +258,11 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = MultiControlNetModel(controlnet) @@ -1342,7 +1347,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py index e234015f8616..ccd3022c2a4f 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py @@ -242,6 +242,11 @@ def __init__( image_encoder: Optional[CLIPVisionModelWithProjection] = None, ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = MultiControlNetUnionModel(controlnet) @@ -1453,7 +1458,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py index 99f2958b320e..0c051f0c9180 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py @@ -256,6 +256,12 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._denoising_end = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = MultiControlNetUnionModel(controlnet) @@ -1237,7 +1243,6 @@ def __call__( self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py index 4d0093132b9c..77734bd46025 100644 --- a/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py +++ b/src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py @@ -274,6 +274,11 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = MultiControlNetUnionModel(controlnet) @@ -1360,7 +1365,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet_hunyuandit/pipeline_hunyuandit_controlnet.py b/src/diffusers/pipelines/controlnet_hunyuandit/pipeline_hunyuandit_controlnet.py index 29a7d6147638..49ebf9d9d370 100644 --- a/src/diffusers/pipelines/controlnet_hunyuandit/pipeline_hunyuandit_controlnet.py +++ b/src/diffusers/pipelines/controlnet_hunyuandit/pipeline_hunyuandit_controlnet.py @@ -233,6 +233,10 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 5.0 + self._guidance_rescale = 0.0 + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = HunyuanDiT2DMultiControlNetModel(controlnet) @@ -797,7 +801,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._guidance_rescale = guidance_rescale - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet.py b/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet.py index d721acc77c2a..1f297a32c1f8 100644 --- a/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet.py +++ b/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet.py @@ -206,6 +206,11 @@ def __init__( feature_extractor: Optional[SiglipImageProcessor] = None, ): super().__init__() + self._guidance_scale = 7.0 + self._clip_skip = None + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = SD3MultiControlNetModel(controlnet) if isinstance(controlnet, SD3MultiControlNetModel): @@ -1010,7 +1015,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet_inpainting.py b/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet_inpainting.py index 2071305cdf10..9cebda46e6a1 100644 --- a/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet_inpainting.py +++ b/src/diffusers/pipelines/controlnet_sd3/pipeline_stable_diffusion_3_controlnet_inpainting.py @@ -229,6 +229,12 @@ def __init__( feature_extractor: Optional[SiglipImageProcessor] = None, ): super().__init__() + self._guidance_scale = 7.0 + self._clip_skip = None + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False + if isinstance(controlnet, (list, tuple)): controlnet = SD3MultiControlNetModel(controlnet) @@ -1182,7 +1188,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs.py b/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs.py index 3682ddc91156..17762cd13c0f 100644 --- a/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs.py +++ b/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs.py @@ -158,6 +158,9 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._cross_attention_kwargs = None + self._num_timesteps = 0 if isinstance(unet, UNet2DConditionModel): unet = UNetControlNetXSModel.from_unet(unet, controlnet) @@ -773,7 +776,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs_sd_xl.py b/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs_sd_xl.py index 7bf610f3a0ba..ac6eecf08046 100644 --- a/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs_sd_xl.py +++ b/src/diffusers/pipelines/controlnet_xs/pipeline_controlnet_xs_sd_xl.py @@ -190,6 +190,9 @@ def __init__( feature_extractor: CLIPImageProcessor = None, ): super().__init__() + self._guidance_scale = 5.0 + self._cross_attention_kwargs = None + self._num_timesteps = 0 if isinstance(unet, UNet2DConditionModel): unet = UNetControlNetXSModel.from_unet(unet, controlnet) @@ -905,7 +908,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/cosmos/pipeline_cosmos2_5_predict.py b/src/diffusers/pipelines/cosmos/pipeline_cosmos2_5_predict.py index ea9df999ddd6..c132911b1695 100644 --- a/src/diffusers/pipelines/cosmos/pipeline_cosmos2_5_predict.py +++ b/src/diffusers/pipelines/cosmos/pipeline_cosmos2_5_predict.py @@ -202,6 +202,10 @@ def __init__( safety_checker: CosmosSafetyChecker = None, ): super().__init__() + self._guidance_scale = 7.0 + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 if safety_checker is None: safety_checker = CosmosSafetyChecker() diff --git a/src/diffusers/pipelines/cosmos/pipeline_cosmos2_text2image.py b/src/diffusers/pipelines/cosmos/pipeline_cosmos2_text2image.py index 66490c2be159..196aad07f8a2 100644 --- a/src/diffusers/pipelines/cosmos/pipeline_cosmos2_text2image.py +++ b/src/diffusers/pipelines/cosmos/pipeline_cosmos2_text2image.py @@ -170,6 +170,10 @@ def __init__( safety_checker: CosmosSafetyChecker = None, ): super().__init__() + self._guidance_scale = 7.0 + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 if safety_checker is None: safety_checker = CosmosSafetyChecker() diff --git a/src/diffusers/pipelines/cosmos/pipeline_cosmos2_video2world.py b/src/diffusers/pipelines/cosmos/pipeline_cosmos2_video2world.py index 23a74ad00f93..b45c966bb3e8 100644 --- a/src/diffusers/pipelines/cosmos/pipeline_cosmos2_video2world.py +++ b/src/diffusers/pipelines/cosmos/pipeline_cosmos2_video2world.py @@ -189,6 +189,10 @@ def __init__( safety_checker: CosmosSafetyChecker = None, ): super().__init__() + self._guidance_scale = 7.0 + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 if safety_checker is None: safety_checker = CosmosSafetyChecker() diff --git a/src/diffusers/pipelines/cosmos/pipeline_cosmos_text2world.py b/src/diffusers/pipelines/cosmos/pipeline_cosmos_text2world.py index f0aa1ecf0e0f..b79791e81639 100644 --- a/src/diffusers/pipelines/cosmos/pipeline_cosmos_text2world.py +++ b/src/diffusers/pipelines/cosmos/pipeline_cosmos_text2world.py @@ -167,6 +167,10 @@ def __init__( safety_checker: CosmosSafetyChecker = None, ): super().__init__() + self._guidance_scale = 7.0 + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 if safety_checker is None: safety_checker = CosmosSafetyChecker() diff --git a/src/diffusers/pipelines/cosmos/pipeline_cosmos_video2world.py b/src/diffusers/pipelines/cosmos/pipeline_cosmos_video2world.py index cd5a734cc311..ab008681f8c9 100644 --- a/src/diffusers/pipelines/cosmos/pipeline_cosmos_video2world.py +++ b/src/diffusers/pipelines/cosmos/pipeline_cosmos_video2world.py @@ -211,6 +211,10 @@ def __init__( safety_checker: CosmosSafetyChecker = None, ): super().__init__() + self._guidance_scale = 7.0 + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 if safety_checker is None: safety_checker = CosmosSafetyChecker() diff --git a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py index 6f484aa3e298..231efa1ee393 100644 --- a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py +++ b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion.py @@ -209,6 +209,11 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._guidance_rescale = 0.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1: deprecation_message = ( diff --git a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py index d6bf90120755..1b2118d1a3f1 100644 --- a/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py +++ b/src/diffusers/pipelines/deprecated/alt_diffusion/pipeline_alt_diffusion_img2img.py @@ -237,6 +237,10 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1: deprecation_message = ( diff --git a/src/diffusers/pipelines/easyanimate/pipeline_easyanimate.py b/src/diffusers/pipelines/easyanimate/pipeline_easyanimate.py index 86c4d6812130..a4dc86ca5abd 100755 --- a/src/diffusers/pipelines/easyanimate/pipeline_easyanimate.py +++ b/src/diffusers/pipelines/easyanimate/pipeline_easyanimate.py @@ -217,6 +217,10 @@ def __init__( scheduler: FlowMatchEulerDiscreteScheduler, ): super().__init__() + self._guidance_scale = 5.0 + self._guidance_rescale = 0.0 + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -630,7 +634,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._guidance_rescale = guidance_rescale - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/easyanimate/pipeline_easyanimate_control.py b/src/diffusers/pipelines/easyanimate/pipeline_easyanimate_control.py index b28a2c9fb273..b96ae53d9c2b 100755 --- a/src/diffusers/pipelines/easyanimate/pipeline_easyanimate_control.py +++ b/src/diffusers/pipelines/easyanimate/pipeline_easyanimate_control.py @@ -319,6 +319,10 @@ def __init__( scheduler: FlowMatchEulerDiscreteScheduler, ): super().__init__() + self._guidance_scale = 5.0 + self._guidance_rescale = 0.0 + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -773,7 +777,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._guidance_rescale = guidance_rescale - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/easyanimate/pipeline_easyanimate_inpaint.py b/src/diffusers/pipelines/easyanimate/pipeline_easyanimate_inpaint.py index ec394315ee93..50482f33be80 100755 --- a/src/diffusers/pipelines/easyanimate/pipeline_easyanimate_inpaint.py +++ b/src/diffusers/pipelines/easyanimate/pipeline_easyanimate_inpaint.py @@ -361,6 +361,10 @@ def __init__( scheduler: FlowMatchEulerDiscreteScheduler, ): super().__init__() + self._guidance_scale = 5.0 + self._guidance_rescale = 0.0 + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -920,7 +924,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._guidance_rescale = guidance_rescale - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/flux/pipeline_flux.py b/src/diffusers/pipelines/flux/pipeline_flux.py index 9562722dbee3..70bbaaa0e9b4 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux.py +++ b/src/diffusers/pipelines/flux/pipeline_flux.py @@ -194,6 +194,11 @@ def __init__( feature_extractor: CLIPImageProcessor = None, ): super().__init__() + self._guidance_scale = 3.5 + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._current_timestep = None + self._interrupt = False self.register_modules( vae=vae, @@ -801,8 +806,6 @@ def __call__( self._guidance_scale = guidance_scale self._joint_attention_kwargs = joint_attention_kwargs - self._current_timestep = None - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/flux/pipeline_flux_control.py b/src/diffusers/pipelines/flux/pipeline_flux_control.py index 77f971d57a80..ca76a4547680 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_control.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_control.py @@ -204,6 +204,10 @@ def __init__( transformer: FluxTransformer2DModel, ): super().__init__() + self._guidance_scale = 3.5 + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -751,7 +755,6 @@ def __call__( self._guidance_scale = guidance_scale self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/flux/pipeline_flux_control_img2img.py b/src/diffusers/pipelines/flux/pipeline_flux_control_img2img.py index e1bbc6735051..ee60f19729ed 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_control_img2img.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_control_img2img.py @@ -217,6 +217,10 @@ def __init__( transformer: FluxTransformer2DModel, ): super().__init__() + self._guidance_scale = 7.0 + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -765,7 +769,6 @@ def __call__( self._guidance_scale = guidance_scale self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Preprocess image init_image = self.image_processor.preprocess(image, height=height, width=width) diff --git a/src/diffusers/pipelines/flux/pipeline_flux_control_inpaint.py b/src/diffusers/pipelines/flux/pipeline_flux_control_inpaint.py index b02e74d3b2d6..07c3c079bac4 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_control_inpaint.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_control_inpaint.py @@ -249,6 +249,10 @@ def __init__( transformer: FluxTransformer2DModel, ): super().__init__() + self._guidance_scale = 7.0 + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -948,7 +952,6 @@ def __call__( self._guidance_scale = guidance_scale self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False device = self._execution_device # 3. Define call parameters diff --git a/src/diffusers/pipelines/flux/pipeline_flux_controlnet.py b/src/diffusers/pipelines/flux/pipeline_flux_controlnet.py index 78de4f617f84..388a6133b524 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_controlnet.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_controlnet.py @@ -221,6 +221,10 @@ def __init__( feature_extractor: CLIPImageProcessor = None, ): super().__init__() + self._guidance_scale = 7.0 + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = FluxMultiControlNetModel(controlnet) @@ -842,7 +846,6 @@ def __call__( self._guidance_scale = guidance_scale self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/flux/pipeline_flux_controlnet_image_to_image.py b/src/diffusers/pipelines/flux/pipeline_flux_controlnet_image_to_image.py index 5bf593258f49..8182be742763 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_controlnet_image_to_image.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_controlnet_image_to_image.py @@ -214,6 +214,10 @@ def __init__( ], ): super().__init__() + self._guidance_scale = 7.0 + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = FluxMultiControlNetModel(controlnet) @@ -754,7 +758,6 @@ def __call__( self._guidance_scale = guidance_scale self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False if prompt is not None and isinstance(prompt, str): batch_size = 1 diff --git a/src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py b/src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py index a1e1f5f5e9e5..baf5a58fee67 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py @@ -216,6 +216,10 @@ def __init__( ], ): super().__init__() + self._guidance_scale = 7.0 + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if isinstance(controlnet, (list, tuple)): controlnet = FluxMultiControlNetModel(controlnet) @@ -880,7 +884,6 @@ def __call__( self._guidance_scale = guidance_scale self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/flux/pipeline_flux_fill.py b/src/diffusers/pipelines/flux/pipeline_flux_fill.py index 8ec9871d2579..e2d5591bced8 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_fill.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_fill.py @@ -212,6 +212,10 @@ def __init__( transformer: FluxTransformer2DModel, ): super().__init__() + self._guidance_scale = 30.0 + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -888,7 +892,6 @@ def __call__( self._guidance_scale = guidance_scale self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False init_image = self.image_processor.preprocess(image, height=height, width=width) init_image = init_image.to(dtype=torch.float32) diff --git a/src/diffusers/pipelines/flux/pipeline_flux_img2img.py b/src/diffusers/pipelines/flux/pipeline_flux_img2img.py index 5166a6497e01..68bf45edef26 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_img2img.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_img2img.py @@ -211,6 +211,10 @@ def __init__( feature_extractor: CLIPImageProcessor = None, ): super().__init__() + self._guidance_scale = 7.0 + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -880,7 +884,6 @@ def __call__( self._guidance_scale = guidance_scale self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Preprocess image init_image = self.image_processor.preprocess(image, height=height, width=width) diff --git a/src/diffusers/pipelines/flux/pipeline_flux_inpaint.py b/src/diffusers/pipelines/flux/pipeline_flux_inpaint.py index 64a81fb0699f..da0f81ff69cd 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_inpaint.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_inpaint.py @@ -207,6 +207,10 @@ def __init__( feature_extractor: CLIPImageProcessor = None, ): super().__init__() + self._guidance_scale = 7.0 + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -945,7 +949,6 @@ def __call__( self._guidance_scale = guidance_scale self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Preprocess mask and image if padding_mask_crop is not None: diff --git a/src/diffusers/pipelines/flux/pipeline_flux_kontext.py b/src/diffusers/pipelines/flux/pipeline_flux_kontext.py index 94ae460afcd0..e7b29a18d3cd 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_kontext.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_kontext.py @@ -238,6 +238,11 @@ def __init__( feature_extractor: CLIPImageProcessor = None, ): super().__init__() + self._guidance_scale = 3.5 + self._joint_attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py b/src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py index b6f957981e14..880b64862b85 100644 --- a/src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py +++ b/src/diffusers/pipelines/flux/pipeline_flux_kontext_inpaint.py @@ -262,6 +262,11 @@ def __init__( feature_extractor: CLIPImageProcessor = None, ): super().__init__() + self._guidance_scale = 3.5 + self._joint_attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/flux2/pipeline_flux2.py b/src/diffusers/pipelines/flux2/pipeline_flux2.py index b54a43dd89a5..831c5fe6ae0e 100644 --- a/src/diffusers/pipelines/flux2/pipeline_flux2.py +++ b/src/diffusers/pipelines/flux2/pipeline_flux2.py @@ -280,6 +280,11 @@ def __init__( transformer: Flux2Transformer2DModel, ): super().__init__() + self._guidance_scale = 4.0 + self._joint_attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/hidream_image/pipeline_hidream_image.py b/src/diffusers/pipelines/hidream_image/pipeline_hidream_image.py index d259f7ee7865..684268095a06 100644 --- a/src/diffusers/pipelines/hidream_image/pipeline_hidream_image.py +++ b/src/diffusers/pipelines/hidream_image/pipeline_hidream_image.py @@ -176,6 +176,10 @@ def __init__( transformer: HiDreamImageTransformer2DModel, ): super().__init__() + self._guidance_scale = 5.0 + self._attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -901,7 +905,6 @@ def __call__( self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/hunyuan_image/pipeline_hunyuanimage.py b/src/diffusers/pipelines/hunyuan_image/pipeline_hunyuanimage.py index 658935ccd886..8fd3d56ca5e4 100644 --- a/src/diffusers/pipelines/hunyuan_image/pipeline_hunyuanimage.py +++ b/src/diffusers/pipelines/hunyuan_image/pipeline_hunyuanimage.py @@ -198,6 +198,10 @@ def __init__( ): super().__init__() + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/hunyuan_image/pipeline_hunyuanimage_refiner.py b/src/diffusers/pipelines/hunyuan_image/pipeline_hunyuanimage_refiner.py index f38f53d9a562..9b0e6527e5a9 100644 --- a/src/diffusers/pipelines/hunyuan_image/pipeline_hunyuanimage_refiner.py +++ b/src/diffusers/pipelines/hunyuan_image/pipeline_hunyuanimage_refiner.py @@ -165,6 +165,10 @@ def __init__( ): super().__init__() + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_skyreels_image2video.py b/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_skyreels_image2video.py index 6bb7a4344da5..9eaf1a568017 100644 --- a/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_skyreels_image2video.py +++ b/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_skyreels_image2video.py @@ -206,6 +206,11 @@ def __init__( tokenizer_2: CLIPTokenizer, ): super().__init__() + self._guidance_scale = 1.0 + self._num_timesteps = 0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False self.register_modules( vae=vae, @@ -680,8 +685,6 @@ def __call__( self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False device = self._execution_device diff --git a/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video.py b/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video.py index 42ab090f1cba..aa701e07aa05 100644 --- a/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video.py +++ b/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video.py @@ -181,6 +181,11 @@ def __init__( tokenizer_2: CLIPTokenizer, ): super().__init__() + self._guidance_scale = 6.0 + self._num_timesteps = 0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False self.register_modules( vae=vae, @@ -635,8 +640,6 @@ def __call__( self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False device = self._execution_device diff --git a/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video_framepack.py b/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video_framepack.py index 8006514f47ea..c5df83d43fb1 100644 --- a/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video_framepack.py +++ b/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video_framepack.py @@ -283,6 +283,10 @@ def __init__( ): super().__init__() + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video_image2video.py b/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video_image2video.py index aa04e6509730..f7dab781e203 100644 --- a/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video_image2video.py +++ b/src/diffusers/pipelines/hunyuan_video/pipeline_hunyuan_video_image2video.py @@ -259,6 +259,11 @@ def __init__( image_processor: CLIPImageProcessor, ): super().__init__() + self._guidance_scale = 1.0 + self._num_timesteps = 0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False self.register_modules( vae=vae, @@ -826,8 +831,6 @@ def __call__( self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False device = self._execution_device diff --git a/src/diffusers/pipelines/hunyuan_video1_5/pipeline_hunyuan_video1_5.py b/src/diffusers/pipelines/hunyuan_video1_5/pipeline_hunyuan_video1_5.py index 00a703939004..4e7463c3650b 100644 --- a/src/diffusers/pipelines/hunyuan_video1_5/pipeline_hunyuan_video1_5.py +++ b/src/diffusers/pipelines/hunyuan_video1_5/pipeline_hunyuan_video1_5.py @@ -204,6 +204,10 @@ def __init__( ): super().__init__() + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/hunyuan_video1_5/pipeline_hunyuan_video1_5_image2video.py b/src/diffusers/pipelines/hunyuan_video1_5/pipeline_hunyuan_video1_5_image2video.py index 8c555eabba11..923a110aafe9 100644 --- a/src/diffusers/pipelines/hunyuan_video1_5/pipeline_hunyuan_video1_5_image2video.py +++ b/src/diffusers/pipelines/hunyuan_video1_5/pipeline_hunyuan_video1_5_image2video.py @@ -239,6 +239,10 @@ def __init__( ): super().__init__() + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/hunyuandit/pipeline_hunyuandit.py b/src/diffusers/pipelines/hunyuandit/pipeline_hunyuandit.py index 052c7b473915..d81837b11768 100644 --- a/src/diffusers/pipelines/hunyuandit/pipeline_hunyuandit.py +++ b/src/diffusers/pipelines/hunyuandit/pipeline_hunyuandit.py @@ -207,6 +207,10 @@ def __init__( tokenizer_2: Optional[T5Tokenizer] = None, ): super().__init__() + self._guidance_scale = 5.0 + self._guidance_rescale = 0.0 + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -713,7 +717,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._guidance_rescale = guidance_rescale - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/i2vgen_xl/pipeline_i2vgen_xl.py b/src/diffusers/pipelines/i2vgen_xl/pipeline_i2vgen_xl.py index c6cc724a71f0..d3c54c2804fa 100644 --- a/src/diffusers/pipelines/i2vgen_xl/pipeline_i2vgen_xl.py +++ b/src/diffusers/pipelines/i2vgen_xl/pipeline_i2vgen_xl.py @@ -134,6 +134,7 @@ def __init__( scheduler: DDIMScheduler, ): super().__init__() + self._guidance_scale = 9.0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2.py b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2.py index 429253e99898..2ce8de1e0177 100644 --- a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2.py +++ b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2.py @@ -95,6 +95,8 @@ def __init__( movq: VQModel, ): super().__init__() + self._guidance_scale = 4.0 + self._num_timesteps = 0 self.register_modules( unet=unet, diff --git a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_img2img.py b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_img2img.py index 3b2509098fd1..c15315462959 100644 --- a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_img2img.py +++ b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_img2img.py @@ -101,6 +101,8 @@ def __init__( movq: VQModel, ): super().__init__() + self._guidance_scale = 4.0 + self._num_timesteps = 0 self.register_modules( unet=unet, diff --git a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_inpainting.py b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_inpainting.py index a61673293e1f..fd8d6e4ad3f1 100644 --- a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_inpainting.py +++ b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_inpainting.py @@ -266,6 +266,8 @@ def __init__( movq: VQModel, ): super().__init__() + self._guidance_scale = 4.0 + self._num_timesteps = 0 self.register_modules( unet=unet, diff --git a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_prior.py b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_prior.py index bc67847831a5..c5e91b4fc643 100644 --- a/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_prior.py +++ b/src/diffusers/pipelines/kandinsky2_2/pipeline_kandinsky2_2_prior.py @@ -123,6 +123,8 @@ def __init__( image_processor: CLIPImageProcessor, ): super().__init__() + self._guidance_scale = 4.0 + self._num_timesteps = 0 self.register_modules( prior=prior, diff --git a/src/diffusers/pipelines/kandinsky3/pipeline_kandinsky3.py b/src/diffusers/pipelines/kandinsky3/pipeline_kandinsky3.py index 57cc0270442d..391510b5f1dc 100644 --- a/src/diffusers/pipelines/kandinsky3/pipeline_kandinsky3.py +++ b/src/diffusers/pipelines/kandinsky3/pipeline_kandinsky3.py @@ -75,6 +75,8 @@ def __init__( movq: VQModel, ): super().__init__() + self._guidance_scale = 3.0 + self._num_timesteps = 0 self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, unet=unet, scheduler=scheduler, movq=movq diff --git a/src/diffusers/pipelines/kandinsky3/pipeline_kandinsky3_img2img.py b/src/diffusers/pipelines/kandinsky3/pipeline_kandinsky3_img2img.py index 73c268897502..edfff7d48d5c 100644 --- a/src/diffusers/pipelines/kandinsky3/pipeline_kandinsky3_img2img.py +++ b/src/diffusers/pipelines/kandinsky3/pipeline_kandinsky3_img2img.py @@ -72,6 +72,8 @@ def __init__( movq: VQModel, ): super().__init__() + self._guidance_scale = 3.0 + self._num_timesteps = 0 self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, unet=unet, scheduler=scheduler, movq=movq diff --git a/src/diffusers/pipelines/kolors/pipeline_kolors.py b/src/diffusers/pipelines/kolors/pipeline_kolors.py index 3c7442afcaae..6a6d8b6e4be4 100644 --- a/src/diffusers/pipelines/kolors/pipeline_kolors.py +++ b/src/diffusers/pipelines/kolors/pipeline_kolors.py @@ -176,6 +176,11 @@ def __init__( force_zeros_for_empty_prompt: bool = False, ): super().__init__() + self._guidance_scale = 5.0 + self._cross_attention_kwargs = None + self._denoising_end = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -846,7 +851,6 @@ def __call__( self._guidance_scale = guidance_scale self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/kolors/pipeline_kolors_img2img.py b/src/diffusers/pipelines/kolors/pipeline_kolors_img2img.py index 8c3adf33b845..5bc9199780db 100644 --- a/src/diffusers/pipelines/kolors/pipeline_kolors_img2img.py +++ b/src/diffusers/pipelines/kolors/pipeline_kolors_img2img.py @@ -195,6 +195,12 @@ def __init__( force_zeros_for_empty_prompt: bool = False, ): super().__init__() + self._guidance_scale = 5.0 + self._cross_attention_kwargs = None + self._denoising_start = None + self._denoising_end = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -999,7 +1005,6 @@ def __call__( self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end self._denoising_start = denoising_start - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_img2img.py b/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_img2img.py index c28e358c51b6..ec67a5727f36 100644 --- a/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_img2img.py +++ b/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_img2img.py @@ -212,6 +212,10 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 8.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_text2img.py b/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_text2img.py index bc71d7bd171a..a3b0e5dc7da7 100644 --- a/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_text2img.py +++ b/src/diffusers/pipelines/latent_consistency_models/pipeline_latent_consistency_text2img.py @@ -191,6 +191,10 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 8.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 if safety_checker is None and requires_safety_checker: logger.warning( diff --git a/src/diffusers/pipelines/latte/pipeline_latte.py b/src/diffusers/pipelines/latte/pipeline_latte.py index 7fde18e4fbbb..bfb83b8648a2 100644 --- a/src/diffusers/pipelines/latte/pipeline_latte.py +++ b/src/diffusers/pipelines/latte/pipeline_latte.py @@ -185,6 +185,10 @@ def __init__( scheduler: KarrasDiffusionSchedulers, ): super().__init__() + self._guidance_scale = 7.5 + self._num_timesteps = 0 + self._current_timestep = None + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -733,8 +737,6 @@ def __call__( negative_prompt_embeds, ) self._guidance_scale = guidance_scale - self._current_timestep = None - self._interrupt = False # 2. Default height and width to transformer if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/ledits_pp/pipeline_leditspp_stable_diffusion.py b/src/diffusers/pipelines/ledits_pp/pipeline_leditspp_stable_diffusion.py index fbf4dc23d043..9c2bdee37708 100644 --- a/src/diffusers/pipelines/ledits_pp/pipeline_leditspp_stable_diffusion.py +++ b/src/diffusers/pipelines/ledits_pp/pipeline_leditspp_stable_diffusion.py @@ -315,6 +315,9 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._clip_skip = None + self._guidance_rescale = 0.0 + self._cross_attention_kwargs = None if not isinstance(scheduler, DDIMScheduler) and not isinstance(scheduler, DPMSolverMultistepScheduler): scheduler = DPMSolverMultistepScheduler.from_config( diff --git a/src/diffusers/pipelines/ledits_pp/pipeline_leditspp_stable_diffusion_xl.py b/src/diffusers/pipelines/ledits_pp/pipeline_leditspp_stable_diffusion_xl.py index 993957a052fc..09dea7f529d8 100644 --- a/src/diffusers/pipelines/ledits_pp/pipeline_leditspp_stable_diffusion_xl.py +++ b/src/diffusers/pipelines/ledits_pp/pipeline_leditspp_stable_diffusion_xl.py @@ -358,6 +358,11 @@ def __init__( add_watermarker: Optional[bool] = None, ): super().__init__() + self._guidance_scale = 1.0 + self._guidance_rescale = 0.0 + self._cross_attention_kwargs = None + self._denoising_end = None + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/longcat_image/pipeline_longcat_image.py b/src/diffusers/pipelines/longcat_image/pipeline_longcat_image.py index a758d545fa4a..d148f53deb7e 100644 --- a/src/diffusers/pipelines/longcat_image/pipeline_longcat_image.py +++ b/src/diffusers/pipelines/longcat_image/pipeline_longcat_image.py @@ -222,6 +222,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 4.5 + self._joint_attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/longcat_image/pipeline_longcat_image_edit.py b/src/diffusers/pipelines/longcat_image/pipeline_longcat_image_edit.py index e55a2a47f343..0ade54165522 100644 --- a/src/diffusers/pipelines/longcat_image/pipeline_longcat_image_edit.py +++ b/src/diffusers/pipelines/longcat_image/pipeline_longcat_image_edit.py @@ -248,6 +248,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 4.5 + self._joint_attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/ltx/pipeline_ltx.py b/src/diffusers/pipelines/ltx/pipeline_ltx.py index 3c90da1c7051..1c40431fc8c1 100644 --- a/src/diffusers/pipelines/ltx/pipeline_ltx.py +++ b/src/diffusers/pipelines/ltx/pipeline_ltx.py @@ -204,6 +204,12 @@ def __init__( transformer: LTXVideoTransformer3DModel, ): super().__init__() + self._guidance_scale = 3 + self._guidance_rescale = 0.0 + self._num_timesteps = 0 + self._current_timestep = None + self._attention_kwargs = None + self._interrupt = False self.register_modules( vae=vae, @@ -664,8 +670,6 @@ def __call__( self._guidance_scale = guidance_scale self._guidance_rescale = guidance_rescale self._attention_kwargs = attention_kwargs - self._interrupt = False - self._current_timestep = None # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/ltx/pipeline_ltx_condition.py b/src/diffusers/pipelines/ltx/pipeline_ltx_condition.py index 10c9432a7f46..2bd9187ec371 100644 --- a/src/diffusers/pipelines/ltx/pipeline_ltx_condition.py +++ b/src/diffusers/pipelines/ltx/pipeline_ltx_condition.py @@ -286,6 +286,12 @@ def __init__( transformer: LTXVideoTransformer3DModel, ): super().__init__() + self._guidance_scale = 3 + self._guidance_rescale = 0.0 + self._num_timesteps = 0 + self._current_timestep = None + self._attention_kwargs = None + self._interrupt = False self.register_modules( vae=vae, @@ -1007,8 +1013,6 @@ def __call__( self._guidance_scale = guidance_scale self._guidance_rescale = guidance_rescale self._attention_kwargs = attention_kwargs - self._interrupt = False - self._current_timestep = None # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/ltx/pipeline_ltx_image2video.py b/src/diffusers/pipelines/ltx/pipeline_ltx_image2video.py index 3226b045cccb..c99dc1814e03 100644 --- a/src/diffusers/pipelines/ltx/pipeline_ltx_image2video.py +++ b/src/diffusers/pipelines/ltx/pipeline_ltx_image2video.py @@ -223,6 +223,12 @@ def __init__( transformer: LTXVideoTransformer3DModel, ): super().__init__() + self._guidance_scale = 3 + self._guidance_rescale = 0.0 + self._num_timesteps = 0 + self._current_timestep = None + self._attention_kwargs = None + self._interrupt = False self.register_modules( vae=vae, @@ -728,8 +734,6 @@ def __call__( self._guidance_scale = guidance_scale self._guidance_rescale = guidance_rescale self._attention_kwargs = attention_kwargs - self._interrupt = False - self._current_timestep = None # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/ltx2/pipeline_ltx2.py b/src/diffusers/pipelines/ltx2/pipeline_ltx2.py index 9cf847926347..ce6f7b8b70a6 100644 --- a/src/diffusers/pipelines/ltx2/pipeline_ltx2.py +++ b/src/diffusers/pipelines/ltx2/pipeline_ltx2.py @@ -226,6 +226,12 @@ def __init__( vocoder: LTX2Vocoder, ): super().__init__() + self._guidance_scale = 4.0 + self._guidance_rescale = 0.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/ltx2/pipeline_ltx2_image2video.py b/src/diffusers/pipelines/ltx2/pipeline_ltx2_image2video.py index b1711e283191..b47bba42a580 100644 --- a/src/diffusers/pipelines/ltx2/pipeline_ltx2_image2video.py +++ b/src/diffusers/pipelines/ltx2/pipeline_ltx2_image2video.py @@ -229,6 +229,12 @@ def __init__( vocoder: LTX2Vocoder, ): super().__init__() + self._guidance_scale = 4.0 + self._guidance_rescale = 0.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/lucy/pipeline_lucy_edit.py b/src/diffusers/pipelines/lucy/pipeline_lucy_edit.py index 8065a17b7889..ffd2d386474f 100644 --- a/src/diffusers/pipelines/lucy/pipeline_lucy_edit.py +++ b/src/diffusers/pipelines/lucy/pipeline_lucy_edit.py @@ -179,6 +179,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 5.0 + self._joint_attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, @@ -572,7 +577,7 @@ def __call__( if self.config.boundary_ratio is not None and guidance_scale_2 is None: guidance_scale_2 = guidance_scale - self._guidance_scale = guidance_scale + self._guidance_scale = 5.0 self._guidance_scale_2 = guidance_scale_2 self._attention_kwargs = attention_kwargs self._current_timestep = None diff --git a/src/diffusers/pipelines/lumina/pipeline_lumina.py b/src/diffusers/pipelines/lumina/pipeline_lumina.py index f4711cf9d9d8..6337633fbf1a 100644 --- a/src/diffusers/pipelines/lumina/pipeline_lumina.py +++ b/src/diffusers/pipelines/lumina/pipeline_lumina.py @@ -185,6 +185,8 @@ def __init__( tokenizer: Union[GemmaTokenizer, GemmaTokenizerFast], ): super().__init__() + self._guidance_scale = 4.0 + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/lumina2/pipeline_lumina2.py b/src/diffusers/pipelines/lumina2/pipeline_lumina2.py index 8151b29b25fd..09dd5836fa64 100644 --- a/src/diffusers/pipelines/lumina2/pipeline_lumina2.py +++ b/src/diffusers/pipelines/lumina2/pipeline_lumina2.py @@ -167,6 +167,9 @@ def __init__( tokenizer: Union[GemmaTokenizer, GemmaTokenizerFast], ): super().__init__() + self._guidance_scale = 4.0 + self._attention_kwargs = None + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/mochi/pipeline_mochi.py b/src/diffusers/pipelines/mochi/pipeline_mochi.py index 19a36c73f9ed..4e0c48fcb71e 100644 --- a/src/diffusers/pipelines/mochi/pipeline_mochi.py +++ b/src/diffusers/pipelines/mochi/pipeline_mochi.py @@ -173,6 +173,11 @@ def __init__( force_zeros_for_empty_prompt: bool = False, ): super().__init__() + self._guidance_scale = 4.5 + self._num_timesteps = 0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False self.register_modules( vae=vae, @@ -614,8 +619,6 @@ def __call__( self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/omnigen/pipeline_omnigen.py b/src/diffusers/pipelines/omnigen/pipeline_omnigen.py index 96c209813f54..8772d7a4a234 100644 --- a/src/diffusers/pipelines/omnigen/pipeline_omnigen.py +++ b/src/diffusers/pipelines/omnigen/pipeline_omnigen.py @@ -148,6 +148,9 @@ def __init__( tokenizer: LlamaTokenizer, ): super().__init__() + self._guidance_scale = 2.5 + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -432,7 +435,6 @@ def __call__( ) self._guidance_scale = guidance_scale - self._interrupt = False # 2. Define call parameters batch_size = len(prompt) diff --git a/src/diffusers/pipelines/ovis_image/pipeline_ovis_image.py b/src/diffusers/pipelines/ovis_image/pipeline_ovis_image.py index 94d6cee93d7e..610c170c86ba 100644 --- a/src/diffusers/pipelines/ovis_image/pipeline_ovis_image.py +++ b/src/diffusers/pipelines/ovis_image/pipeline_ovis_image.py @@ -162,6 +162,11 @@ def __init__( transformer: OvisImageTransformer2DModel, ): super().__init__() + self._guidance_scale = 5.0 + self._joint_attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd.py b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd.py index 389927aafcbc..518bf7a5433f 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd.py @@ -231,6 +231,10 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 if safety_checker is None and requires_safety_checker: logger.warning( diff --git a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_inpaint.py b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_inpaint.py index 2781af789018..7cb26cd505c5 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_inpaint.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_inpaint.py @@ -205,6 +205,10 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 if safety_checker is None and requires_safety_checker: logger.warning( diff --git a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl.py b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl.py index 8b7df89f039c..1c67a28f82c3 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl.py @@ -271,6 +271,11 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", # ["down.block_2", "up.block_1.attentions_0"], "mid" ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._denoising_end = None + self._num_timesteps = 0 if isinstance(controlnet, (list, tuple)): controlnet = MultiControlNetModel(controlnet) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl_img2img.py b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl_img2img.py index df5b3f5c10a5..e31f1cf8ca74 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl_img2img.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl_img2img.py @@ -261,6 +261,10 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", # ["mid"], ["down.block_1", "up.block_0.attentions_0"] ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 if isinstance(controlnet, (list, tuple)): controlnet = MultiControlNetModel(controlnet) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_hunyuandit.py b/src/diffusers/pipelines/pag/pipeline_pag_hunyuandit.py index 6704924b2512..705756ffea2d 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_hunyuandit.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_hunyuandit.py @@ -212,6 +212,10 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "blocks.1", # "blocks.16.attn1", "blocks.16", "16", 16 ): super().__init__() + self._guidance_scale = 5.0 + self._guidance_rescale = 0.0 + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -732,7 +736,6 @@ def __call__( ) self._guidance_scale = guidance_scale self._guidance_rescale = guidance_rescale - self._interrupt = False self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale diff --git a/src/diffusers/pipelines/pag/pipeline_pag_kolors.py b/src/diffusers/pipelines/pag/pipeline_pag_kolors.py index 5b82d546445b..04912c0c0d0c 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_kolors.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_kolors.py @@ -190,6 +190,11 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", ): super().__init__() + self._guidance_scale = 5.0 + self._cross_attention_kwargs = None + self._denoising_end = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -872,7 +877,6 @@ def __call__( self._guidance_scale = guidance_scale self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end - self._interrupt = False self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sana.py b/src/diffusers/pipelines/pag/pipeline_pag_sana.py index 466996889417..8de2fdd9afb4 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sana.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sana.py @@ -169,6 +169,9 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "transformer_blocks.0", ): super().__init__() + self._guidance_scale = 4.5 + self._num_timesteps = 0 + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -811,7 +814,6 @@ def __call__( self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale self._guidance_scale = guidance_scale - self._interrupt = False # 2. Default height and width to transformer if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd.py b/src/diffusers/pipelines/pag/pipeline_pag_sd.py index 67676fb28798..3b25f8a7ca56 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd.py @@ -215,6 +215,12 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._guidance_rescale = 0.0 + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1: deprecation_message = ( @@ -887,7 +893,6 @@ def __call__( self._guidance_rescale = guidance_rescale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_3.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_3.py index 303a0a2f0b2e..5c8a1cfb28ad 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_3.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_3.py @@ -188,6 +188,11 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "blocks.1", # 1st transformer block ): super().__init__() + self._guidance_scale = 7.0 + self._clip_skip = None + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -835,7 +840,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale # diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_3_img2img.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_3_img2img.py index 2005c865c22b..89fea8902732 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_3_img2img.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_3_img2img.py @@ -204,6 +204,11 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "blocks.1", # 1st transformer block ): super().__init__() + self._guidance_scale = 7.0 + self._clip_skip = None + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -895,7 +900,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py index de13be9c4d22..5f8e1faf0d0c 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_animatediff.py @@ -143,6 +143,10 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid_block.*attn1", # ["mid"], ["down_blocks.1"] ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 if isinstance(unet, UNet2DConditionModel): unet = UNetMotionModel.from_unet2d(unet, motion_adapter) diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_img2img.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_img2img.py index 42b5db0fa762..7a3ea7dc9e99 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_img2img.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_img2img.py @@ -210,6 +210,11 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", # ["mid"], ["down.block_1", "up.block_0.attentions_0"] ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1: deprecation_message = ( @@ -919,7 +924,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_inpaint.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_inpaint.py index cf8c4972762f..849dafc4d824 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_inpaint.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_inpaint.py @@ -242,6 +242,11 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", ): super().__init__() + self._guidance_scale = 7.5 + self._guidance_rescale = 0.0 + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1: deprecation_message = ( @@ -1059,10 +1064,10 @@ def __call__( ) self._guidance_scale = guidance_scale + self._clip_skip = None self._guidance_rescale = guidance_rescale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl.py index 0613ec23f740..913f6c6735f6 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl.py @@ -258,6 +258,13 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", # ["mid"],["down.block_1"],["up.block_0.attentions_0"] ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._guidance_rescale = 0.0 + self._cross_attention_kwargs = None + self._denoising_end = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -1054,7 +1061,6 @@ def __call__( self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end - self._interrupt = False self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_img2img.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_img2img.py index 1081993f46e6..af841e497374 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_img2img.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_img2img.py @@ -281,6 +281,14 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", # ["mid"], ["down.block_1", "up.block_0.attentions_0"] ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._guidance_rescale = 0.0 + self._cross_attention_kwargs = None + self._denoising_end = None + self._denoising_start = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -1226,7 +1234,6 @@ def __call__( self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end self._denoising_start = denoising_start - self._interrupt = False self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale diff --git a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_inpaint.py b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_inpaint.py index f6c4982c1c6c..4b67297db8ad 100644 --- a/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_inpaint.py +++ b/src/diffusers/pipelines/pag/pipeline_pag_sd_xl_inpaint.py @@ -297,6 +297,14 @@ def __init__( pag_applied_layers: Union[str, List[str]] = "mid", # ["mid"], ["down.block_1", "up.block_0.attentions_0"] ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._guidance_rescale = 0.0 + self._cross_attention_kwargs = None + self._denoising_end = None + self._denoising_start = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -1348,7 +1356,6 @@ def __call__( self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end self._denoising_start = denoising_start - self._interrupt = False self._pag_scale = pag_scale self._pag_adaptive_scale = pag_adaptive_scale diff --git a/src/diffusers/pipelines/pia/pipeline_pia.py b/src/diffusers/pipelines/pia/pipeline_pia.py index dfc6e83fbd7c..025f3985c9a6 100644 --- a/src/diffusers/pipelines/pia/pipeline_pia.py +++ b/src/diffusers/pipelines/pia/pipeline_pia.py @@ -193,6 +193,10 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 if isinstance(unet, UNet2DConditionModel): unet = UNetMotionModel.from_unet2d(unet, motion_adapter) diff --git a/src/diffusers/pipelines/prx/pipeline_prx.py b/src/diffusers/pipelines/prx/pipeline_prx.py index 873f25316e6d..85eb0e5613e6 100644 --- a/src/diffusers/pipelines/prx/pipeline_prx.py +++ b/src/diffusers/pipelines/prx/pipeline_prx.py @@ -290,6 +290,7 @@ def __init__( ): super().__init__() + self._guidance_scale = 4.0 if PRXTransformer2DModel is None: raise ImportError( "PRXTransformer2DModel is not available. Please ensure the transformer_prx module is properly installed." diff --git a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage.py b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage.py index bc3ce84e1019..49e7d5be2fa9 100644 --- a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage.py +++ b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage.py @@ -160,6 +160,11 @@ def __init__( transformer: QwenImageTransformer2DModel, ): super().__init__() + self._guidance_scale = None + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_controlnet.py b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_controlnet.py index ce6fc974a56e..3146c47d39eb 100644 --- a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_controlnet.py +++ b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_controlnet.py @@ -221,6 +221,11 @@ def __init__( controlnet: Union[QwenImageControlNetModel, QwenImageMultiControlNetModel], ): super().__init__() + self._guidance_scale = None + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_controlnet_inpaint.py b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_controlnet_inpaint.py index 77d78a5ca7a1..e01dd9e87b21 100644 --- a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_controlnet_inpaint.py +++ b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_controlnet_inpaint.py @@ -194,6 +194,11 @@ def __init__( controlnet: QwenImageControlNetModel, ): super().__init__() + self._guidance_scale = 1.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit.py b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit.py index dd723460a59e..3a00ed17b455 100644 --- a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit.py +++ b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit.py @@ -194,6 +194,11 @@ def __init__( transformer: QwenImageTransformer2DModel, ): super().__init__() + self._guidance_scale = None + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit_inpaint.py b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit_inpaint.py index cf467203a9d2..25e6276b8089 100644 --- a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit_inpaint.py +++ b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit_inpaint.py @@ -196,6 +196,11 @@ def __init__( transformer: QwenImageTransformer2DModel, ): super().__init__() + self._guidance_scale = None + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit_plus.py b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit_plus.py index 257e2d846c7c..97370d5ce2ac 100644 --- a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit_plus.py +++ b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit_plus.py @@ -197,6 +197,11 @@ def __init__( transformer: QwenImageTransformer2DModel, ): super().__init__() + self._guidance_scale = None + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_img2img.py b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_img2img.py index e0b41b8b8799..d6e05d301334 100644 --- a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_img2img.py +++ b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_img2img.py @@ -162,6 +162,11 @@ def __init__( transformer: QwenImageTransformer2DModel, ): super().__init__() + self._guidance_scale = None + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_inpaint.py b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_inpaint.py index 83f02539b1ba..836b44710850 100644 --- a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_inpaint.py +++ b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_inpaint.py @@ -165,6 +165,11 @@ def __init__( transformer: QwenImageTransformer2DModel, ): super().__init__() + self._guidance_scale = None + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_layered.py b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_layered.py index 53d2c169ee63..28f8cbbcf82c 100644 --- a/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_layered.py +++ b/src/diffusers/pipelines/qwenimage/pipeline_qwenimage_layered.py @@ -203,6 +203,11 @@ def __init__( transformer: QwenImageTransformer2DModel, ): super().__init__() + self._guidance_scale = None + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/sana/pipeline_sana.py b/src/diffusers/pipelines/sana/pipeline_sana.py index 33f9de7d20f0..55f0be91bdfd 100644 --- a/src/diffusers/pipelines/sana/pipeline_sana.py +++ b/src/diffusers/pipelines/sana/pipeline_sana.py @@ -208,6 +208,10 @@ def __init__( scheduler: DPMSolverMultistepScheduler, ): super().__init__() + self._guidance_scale = 4.5 + self._attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -888,7 +892,6 @@ def __call__( self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._interrupt = False # 2. Default height and width to transformer if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/sana/pipeline_sana_controlnet.py b/src/diffusers/pipelines/sana/pipeline_sana_controlnet.py index 9d5e17c2ed48..38b7fd305d02 100644 --- a/src/diffusers/pipelines/sana/pipeline_sana_controlnet.py +++ b/src/diffusers/pipelines/sana/pipeline_sana_controlnet.py @@ -216,6 +216,10 @@ def __init__( scheduler: DPMSolverMultistepScheduler, ): super().__init__() + self._guidance_scale = 4.5 + self._attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( tokenizer=tokenizer, @@ -951,7 +955,6 @@ def __call__( self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._interrupt = False # 2. Default height and width to transformer if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/sana/pipeline_sana_sprint.py b/src/diffusers/pipelines/sana/pipeline_sana_sprint.py index 4c6d2247495d..69b4c9147ff4 100644 --- a/src/diffusers/pipelines/sana/pipeline_sana_sprint.py +++ b/src/diffusers/pipelines/sana/pipeline_sana_sprint.py @@ -159,6 +159,10 @@ def __init__( scheduler: DPMSolverMultistepScheduler, ): super().__init__() + self._guidance_scale = 4.5 + self._attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler @@ -760,7 +764,6 @@ def __call__( self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._interrupt = False # 2. Default height and width to transformer if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/sana/pipeline_sana_sprint_img2img.py b/src/diffusers/pipelines/sana/pipeline_sana_sprint_img2img.py index 8899ed84c4e5..b596485fdf13 100644 --- a/src/diffusers/pipelines/sana/pipeline_sana_sprint_img2img.py +++ b/src/diffusers/pipelines/sana/pipeline_sana_sprint_img2img.py @@ -167,6 +167,10 @@ def __init__( ): super().__init__() + self._guidance_scale = 4.5 + self._attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler ) diff --git a/src/diffusers/pipelines/sana_video/pipeline_sana_video.py b/src/diffusers/pipelines/sana_video/pipeline_sana_video.py index a786275e45a9..7bd710cd727c 100644 --- a/src/diffusers/pipelines/sana_video/pipeline_sana_video.py +++ b/src/diffusers/pipelines/sana_video/pipeline_sana_video.py @@ -219,6 +219,10 @@ def __init__( ): super().__init__() + self._guidance_scale = 6.0 + self._attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler ) diff --git a/src/diffusers/pipelines/sana_video/pipeline_sana_video_i2v.py b/src/diffusers/pipelines/sana_video/pipeline_sana_video_i2v.py index e87880b64cee..70d25530f849 100644 --- a/src/diffusers/pipelines/sana_video/pipeline_sana_video_i2v.py +++ b/src/diffusers/pipelines/sana_video/pipeline_sana_video_i2v.py @@ -209,6 +209,10 @@ def __init__( ): super().__init__() + self._guidance_scale = 6.0 + self._attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, vae=vae, transformer=transformer, scheduler=scheduler ) diff --git a/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2.py b/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2.py index 1b1c8ee097c5..8651e2743fc5 100644 --- a/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2.py +++ b/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2.py @@ -139,6 +139,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 6.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing.py b/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing.py index 4bc0d0aaea83..6c38ef7fccf5 100644 --- a/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing.py +++ b/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing.py @@ -161,6 +161,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 6.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing_i2v.py b/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing_i2v.py index 3e2004533258..9df03a6d99ca 100644 --- a/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing_i2v.py +++ b/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing_i2v.py @@ -166,6 +166,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 5.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing_v2v.py b/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing_v2v.py index 234ec531b862..a7ee43c78713 100644 --- a/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing_v2v.py +++ b/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_diffusion_forcing_v2v.py @@ -222,6 +222,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 6.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_i2v.py b/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_i2v.py index d1df7f5f34cb..4109e712d2e1 100644 --- a/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_i2v.py +++ b/src/diffusers/pipelines/skyreels_v2/pipeline_skyreels_v2_i2v.py @@ -166,6 +166,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 5.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade.py b/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade.py index a6a60ad94be6..4b542759b0a3 100644 --- a/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade.py +++ b/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade.py @@ -101,6 +101,8 @@ def __init__( latent_dim_scale: float = 10.67, ) -> None: super().__init__() + self._guidance_scale = 0.0 + self._num_timesteps = 0 self.register_modules( decoder=decoder, tokenizer=tokenizer, diff --git a/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade_prior.py b/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade_prior.py index 29ad8b5429d7..cf830d6deb01 100644 --- a/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade_prior.py +++ b/src/diffusers/pipelines/stable_cascade/pipeline_stable_cascade_prior.py @@ -122,6 +122,8 @@ def __init__( image_encoder: Optional[CLIPVisionModelWithProjection] = None, ) -> None: super().__init__() + self._guidance_scale = 4.0 + self._num_timesteps = 0 self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion.py index d079d2a225cf..7f4b516a69e2 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion.py @@ -210,6 +210,12 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._guidance_rescale = 0.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1: deprecation_message = ( @@ -944,7 +950,6 @@ def __call__( self._guidance_rescale = guidance_rescale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_depth2img.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_depth2img.py index e957c6661f87..f8ba16bc6313 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_depth2img.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_depth2img.py @@ -129,6 +129,10 @@ def __init__( feature_extractor: DPTImageProcessor, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 is_unet_version_less_0_9_0 = ( unet is not None diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py index d0be0ee51317..ada994ff7bc7 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py @@ -238,6 +238,11 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1: deprecation_message = ( @@ -1004,7 +1009,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint.py index 82902cc7dcd0..f1b72163572f 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_inpaint.py @@ -184,6 +184,11 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1: deprecation_message = ( @@ -1093,7 +1098,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_instruct_pix2pix.py b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_instruct_pix2pix.py index 843d25d67c10..271cf15ee0e1 100644 --- a/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_instruct_pix2pix.py +++ b/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_instruct_pix2pix.py @@ -138,6 +138,9 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._image_guidance_scale = 1.5 + self._num_timesteps = 0 if safety_checker is None and requires_safety_checker: logger.warning( diff --git a/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3.py b/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3.py index fcd108aef4c2..78c9e7a5797b 100644 --- a/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3.py +++ b/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3.py @@ -202,6 +202,12 @@ def __init__( feature_extractor: SiglipImageProcessor = None, ): super().__init__() + self._guidance_scale = 7.0 + self._clip_skip = None + self._skip_guidance_layers = None + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -949,7 +955,6 @@ def __call__( self._skip_layer_guidance_scale = skip_layer_guidance_scale self._clip_skip = clip_skip self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_img2img.py b/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_img2img.py index e6ddbb5544c7..8fd94e2c7784 100644 --- a/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_img2img.py +++ b/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_img2img.py @@ -222,6 +222,11 @@ def __init__( feature_extractor: Optional[SiglipImageProcessor] = None, ): super().__init__() + self._guidance_scale = 7.0 + self._clip_skip = None + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -984,7 +989,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_inpaint.py b/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_inpaint.py index b1b30efc7da3..efcd16fb1acf 100644 --- a/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_inpaint.py +++ b/src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_inpaint.py @@ -221,6 +221,11 @@ def __init__( feature_extractor: Optional[SiglipImageProcessor] = None, ): super().__init__() + self._guidance_scale = 7.0 + self._clip_skip = None + self._joint_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -1112,7 +1117,6 @@ def __call__( self._guidance_scale = guidance_scale self._clip_skip = clip_skip self._joint_attention_kwargs = joint_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py b/src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py index f9a8abfcc568..cfdd6c31f387 100644 --- a/src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py +++ b/src/diffusers/pipelines/stable_diffusion_k_diffusion/pipeline_stable_diffusion_xl_k_diffusion.py @@ -156,6 +156,9 @@ def __init__( force_zeros_for_empty_prompt: bool = True, ): super().__init__() + self._guidance_scale = 5.0 + self._clip_skip = None + self._guidance_scale = 1.0 # get correct sigmas from LMS scheduler = LMSDiscreteScheduler.from_config(scheduler.config) diff --git a/src/diffusers/pipelines/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py b/src/diffusers/pipelines/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py index c32121c88c9b..407ca1397080 100644 --- a/src/diffusers/pipelines/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py +++ b/src/diffusers/pipelines/stable_diffusion_ldm3d/pipeline_stable_diffusion_ldm3d.py @@ -239,6 +239,12 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 5.0 + self._guidance_rescale = 0.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if safety_checker is None and requires_safety_checker: logger.warning( @@ -892,7 +898,6 @@ def __call__( self._guidance_rescale = guidance_rescale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py b/src/diffusers/pipelines/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py index 6d93e5feab4d..e3138df3740b 100644 --- a/src/diffusers/pipelines/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py +++ b/src/diffusers/pipelines/stable_diffusion_panorama/pipeline_stable_diffusion_panorama.py @@ -215,6 +215,12 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 + self._guidance_rescale = 0.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._num_timesteps = 0 + self._interrupt = False if safety_checker is None and requires_safety_checker: logger.warning( @@ -953,7 +959,6 @@ def __call__( self._guidance_rescale = guidance_rescale self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl.py b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl.py index 3a63bb4f253a..435729575475 100644 --- a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl.py +++ b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl.py @@ -251,6 +251,13 @@ def __init__( add_watermarker: Optional[bool] = None, ): super().__init__() + self._guidance_scale = 5.0 + self._guidance_rescale = 0.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._denoising_end = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -1055,7 +1062,6 @@ def __call__( self._clip_skip = clip_skip self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_img2img.py b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_img2img.py index d1916b635f92..737b3668f64e 100644 --- a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_img2img.py +++ b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_img2img.py @@ -273,6 +273,14 @@ def __init__( add_watermarker: Optional[bool] = None, ): super().__init__() + self._guidance_scale = 5.0 + self._guidance_rescale = 0.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._denoising_end = None + self._denoising_start = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -1220,7 +1228,6 @@ def __call__( self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end self._denoising_start = denoising_start - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_inpaint.py b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_inpaint.py index fcfddc192b8b..a23a4b686bf6 100644 --- a/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_inpaint.py +++ b/src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_inpaint.py @@ -303,6 +303,14 @@ def __init__( add_watermarker: Optional[bool] = None, ): super().__init__() + self._guidance_scale = 7.5 + self._guidance_rescale = 0.0 + self._clip_skip = None + self._cross_attention_kwargs = None + self._denoising_end = None + self._denoising_start = None + self._num_timesteps = 0 + self._interrupt = False self.register_modules( vae=vae, @@ -1357,7 +1365,6 @@ def __call__( self._cross_attention_kwargs = cross_attention_kwargs self._denoising_end = denoising_end self._denoising_start = denoising_start - self._interrupt = False # 2. Define call parameters if prompt is not None and isinstance(prompt, str): diff --git a/src/diffusers/pipelines/stable_video_diffusion/pipeline_stable_video_diffusion.py b/src/diffusers/pipelines/stable_video_diffusion/pipeline_stable_video_diffusion.py index 633094239dca..1967139df45c 100644 --- a/src/diffusers/pipelines/stable_video_diffusion/pipeline_stable_video_diffusion.py +++ b/src/diffusers/pipelines/stable_video_diffusion/pipeline_stable_video_diffusion.py @@ -177,6 +177,8 @@ def __init__( feature_extractor: CLIPImageProcessor, ): super().__init__() + self._guidance_scale = 1.0 + self._num_timesteps = 0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_adapter.py b/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_adapter.py index 7b6673cf16f7..47b535e084e4 100644 --- a/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_adapter.py +++ b/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_adapter.py @@ -240,6 +240,7 @@ def __init__( requires_safety_checker: bool = True, ): super().__init__() + self._guidance_scale = 7.5 if safety_checker is None and requires_safety_checker: logger.warning( diff --git a/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_xl_adapter.py b/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_xl_adapter.py index bf089bf540ba..926128a73855 100644 --- a/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_xl_adapter.py +++ b/src/diffusers/pipelines/t2i_adapter/pipeline_stable_diffusion_xl_adapter.py @@ -285,6 +285,7 @@ def __init__( image_encoder: CLIPVisionModelWithProjection = None, ): super().__init__() + self._guidance_scale = 5.0 self.register_modules( vae=vae, diff --git a/src/diffusers/pipelines/visualcloze/pipeline_visualcloze_generation.py b/src/diffusers/pipelines/visualcloze/pipeline_visualcloze_generation.py index e12995106bcf..896d6a09e8b3 100644 --- a/src/diffusers/pipelines/visualcloze/pipeline_visualcloze_generation.py +++ b/src/diffusers/pipelines/visualcloze/pipeline_visualcloze_generation.py @@ -167,6 +167,10 @@ def __init__( ): super().__init__() + self._guidance_scale = 30.0 + self._joint_attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/wan/pipeline_wan.py b/src/diffusers/pipelines/wan/pipeline_wan.py index dc2bb471101d..b8d91ef63e2c 100644 --- a/src/diffusers/pipelines/wan/pipeline_wan.py +++ b/src/diffusers/pipelines/wan/pipeline_wan.py @@ -140,6 +140,11 @@ def __init__( expand_timesteps: bool = False, # Wan2.2 ti2v ): super().__init__() + self._guidance_scale = 5.0 + self._num_timesteps = 0 + self._current_timestep = None + self._interrupt = False + self._attention_kwargs = None self.register_modules( vae=vae, @@ -502,8 +507,6 @@ def __call__( self._guidance_scale = guidance_scale self._guidance_scale_2 = guidance_scale_2 self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False device = self._execution_device diff --git a/src/diffusers/pipelines/wan/pipeline_wan_animate.py b/src/diffusers/pipelines/wan/pipeline_wan_animate.py index c7c983b2f7d4..306fc26fb382 100644 --- a/src/diffusers/pipelines/wan/pipeline_wan_animate.py +++ b/src/diffusers/pipelines/wan/pipeline_wan_animate.py @@ -206,6 +206,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 1.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/wan/pipeline_wan_i2v.py b/src/diffusers/pipelines/wan/pipeline_wan_i2v.py index b7fd0b05980f..510ae4c677b5 100644 --- a/src/diffusers/pipelines/wan/pipeline_wan_i2v.py +++ b/src/diffusers/pipelines/wan/pipeline_wan_i2v.py @@ -178,6 +178,11 @@ def __init__( expand_timesteps: bool = False, ): super().__init__() + self._guidance_scale = 5.0 + self._num_timesteps = 0 + self._current_timestep = None + self._interrupt = False + self._attention_kwargs = None self.register_modules( vae=vae, @@ -643,8 +648,6 @@ def __call__( self._guidance_scale = guidance_scale self._guidance_scale_2 = guidance_scale_2 self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False device = self._execution_device diff --git a/src/diffusers/pipelines/wan/pipeline_wan_vace.py b/src/diffusers/pipelines/wan/pipeline_wan_vace.py index 351ae2e70563..3c0986037eb3 100644 --- a/src/diffusers/pipelines/wan/pipeline_wan_vace.py +++ b/src/diffusers/pipelines/wan/pipeline_wan_vace.py @@ -187,6 +187,11 @@ def __init__( ): super().__init__() + self._guidance_scale = 5.0 + self._attention_kwargs = None + self._current_timestep = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/wan/pipeline_wan_video2video.py b/src/diffusers/pipelines/wan/pipeline_wan_video2video.py index 5475b6e8b479..28fb9d923d96 100644 --- a/src/diffusers/pipelines/wan/pipeline_wan_video2video.py +++ b/src/diffusers/pipelines/wan/pipeline_wan_video2video.py @@ -205,6 +205,11 @@ def __init__( scheduler: FlowMatchEulerDiscreteScheduler, ): super().__init__() + self._guidance_scale = 5.0 + self._num_timesteps = 0 + self._current_timestep = None + self._interrupt = False + self._attention_kwargs = None self.register_modules( vae=vae, @@ -591,8 +596,6 @@ def __call__( self._guidance_scale = guidance_scale self._attention_kwargs = attention_kwargs - self._current_timestep = None - self._interrupt = False device = self._execution_device diff --git a/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen.py b/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen.py index bbdb60471fd1..2a519213d09c 100644 --- a/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen.py +++ b/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen.py @@ -98,6 +98,8 @@ def __init__( latent_dim_scale: float = 10.67, ) -> None: super().__init__() + self._guidance_scale = 0.0 + self._num_timesteps = 0 self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen_prior.py b/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen_prior.py index e138b6e805c8..9f5cc615504c 100644 --- a/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen_prior.py +++ b/src/diffusers/pipelines/wuerstchen/pipeline_wuerstchen_prior.py @@ -116,6 +116,8 @@ def __init__( resolution_multiple: float = 42.67, ) -> None: super().__init__() + self._guidance_scale = 8.0 + self._num_timesteps = 0 self.register_modules( tokenizer=tokenizer, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/z_image/pipeline_z_image.py b/src/diffusers/pipelines/z_image/pipeline_z_image.py index 82bdd7d361b7..a54d7e46d39b 100644 --- a/src/diffusers/pipelines/z_image/pipeline_z_image.py +++ b/src/diffusers/pipelines/z_image/pipeline_z_image.py @@ -149,6 +149,10 @@ def __init__( ): super().__init__() + self._guidance_scale = 5.0 + self._joint_attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/z_image/pipeline_z_image_controlnet.py b/src/diffusers/pipelines/z_image/pipeline_z_image_controlnet.py index 08fc4da0e7ba..55c9d545db82 100644 --- a/src/diffusers/pipelines/z_image/pipeline_z_image_controlnet.py +++ b/src/diffusers/pipelines/z_image/pipeline_z_image_controlnet.py @@ -200,6 +200,10 @@ def __init__( controlnet: ZImageControlNetModel, ): super().__init__() + self._guidance_scale = 5.0 + self._joint_attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 controlnet = ZImageControlNetModel.from_transformer(controlnet, transformer) self.register_modules( diff --git a/src/diffusers/pipelines/z_image/pipeline_z_image_controlnet_inpaint.py b/src/diffusers/pipelines/z_image/pipeline_z_image_controlnet_inpaint.py index 3b0f8dc288d3..308021414998 100644 --- a/src/diffusers/pipelines/z_image/pipeline_z_image_controlnet_inpaint.py +++ b/src/diffusers/pipelines/z_image/pipeline_z_image_controlnet_inpaint.py @@ -200,6 +200,10 @@ def __init__( controlnet: ZImageControlNetModel, ): super().__init__() + self._guidance_scale = 5.0 + self._joint_attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 if transformer.in_channels == controlnet.config.control_in_dim: raise ValueError( "ZImageControlNetInpaintPipeline is not compatible with `alibaba-pai/Z-Image-Turbo-Fun-Controlnet-Union`, use `alibaba-pai/Z-Image-Turbo-Fun-Controlnet-Union-2.0`." diff --git a/src/diffusers/pipelines/z_image/pipeline_z_image_img2img.py b/src/diffusers/pipelines/z_image/pipeline_z_image_img2img.py index 2b3e80a2082b..98d07009b291 100644 --- a/src/diffusers/pipelines/z_image/pipeline_z_image_img2img.py +++ b/src/diffusers/pipelines/z_image/pipeline_z_image_img2img.py @@ -177,6 +177,10 @@ def __init__( ): super().__init__() + self._guidance_scale = 5.0 + self._joint_attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder, diff --git a/src/diffusers/pipelines/z_image/pipeline_z_image_omni.py b/src/diffusers/pipelines/z_image/pipeline_z_image_omni.py index 26848bea0a9e..cbdfe4b75b25 100644 --- a/src/diffusers/pipelines/z_image/pipeline_z_image_omni.py +++ b/src/diffusers/pipelines/z_image/pipeline_z_image_omni.py @@ -152,6 +152,10 @@ def __init__( ): super().__init__() + self._guidance_scale = 5.0 + self._joint_attention_kwargs = None + self._interrupt = False + self._num_timesteps = 0 self.register_modules( vae=vae, text_encoder=text_encoder,