Skip to content

Commit 75e6238

Browse files
committed
revert changes in pipelines.stable_diffusion_xl folder, can seperate PR later
1 parent a33206d commit 75e6238

6 files changed

Lines changed: 36 additions & 30 deletions

src/diffusers/pipelines/controlnet/pipeline_controlnet_sd_xl_img2img.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -912,6 +912,12 @@ def prepare_latents(
912912
f"`image` has to be of type `torch.Tensor`, `PIL.Image.Image` or list but is {type(image)}"
913913
)
914914

915+
latents_mean = latents_std = None
916+
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
917+
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
918+
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
919+
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
920+
915921
# Offload text encoder if `enable_model_cpu_offload` was enabled
916922
if hasattr(self, "final_offload_hook") and self.final_offload_hook is not None:
917923
self.text_encoder_2.to("cpu")
@@ -925,11 +931,6 @@ def prepare_latents(
925931
init_latents = image
926932

927933
else:
928-
latents_mean = latents_std = None
929-
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
930-
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
931-
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
932-
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
933934
# make sure the VAE is in float32 mode, as it overflows in float16
934935
if self.vae.config.force_upcast:
935936
image = image.float()

src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,12 @@ def prepare_latents(
867867
f"`image` has to be of type `torch.Tensor`, `PIL.Image.Image` or list but is {type(image)}"
868868
)
869869

870+
latents_mean = latents_std = None
871+
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
872+
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
873+
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
874+
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
875+
870876
# Offload text encoder if `enable_model_cpu_offload` was enabled
871877
if hasattr(self, "final_offload_hook") and self.final_offload_hook is not None:
872878
self.text_encoder_2.to("cpu")
@@ -880,11 +886,6 @@ def prepare_latents(
880886
init_latents = image
881887

882888
else:
883-
latents_mean = latents_std = None
884-
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
885-
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
886-
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
887-
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
888889
# make sure the VAE is in float32 mode, as it overflows in float16
889890
if self.vae.config.force_upcast:
890891
image = image.float()

src/diffusers/pipelines/kolors/pipeline_kolors_img2img.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,12 @@ def prepare_latents(
609609
f"`image` has to be of type `torch.Tensor`, `PIL.Image.Image` or list but is {type(image)}"
610610
)
611611

612+
latents_mean = latents_std = None
613+
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
614+
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
615+
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
616+
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
617+
612618
# Offload text encoder if `enable_model_cpu_offload` was enabled
613619
if hasattr(self, "final_offload_hook") and self.final_offload_hook is not None:
614620
self.text_encoder_2.to("cpu")
@@ -622,11 +628,6 @@ def prepare_latents(
622628
init_latents = image
623629

624630
else:
625-
latents_mean = latents_std = None
626-
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
627-
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
628-
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
629-
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
630631
# make sure the VAE is in float32 mode, as it overflows in float16
631632
if self.vae.config.force_upcast:
632633
image = image.float()

src/diffusers/pipelines/pag/pipeline_pag_controlnet_sd_xl_img2img.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,12 @@ def prepare_latents(
917917
f"`image` has to be of type `torch.Tensor`, `PIL.Image.Image` or list but is {type(image)}"
918918
)
919919

920+
latents_mean = latents_std = None
921+
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
922+
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
923+
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
924+
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
925+
920926
# Offload text encoder if `enable_model_cpu_offload` was enabled
921927
if hasattr(self, "final_offload_hook") and self.final_offload_hook is not None:
922928
self.text_encoder_2.to("cpu")
@@ -930,11 +936,6 @@ def prepare_latents(
930936
init_latents = image
931937

932938
else:
933-
latents_mean = latents_std = None
934-
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
935-
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
936-
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
937-
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
938939
# make sure the VAE is in float32 mode, as it overflows in float16
939940
if self.vae.config.force_upcast:
940941
image = image.float()

src/diffusers/pipelines/pag/pipeline_pag_sd_xl_img2img.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,12 @@ def prepare_latents(
707707
f"`image` has to be of type `torch.Tensor`, `PIL.Image.Image` or list but is {type(image)}"
708708
)
709709

710+
latents_mean = latents_std = None
711+
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
712+
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
713+
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
714+
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
715+
710716
# Offload text encoder if `enable_model_cpu_offload` was enabled
711717
if hasattr(self, "final_offload_hook") and self.final_offload_hook is not None:
712718
self.text_encoder_2.to("cpu")
@@ -720,11 +726,6 @@ def prepare_latents(
720726
init_latents = image
721727

722728
else:
723-
latents_mean = latents_std = None
724-
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
725-
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
726-
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
727-
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
728729
# make sure the VAE is in float32 mode, as it overflows in float16
729730
if self.vae.config.force_upcast:
730731
image = image.float()

src/diffusers/pipelines/stable_diffusion_xl/pipeline_stable_diffusion_xl_img2img.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,12 @@ def prepare_latents(
695695
f"`image` has to be of type `torch.Tensor`, `PIL.Image.Image` or list but is {type(image)}"
696696
)
697697

698+
latents_mean = latents_std = None
699+
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
700+
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
701+
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
702+
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
703+
698704
# Offload text encoder if `enable_model_cpu_offload` was enabled
699705
if hasattr(self, "final_offload_hook") and self.final_offload_hook is not None:
700706
self.text_encoder_2.to("cpu")
@@ -708,11 +714,6 @@ def prepare_latents(
708714
init_latents = image
709715

710716
else:
711-
latents_mean = latents_std = None
712-
if hasattr(self.vae.config, "latents_mean") and self.vae.config.latents_mean is not None:
713-
latents_mean = torch.tensor(self.vae.config.latents_mean).view(1, 4, 1, 1)
714-
if hasattr(self.vae.config, "latents_std") and self.vae.config.latents_std is not None:
715-
latents_std = torch.tensor(self.vae.config.latents_std).view(1, 4, 1, 1)
716717
# make sure the VAE is in float32 mode, as it overflows in float16
717718
if self.vae.config.force_upcast:
718719
image = image.float()

0 commit comments

Comments
 (0)