Skip to content

Commit fe78a7b

Browse files
authored
Fix ftfy import for PRX Pipeline (#13154)
* Guard ftfy import with is_ftfy_available * Remove xfail for PRX pipeline tests as they appear to work on transformers>4.57.1 * make style and make quality
1 parent 53e1d0e commit fe78a7b

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

src/diffusers/pipelines/prx/pipeline_prx.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import urllib.parse as ul
1919
from typing import Callable
2020

21-
import ftfy
2221
import torch
2322
from transformers import (
2423
AutoTokenizer,
@@ -34,13 +33,13 @@
3433
from diffusers.pipelines.pipeline_utils import DiffusionPipeline
3534
from diffusers.pipelines.prx.pipeline_output import PRXPipelineOutput
3635
from diffusers.schedulers import FlowMatchEulerDiscreteScheduler
37-
from diffusers.utils import (
38-
logging,
39-
replace_example_docstring,
40-
)
36+
from diffusers.utils import is_ftfy_available, logging, replace_example_docstring
4137
from diffusers.utils.torch_utils import randn_tensor
4238

4339

40+
if is_ftfy_available():
41+
import ftfy
42+
4443
DEFAULT_RESOLUTION = 512
4544

4645
ASPECT_RATIO_256_BIN = {

tests/pipelines/prx/test_pipeline_prx.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import unittest
22

33
import numpy as np
4-
import pytest
54
import torch
65
from transformers import AutoTokenizer
76
from transformers.models.t5gemma.configuration_t5gemma import T5GemmaConfig, T5GemmaModuleConfig
@@ -11,17 +10,11 @@
1110
from diffusers.models.transformers.transformer_prx import PRXTransformer2DModel
1211
from diffusers.pipelines.prx.pipeline_prx import PRXPipeline
1312
from diffusers.schedulers import FlowMatchEulerDiscreteScheduler
14-
from diffusers.utils import is_transformers_version
1513

1614
from ..pipeline_params import TEXT_TO_IMAGE_PARAMS
1715
from ..test_pipelines_common import PipelineTesterMixin
1816

1917

20-
@pytest.mark.xfail(
21-
condition=is_transformers_version(">", "4.57.1"),
22-
reason="See https://github.com/huggingface/diffusers/pull/12456#issuecomment-3424228544",
23-
strict=False,
24-
)
2518
class PRXPipelineFastTests(PipelineTesterMixin, unittest.TestCase):
2619
pipeline_class = PRXPipeline
2720
params = TEXT_TO_IMAGE_PARAMS - {"cross_attention_kwargs"}

0 commit comments

Comments
 (0)