Skip to content

Commit ecd6ad0

Browse files
authored
Merge branch 'main' into qwenimage-edit-plus-followup
2 parents c979fe4 + 843355f commit ecd6ad0

File tree

4 files changed

+26
-0
lines changed

4 files changed

+26
-0
lines changed

tests/pipelines/kandinsky/test_kandinsky.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
import unittest
1919

2020
import numpy as np
21+
import pytest
2122
import torch
2223
from transformers import XLMRobertaTokenizerFast
2324

2425
from diffusers import DDIMScheduler, KandinskyPipeline, KandinskyPriorPipeline, UNet2DConditionModel, VQModel
2526
from diffusers.pipelines.kandinsky.text_encoder import MCLIPConfig, MultilingualCLIP
27+
from diffusers.utils import is_transformers_version
2628

2729
from ...testing_utils import (
2830
backend_empty_cache,
@@ -215,6 +217,9 @@ def get_dummy_inputs(self, device, seed=0):
215217
dummy = Dummies()
216218
return dummy.get_dummy_inputs(device=device, seed=seed)
217219

220+
@pytest.mark.xfail(
221+
condition=is_transformers_version(">=", "4.56.2"), reason="Latest transformers changes the slices", strict=True
222+
)
218223
def test_kandinsky(self):
219224
device = "cpu"
220225

tests/pipelines/kandinsky/test_kandinsky_combined.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
import unittest
1717

1818
import numpy as np
19+
import pytest
1920

2021
from diffusers import KandinskyCombinedPipeline, KandinskyImg2ImgCombinedPipeline, KandinskyInpaintCombinedPipeline
22+
from diffusers.utils import is_transformers_version
2123

2224
from ...testing_utils import enable_full_determinism, require_torch_accelerator, torch_device
2325
from ..test_pipelines_common import PipelineTesterMixin
@@ -73,6 +75,9 @@ def get_dummy_inputs(self, device, seed=0):
7375
)
7476
return inputs
7577

78+
@pytest.mark.xfail(
79+
condition=is_transformers_version(">=", "4.56.2"), reason="Latest transformers changes the slices", strict=True
80+
)
7681
def test_kandinsky(self):
7782
device = "cpu"
7883

@@ -181,6 +186,9 @@ def get_dummy_inputs(self, device, seed=0):
181186
inputs.pop("negative_image_embeds")
182187
return inputs
183188

189+
@pytest.mark.xfail(
190+
condition=is_transformers_version(">=", "4.56.2"), reason="Latest transformers changes the slices", strict=True
191+
)
184192
def test_kandinsky(self):
185193
device = "cpu"
186194

@@ -292,6 +300,9 @@ def get_dummy_inputs(self, device, seed=0):
292300
inputs.pop("negative_image_embeds")
293301
return inputs
294302

303+
@pytest.mark.xfail(
304+
condition=is_transformers_version(">=", "4.56.2"), reason="Latest transformers changes the slices", strict=True
305+
)
295306
def test_kandinsky(self):
296307
device = "cpu"
297308

tests/pipelines/kandinsky/test_kandinsky_img2img.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import unittest
1919

2020
import numpy as np
21+
import pytest
2122
import torch
2223
from PIL import Image
2324
from transformers import XLMRobertaTokenizerFast
@@ -31,6 +32,7 @@
3132
VQModel,
3233
)
3334
from diffusers.pipelines.kandinsky.text_encoder import MCLIPConfig, MultilingualCLIP
35+
from diffusers.utils import is_transformers_version
3436

3537
from ...testing_utils import (
3638
backend_empty_cache,
@@ -237,6 +239,9 @@ def get_dummy_inputs(self, device, seed=0):
237239
dummies = Dummies()
238240
return dummies.get_dummy_inputs(device=device, seed=seed)
239241

242+
@pytest.mark.xfail(
243+
condition=is_transformers_version(">=", "4.56.2"), reason="Latest transformers changes the slices", strict=True
244+
)
240245
def test_kandinsky_img2img(self):
241246
device = "cpu"
242247

tests/pipelines/kandinsky/test_kandinsky_inpaint.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
import unittest
1919

2020
import numpy as np
21+
import pytest
2122
import torch
2223
from PIL import Image
2324
from transformers import XLMRobertaTokenizerFast
2425

2526
from diffusers import DDIMScheduler, KandinskyInpaintPipeline, KandinskyPriorPipeline, UNet2DConditionModel, VQModel
2627
from diffusers.pipelines.kandinsky.text_encoder import MCLIPConfig, MultilingualCLIP
28+
from diffusers.utils import is_transformers_version
2729

2830
from ...testing_utils import (
2931
backend_empty_cache,
@@ -231,6 +233,9 @@ def get_dummy_inputs(self, device, seed=0):
231233
dummies = Dummies()
232234
return dummies.get_dummy_inputs(device=device, seed=seed)
233235

236+
@pytest.mark.xfail(
237+
condition=is_transformers_version(">=", "4.56.2"), reason="Latest transformers changes the slices", strict=True
238+
)
234239
def test_kandinsky_inpaint(self):
235240
device = "cpu"
236241

0 commit comments

Comments
 (0)