Skip to content

Commit 6744cac

Browse files
committed
fix tests
1 parent 08d6b15 commit 6744cac

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

tests/pipelines/controlnet/test_controlnet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def test_controlnet_lcm_custom_timesteps(self):
278278

279279

280280
class StableDiffusionMultiControlNetPipelineFastTests(
281-
PipelineTesterMixin, PipelineKarrasSchedulerTesterMixin, unittest.TestCase
281+
IPAdapterTesterMixin, PipelineTesterMixin, PipelineKarrasSchedulerTesterMixin, unittest.TestCase
282282
):
283283
pipeline_class = StableDiffusionControlNetPipeline
284284
params = TEXT_TO_IMAGE_PARAMS
@@ -495,7 +495,7 @@ def test_inference_multiple_prompt_input(self):
495495

496496

497497
class StableDiffusionMultiControlNetOneModelPipelineFastTests(
498-
PipelineTesterMixin, PipelineKarrasSchedulerTesterMixin, unittest.TestCase
498+
IPAdapterTesterMixin, PipelineTesterMixin, PipelineKarrasSchedulerTesterMixin, unittest.TestCase
499499
):
500500
pipeline_class = StableDiffusionControlNetPipeline
501501
params = TEXT_TO_IMAGE_PARAMS

tests/pipelines/controlnet/test_controlnet_img2img.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def test_inference_batch_single_identical(self):
186186

187187

188188
class StableDiffusionMultiControlNetPipelineFastTests(
189-
PipelineTesterMixin, PipelineKarrasSchedulerTesterMixin, unittest.TestCase
189+
IPAdapterTesterMixin, PipelineTesterMixin, PipelineKarrasSchedulerTesterMixin, unittest.TestCase
190190
):
191191
pipeline_class = StableDiffusionControlNetImg2ImgPipeline
192192
params = TEXT_GUIDED_IMAGE_VARIATION_PARAMS - {"height", "width"}

tests/pipelines/controlnet/test_controlnet_inpaint.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,14 @@
5151
TEXT_GUIDED_IMAGE_INPAINTING_PARAMS,
5252
TEXT_TO_IMAGE_IMAGE_PARAMS,
5353
)
54-
from ..test_pipelines_common import (
55-
IPAdapterTesterMixin,
56-
PipelineKarrasSchedulerTesterMixin,
57-
PipelineLatentTesterMixin,
58-
PipelineTesterMixin,
59-
)
54+
from ..test_pipelines_common import PipelineKarrasSchedulerTesterMixin, PipelineLatentTesterMixin, PipelineTesterMixin
6055

6156

6257
enable_full_determinism()
6358

6459

6560
class ControlNetInpaintPipelineFastTests(
66-
IPAdapterTesterMixin,
67-
PipelineLatentTesterMixin,
68-
PipelineKarrasSchedulerTesterMixin,
69-
PipelineTesterMixin,
70-
unittest.TestCase,
61+
PipelineLatentTesterMixin, PipelineKarrasSchedulerTesterMixin, PipelineTesterMixin, unittest.TestCase
7162
):
7263
pipeline_class = StableDiffusionControlNetInpaintPipeline
7364
params = TEXT_GUIDED_IMAGE_INPAINTING_PARAMS

tests/pipelines/test_pipelines_common.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,13 @@ def test_pipeline_signature(self):
8383
)
8484

8585
def _get_dummy_image_embeds(self, cross_attention_dim: int = 32):
86-
return torch.zeros((2, 1, cross_attention_dim), device=torch_device)
86+
return torch.randn((2, 1, cross_attention_dim), device=torch_device)
8787

8888
def _modify_inputs_for_ip_adapter_test(self, inputs: Dict[str, Any]):
8989
inputs["output_type"] = "np"
9090
inputs["return_dict"] = False
91+
if "image" in inputs.keys():
92+
inputs["num_inference_steps"] = 4
9193
return inputs
9294

9395
def test_ip_adapter(self, expected_max_diff: float = 1e-4):
@@ -114,7 +116,7 @@ def test_ip_adapter(self, expected_max_diff: float = 1e-4):
114116
# forward pass with single ip adapter, but with scale of adapter weights
115117
inputs = self._modify_inputs_for_ip_adapter_test(self.get_dummy_inputs(torch_device))
116118
inputs["ip_adapter_image_embeds"] = [self._get_dummy_image_embeds(cross_attention_dim)]
117-
pipe.set_ip_adapter_scale(1.0)
119+
pipe.set_ip_adapter_scale(42.0)
118120
output_with_adapter_scale = pipe(**inputs)[0]
119121

120122
pipe.unet._load_ip_adapter_weights([adapter_state_dict_1, adapter_state_dict_2])
@@ -128,7 +130,7 @@ def test_ip_adapter(self, expected_max_diff: float = 1e-4):
128130
# forward pass with multi ip adapter, but with scale of adapter weights
129131
inputs = self._modify_inputs_for_ip_adapter_test(self.get_dummy_inputs(torch_device))
130132
inputs["ip_adapter_image_embeds"] = [self._get_dummy_image_embeds(cross_attention_dim)] * 2
131-
pipe.set_ip_adapter_scale([0.5, 0.5])
133+
pipe.set_ip_adapter_scale([42.0, 42.0])
132134
output_with_multi_adapter_scale = pipe(**inputs)[0]
133135

134136
max_diff_without_adapter_scale = np.abs(output_without_adapter_scale - output_without_adapter).max()

0 commit comments

Comments
 (0)