From 6215ca5e17db43c046f428bd86ed75321d1d07ac Mon Sep 17 00:00:00 2001
From: tomguluson92 <314913739@qq.com>
Date: Mon, 1 May 2023 00:46:15 +0800
Subject: [PATCH 1/2] Update requirements.txt

Add `protobuf==3.19.0` for loading T5Embedder, `scikit-image` for inpainting.
---
 requirements.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index 8fd0cbb..00bcea7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,7 @@ numpy
 torch<2.0.0
 torchvision
 omegaconf
+scikit-image
 matplotlib
 Pillow>=9.2.0
 huggingface_hub>=0.13.2
@@ -13,3 +14,4 @@ tokenizers~=0.13.2
 sentencepiece~=0.1.97
 ftfy~=6.1.1
 beautifulsoup4~=4.11.1
+protobuf==3.19.0

From 02fd0975f5ae76e887e10138faa332e5d91583dd Mon Sep 17 00:00:00 2001
From: tomguluson92 <314913739@qq.com>
Date: Mon, 1 May 2023 01:03:01 +0800
Subject: [PATCH 2/2] [Bug fix][Inpainting]

replace `cpu()` with `cpu().numpy()`
---
 deepfloyd_if/pipelines/inpainting.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deepfloyd_if/pipelines/inpainting.py b/deepfloyd_if/pipelines/inpainting.py
index d0a4c78..447693a 100644
--- a/deepfloyd_if/pipelines/inpainting.py
+++ b/deepfloyd_if/pipelines/inpainting.py
@@ -58,7 +58,7 @@ def inpainting(
 
     if_I_kwargs['support_noise'] = low_res
 
-    inpainting_mask_I = img_as_bool(resize(inpainting_mask[0].cpu(), (3, image_h, image_w)))
+    inpainting_mask_I = img_as_bool(resize(inpainting_mask[0].cpu().numpy(), (3, image_h, image_w)))
     inpainting_mask_I = torch.from_numpy(inpainting_mask_I).unsqueeze(0).to(if_I.device)
 
     if_I_kwargs['inpainting_mask'] = inpainting_mask_I
@@ -81,7 +81,7 @@ def inpainting(
         if_II_kwargs['support_noise'] = mid_res
 
         if 'inpainting_mask' not in if_II_kwargs:
-            inpainting_mask_II = img_as_bool(resize(inpainting_mask[0].cpu(), (3, image_h, image_w)))
+            inpainting_mask_II = img_as_bool(resize(inpainting_mask[0].cpu().numpy(), (3, image_h, image_w)))
             inpainting_mask_II = torch.from_numpy(inpainting_mask_II).unsqueeze(0).to(if_II.device)
             if_II_kwargs['inpainting_mask'] = inpainting_mask_II
 
@@ -110,7 +110,7 @@ def inpainting(
             if_III_kwargs['support_noise'] = high_res
 
             if 'inpainting_mask' not in if_III_kwargs:
-                inpainting_mask_III = img_as_bool(resize(inpainting_mask[0].cpu(), (3, image_h, image_w)))
+                inpainting_mask_III = img_as_bool(resize(inpainting_mask[0].cpu().numpy(), (3, image_h, image_w)))
                 inpainting_mask_III = torch.from_numpy(inpainting_mask_III).unsqueeze(0).to(if_III.device)
                 if_III_kwargs['inpainting_mask'] = inpainting_mask_III