Skip to content

Commit 195bddd

Browse files
committed
Add missing 'Copied from' comments and remove deprecated vae tiling and vae slicing functions
1 parent c75c907 commit 195bddd

File tree

1 file changed

+6
-53
lines changed

1 file changed

+6
-53
lines changed

src/diffusers/pipelines/qwenimage/pipeline_qwenimage_edit_controlnet.py

Lines changed: 6 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ def retrieve_latents(
173173
raise AttributeError("Could not access latents of provided encoder_output")
174174

175175

176+
# Copied from diffusers.pipelines.qwenimage.pipeline_qwenimage_edit.calculate_dimensions
176177
def calculate_dimensions(target_area, ratio):
177178
width = math.sqrt(target_area * ratio)
178179
height = width / ratio
@@ -247,6 +248,7 @@ def _extract_masked_hidden(self, hidden_states: torch.Tensor, mask: torch.Tensor
247248

248249
return split_result
249250

251+
# Copied from diffusers.pipelines.qwenimage.pipeline_qwenimage_edit.QwenImageEditPipeline._get_qwen_prompt_embeds
250252
def _get_qwen_prompt_embeds(
251253
self,
252254
prompt: Union[str, List[str]] = None,
@@ -294,6 +296,7 @@ def _get_qwen_prompt_embeds(
294296

295297
return prompt_embeds, encoder_attention_mask
296298

299+
# Copied from diffusers.pipelines.qwenimage.pipeline_qwenimage_edit.QwenImageEditPipeline.encode_prompt
297300
def encode_prompt(
298301
self,
299302
prompt: Union[str, List[str]],
@@ -335,6 +338,7 @@ def encode_prompt(
335338

336339
return prompt_embeds, prompt_embeds_mask
337340

341+
# Copied from diffusers.pipelines.qwenimage.pipeline_qwenimage_edit.QwenImageEditPipeline.check_inputs
338342
def check_inputs(
339343
self,
340344
prompt,
@@ -416,6 +420,7 @@ def _unpack_latents(latents, height, width, vae_scale_factor):
416420

417421
return latents
418422

423+
# Copied from diffusers.pipelines.qwenimage.pipeline_qwenimage_edit.QwenImageEditPipeline._encode_vae_image
419424
def _encode_vae_image(self, image: torch.Tensor, generator: torch.Generator):
420425
if isinstance(generator, list):
421426
image_latents = [
@@ -439,59 +444,7 @@ def _encode_vae_image(self, image: torch.Tensor, generator: torch.Generator):
439444

440445
return image_latents
441446

442-
def enable_vae_slicing(self):
443-
r"""
444-
Enable sliced VAE decoding. When this option is enabled, the VAE will split the input tensor in slices to
445-
compute decoding in several steps. This is useful to save some memory and allow larger batch sizes.
446-
"""
447-
depr_message = f"Calling `enable_vae_slicing()` on a `{self.__class__.__name__}` is deprecated and this method will be removed in a future version. Please use `pipe.vae.enable_slicing()`."
448-
deprecate(
449-
"enable_vae_slicing",
450-
"0.40.0",
451-
depr_message,
452-
)
453-
self.vae.enable_slicing()
454-
455-
def disable_vae_slicing(self):
456-
r"""
457-
Disable sliced VAE decoding. If `enable_vae_slicing` was previously enabled, this method will go back to
458-
computing decoding in one step.
459-
"""
460-
depr_message = f"Calling `disable_vae_slicing()` on a `{self.__class__.__name__}` is deprecated and this method will be removed in a future version. Please use `pipe.vae.disable_slicing()`."
461-
deprecate(
462-
"disable_vae_slicing",
463-
"0.40.0",
464-
depr_message,
465-
)
466-
self.vae.disable_slicing()
467-
468-
def enable_vae_tiling(self):
469-
r"""
470-
Enable tiled VAE decoding. When this option is enabled, the VAE will split the input tensor into tiles to
471-
compute decoding and encoding in several steps. This is useful for saving a large amount of memory and to allow
472-
processing larger images.
473-
"""
474-
depr_message = f"Calling `enable_vae_tiling()` on a `{self.__class__.__name__}` is deprecated and this method will be removed in a future version. Please use `pipe.vae.enable_tiling()`."
475-
deprecate(
476-
"enable_vae_tiling",
477-
"0.40.0",
478-
depr_message,
479-
)
480-
self.vae.enable_tiling()
481-
482-
def disable_vae_tiling(self):
483-
r"""
484-
Disable tiled VAE decoding. If `enable_vae_tiling` was previously enabled, this method will go back to
485-
computing decoding in one step.
486-
"""
487-
depr_message = f"Calling `disable_vae_tiling()` on a `{self.__class__.__name__}` is deprecated and this method will be removed in a future version. Please use `pipe.vae.disable_tiling()`."
488-
deprecate(
489-
"disable_vae_tiling",
490-
"0.40.0",
491-
depr_message,
492-
)
493-
self.vae.disable_tiling()
494-
447+
# Copied from diffusers.pipelines.qwenimage.pipeline_qwenimage_edit.QwenImageEditPipeline.prepare_latents
495448
def prepare_latents(
496449
self,
497450
image,

0 commit comments

Comments
 (0)