From 751c88539d4bd4bb96f88f9a34789dc9390fed1f Mon Sep 17 00:00:00 2001 From: jiqing-feng Date: Thu, 15 Jan 2026 10:01:54 +0800 Subject: [PATCH 1/5] fix contiguous Signed-off-by: jiqing-feng --- src/diffusers/models/resnet.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/diffusers/models/resnet.py b/src/diffusers/models/resnet.py index c0b4ad40055a..a98cb491146b 100644 --- a/src/diffusers/models/resnet.py +++ b/src/diffusers/models/resnet.py @@ -366,7 +366,12 @@ def forward(self, input_tensor: torch.Tensor, temb: torch.Tensor, *args, **kwarg hidden_states = self.conv2(hidden_states) if self.conv_shortcut is not None: - input_tensor = self.conv_shortcut(input_tensor.contiguous()) + # Only use contiguous() during training to avoid DDP gradient stride mismatch warning. + # In inference mode (eval or no_grad), skip contiguous() for better performance, especially on CPU. + # Issue: https://github.com/huggingface/diffusers/issues/12975 + if self.training: + input_tensor = input_tensor.contiguous() + input_tensor = self.conv_shortcut(input_tensor) output_tensor = (input_tensor + hidden_states) / self.output_scale_factor From ae74d13385a23aca27e8345c8f70e4d06f703198 Mon Sep 17 00:00:00 2001 From: jiqing-feng Date: Thu, 15 Jan 2026 12:51:01 +0800 Subject: [PATCH 2/5] update tol Signed-off-by: jiqing-feng --- tests/pipelines/test_pipelines_common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pipelines/test_pipelines_common.py b/tests/pipelines/test_pipelines_common.py index 7db5f4da89ca..3d205f49226a 100644 --- a/tests/pipelines/test_pipelines_common.py +++ b/tests/pipelines/test_pipelines_common.py @@ -2212,7 +2212,7 @@ def test_StableDiffusionMixin_component(self): @require_hf_hub_version_greater("0.26.5") @require_transformers_version_greater("4.47.1") - def test_save_load_dduf(self, atol=1e-4, rtol=1e-4): + def test_save_load_dduf(self, atol=2e-4, rtol=2e-4): if not self.supports_dduf: return From aa65c5c1f5323b27707eaece3f97732c31327212 Mon Sep 17 00:00:00 2001 From: jiqing-feng Date: Thu, 15 Jan 2026 13:32:04 +0800 Subject: [PATCH 3/5] bigger tol Signed-off-by: jiqing-feng --- tests/pipelines/test_pipelines_common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pipelines/test_pipelines_common.py b/tests/pipelines/test_pipelines_common.py index 3d205f49226a..7d898919dfee 100644 --- a/tests/pipelines/test_pipelines_common.py +++ b/tests/pipelines/test_pipelines_common.py @@ -2212,7 +2212,7 @@ def test_StableDiffusionMixin_component(self): @require_hf_hub_version_greater("0.26.5") @require_transformers_version_greater("4.47.1") - def test_save_load_dduf(self, atol=2e-4, rtol=2e-4): + def test_save_load_dduf(self, atol=1e-3, rtol=1e-3): if not self.supports_dduf: return From 46c47be197146d89873997d83f338bfeb09a1131 Mon Sep 17 00:00:00 2001 From: jiqing-feng Date: Thu, 22 Jan 2026 09:44:00 +0000 Subject: [PATCH 4/5] fix tests Signed-off-by: jiqing-feng --- tests/pipelines/kandinsky2_2/test_kandinsky_inpaint.py | 3 +++ tests/pipelines/test_pipelines_common.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/pipelines/kandinsky2_2/test_kandinsky_inpaint.py b/tests/pipelines/kandinsky2_2/test_kandinsky_inpaint.py index 8a693e9c2dd0..df1dd2d9872c 100644 --- a/tests/pipelines/kandinsky2_2/test_kandinsky_inpaint.py +++ b/tests/pipelines/kandinsky2_2/test_kandinsky_inpaint.py @@ -248,6 +248,9 @@ def test_inference_batch_single_identical(self): def test_float16_inference(self): super().test_float16_inference(expected_max_diff=5e-1) + def test_save_load_dduf(self): + super().test_save_load_dduf(atol=1e-3, rtol=1e-3) + @is_flaky() def test_model_cpu_offload_forward_pass(self): super().test_inference_batch_single_identical(expected_max_diff=8e-4) diff --git a/tests/pipelines/test_pipelines_common.py b/tests/pipelines/test_pipelines_common.py index 7d898919dfee..7db5f4da89ca 100644 --- a/tests/pipelines/test_pipelines_common.py +++ b/tests/pipelines/test_pipelines_common.py @@ -2212,7 +2212,7 @@ def test_StableDiffusionMixin_component(self): @require_hf_hub_version_greater("0.26.5") @require_transformers_version_greater("4.47.1") - def test_save_load_dduf(self, atol=1e-3, rtol=1e-3): + def test_save_load_dduf(self, atol=1e-4, rtol=1e-4): if not self.supports_dduf: return From 4be722b879c2fd26aac1aad30b4f409f39731bc9 Mon Sep 17 00:00:00 2001 From: jiqing-feng Date: Fri, 23 Jan 2026 09:20:13 +0000 Subject: [PATCH 5/5] update tol Signed-off-by: jiqing-feng --- tests/pipelines/kandinsky3/test_kandinsky3_img2img.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/pipelines/kandinsky3/test_kandinsky3_img2img.py b/tests/pipelines/kandinsky3/test_kandinsky3_img2img.py index 503fdb242dff..d3bfa4b3082c 100644 --- a/tests/pipelines/kandinsky3/test_kandinsky3_img2img.py +++ b/tests/pipelines/kandinsky3/test_kandinsky3_img2img.py @@ -191,6 +191,9 @@ def test_float16_inference(self): def test_inference_batch_single_identical(self): super().test_inference_batch_single_identical(expected_max_diff=1e-2) + def test_save_load_dduf(self): + super().test_save_load_dduf(atol=1e-3, rtol=1e-3) + @slow @require_torch_accelerator