mirror of
https://github.com/huggingface/diffusers.git
synced 2025-12-21 20:04:37 +08:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0f252be0ed | ||
|
|
e3d4a6b070 | ||
|
|
ad00c565b7 |
2
setup.py
2
setup.py
@@ -269,7 +269,7 @@ version_range_max = max(sys.version_info[1], 10) + 1
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="diffusers",
|
name="diffusers",
|
||||||
version="0.35.0", # expected format is one of x.y.z.dev0, or x.y.z.rc1 or x.y.z (no to dashes, yes to dots)
|
version="0.35.1", # expected format is one of x.y.z.dev0, or x.y.z.rc1 or x.y.z (no to dashes, yes to dots)
|
||||||
description="State-of-the-art diffusion in PyTorch and JAX.",
|
description="State-of-the-art diffusion in PyTorch and JAX.",
|
||||||
long_description=open("README.md", "r", encoding="utf-8").read(),
|
long_description=open("README.md", "r", encoding="utf-8").read(),
|
||||||
long_description_content_type="text/markdown",
|
long_description_content_type="text/markdown",
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
__version__ = "0.35.0"
|
__version__ = "0.35.1"
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
|||||||
@@ -62,25 +62,6 @@ EXAMPLE_DOC_STRING = """
|
|||||||
>>> image.save("qwenimage_edit.png")
|
>>> image.save("qwenimage_edit.png")
|
||||||
```
|
```
|
||||||
"""
|
"""
|
||||||
PREFERRED_QWENIMAGE_RESOLUTIONS = [
|
|
||||||
(672, 1568),
|
|
||||||
(688, 1504),
|
|
||||||
(720, 1456),
|
|
||||||
(752, 1392),
|
|
||||||
(800, 1328),
|
|
||||||
(832, 1248),
|
|
||||||
(880, 1184),
|
|
||||||
(944, 1104),
|
|
||||||
(1024, 1024),
|
|
||||||
(1104, 944),
|
|
||||||
(1184, 880),
|
|
||||||
(1248, 832),
|
|
||||||
(1328, 800),
|
|
||||||
(1392, 752),
|
|
||||||
(1456, 720),
|
|
||||||
(1504, 688),
|
|
||||||
(1568, 672),
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
# Copied from diffusers.pipelines.qwenimage.pipeline_qwenimage.calculate_shift
|
# Copied from diffusers.pipelines.qwenimage.pipeline_qwenimage.calculate_shift
|
||||||
@@ -565,7 +546,6 @@ class QwenImageEditPipeline(DiffusionPipeline, QwenImageLoraLoaderMixin):
|
|||||||
callback_on_step_end: Optional[Callable[[int, int, Dict], None]] = None,
|
callback_on_step_end: Optional[Callable[[int, int, Dict], None]] = None,
|
||||||
callback_on_step_end_tensor_inputs: List[str] = ["latents"],
|
callback_on_step_end_tensor_inputs: List[str] = ["latents"],
|
||||||
max_sequence_length: int = 512,
|
max_sequence_length: int = 512,
|
||||||
_auto_resize: bool = True,
|
|
||||||
):
|
):
|
||||||
r"""
|
r"""
|
||||||
Function invoked when calling the pipeline for generation.
|
Function invoked when calling the pipeline for generation.
|
||||||
@@ -646,8 +626,7 @@ class QwenImageEditPipeline(DiffusionPipeline, QwenImageLoraLoaderMixin):
|
|||||||
returning a tuple, the first element is a list with the generated images.
|
returning a tuple, the first element is a list with the generated images.
|
||||||
"""
|
"""
|
||||||
image_size = image[0].size if isinstance(image, list) else image.size
|
image_size = image[0].size if isinstance(image, list) else image.size
|
||||||
width, height = image_size
|
calculated_width, calculated_height, _ = calculate_dimensions(1024 * 1024, image_size[0] / image_size[1])
|
||||||
calculated_width, calculated_height, _ = calculate_dimensions(1024 * 1024, width / height)
|
|
||||||
height = height or calculated_height
|
height = height or calculated_height
|
||||||
width = width or calculated_width
|
width = width or calculated_width
|
||||||
|
|
||||||
@@ -685,18 +664,9 @@ class QwenImageEditPipeline(DiffusionPipeline, QwenImageLoraLoaderMixin):
|
|||||||
device = self._execution_device
|
device = self._execution_device
|
||||||
# 3. Preprocess image
|
# 3. Preprocess image
|
||||||
if image is not None and not (isinstance(image, torch.Tensor) and image.size(1) == self.latent_channels):
|
if image is not None and not (isinstance(image, torch.Tensor) and image.size(1) == self.latent_channels):
|
||||||
img = image[0] if isinstance(image, list) else image
|
image = self.image_processor.resize(image, calculated_height, calculated_width)
|
||||||
image_height, image_width = self.image_processor.get_default_height_width(img)
|
|
||||||
aspect_ratio = image_width / image_height
|
|
||||||
if _auto_resize:
|
|
||||||
_, image_width, image_height = min(
|
|
||||||
(abs(aspect_ratio - w / h), w, h) for w, h in PREFERRED_QWENIMAGE_RESOLUTIONS
|
|
||||||
)
|
|
||||||
image_width = image_width // multiple_of * multiple_of
|
|
||||||
image_height = image_height // multiple_of * multiple_of
|
|
||||||
image = self.image_processor.resize(image, image_height, image_width)
|
|
||||||
prompt_image = image
|
prompt_image = image
|
||||||
image = self.image_processor.preprocess(image, image_height, image_width)
|
image = self.image_processor.preprocess(image, calculated_height, calculated_width)
|
||||||
image = image.unsqueeze(2)
|
image = image.unsqueeze(2)
|
||||||
|
|
||||||
has_neg_prompt = negative_prompt is not None or (
|
has_neg_prompt = negative_prompt is not None or (
|
||||||
@@ -713,9 +683,6 @@ class QwenImageEditPipeline(DiffusionPipeline, QwenImageLoraLoaderMixin):
|
|||||||
max_sequence_length=max_sequence_length,
|
max_sequence_length=max_sequence_length,
|
||||||
)
|
)
|
||||||
if do_true_cfg:
|
if do_true_cfg:
|
||||||
# negative image is the same size as the original image, but all pixels are white
|
|
||||||
# negative_image = Image.new("RGB", (image.width, image.height), (255, 255, 255))
|
|
||||||
|
|
||||||
negative_prompt_embeds, negative_prompt_embeds_mask = self.encode_prompt(
|
negative_prompt_embeds, negative_prompt_embeds_mask = self.encode_prompt(
|
||||||
image=prompt_image,
|
image=prompt_image,
|
||||||
prompt=negative_prompt,
|
prompt=negative_prompt,
|
||||||
@@ -742,7 +709,7 @@ class QwenImageEditPipeline(DiffusionPipeline, QwenImageLoraLoaderMixin):
|
|||||||
img_shapes = [
|
img_shapes = [
|
||||||
[
|
[
|
||||||
(1, height // self.vae_scale_factor // 2, width // self.vae_scale_factor // 2),
|
(1, height // self.vae_scale_factor // 2, width // self.vae_scale_factor // 2),
|
||||||
(1, image_height // self.vae_scale_factor // 2, image_width // self.vae_scale_factor // 2),
|
(1, calculated_height // self.vae_scale_factor // 2, calculated_width // self.vae_scale_factor // 2),
|
||||||
]
|
]
|
||||||
] * batch_size
|
] * batch_size
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user