fix match_histograms

iopaint/model/base.py

@@ -211,6 +211,9 @@ class InpaintModel:
 
     def _match_histograms(self, source, reference, mask):
         transformed_channels = []
+        if len(mask.shape) == 3:
+            mask = mask[:, :, -1]
+
         for channel in range(source.shape[-1]):
             source_channel = source[:, :, channel]
             reference_channel = reference[:, :, channel]

iopaint/tests/test_match_histograms.py

@@ -0,0 +1,36 @@
+import pytest
+import torch
+
+from iopaint.model_manager import ModelManager
+from iopaint.schema import SDSampler, HDStrategy
+from iopaint.tests.utils import check_device, get_config, assert_equal, current_dir
+
+
+@pytest.mark.parametrize("device", ["cuda", "mps"])
+@pytest.mark.parametrize("sampler", [SDSampler.ddim])
+def test_sd_match_histograms(device, sampler):
+    sd_steps = check_device(device)
+
+    model = ModelManager(
+        name="runwayml/stable-diffusion-inpainting",
+        device=torch.device(device),
+        disable_nsfw=True,
+        sd_cpu_textencoder=False,
+    )
+    cfg = get_config(
+        strategy=HDStrategy.ORIGINAL,
+        prompt="face of a fox, sitting on a bench",
+        sd_steps=sd_steps,
+        sd_guidance_scale=7.5,
+        sd_lcm_lora=False,
+        sd_match_histograms=True,
+        sd_sampler=sampler
+    )
+
+    assert_equal(
+        model,
+        cfg,
+        f"runway_sd_1_5_device_{device}_match_histograms.png",
+        img_p=current_dir / "overture-creations-5sI6fQgYIuo.png",
+        mask_p=current_dir / "overture-creations-5sI6fQgYIuo_mask.png",
+    )