From 507b06958dcf278975f71a964b9900f5b5eef3e8 Mon Sep 17 00:00:00 2001
From: Anna <lunarring@cuba.com>
Date: Sat, 31 Dec 2022 13:14:37 +0100
Subject: [PATCH] resolution fix

---
 stable_diffusion_holder.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/stable_diffusion_holder.py b/stable_diffusion_holder.py
index d28de6f..e6c7db0 100644
--- a/stable_diffusion_holder.py
+++ b/stable_diffusion_holder.py
@@ -26,9 +26,6 @@ import subprocess
 import warnings
 import torch
 from tqdm.auto import tqdm
-from diffusers import StableDiffusionInpaintPipeline
-from diffusers import StableDiffusionPipeline
-from diffusers.schedulers import DDIMScheduler
 from PIL import Image
 import matplotlib.pyplot as plt
 import torch
@@ -97,7 +94,6 @@ class StableDiffusionHolder:
                  fp_ckpt: str = None, 
                  fp_config: str = None,
                  device: str = None,
-                 set_auto_res: bool = True,
                  height: Optional[int] = None,
                  width: Optional[int] = None,
                  num_inference_steps: int = 30, 
@@ -118,10 +114,13 @@ class StableDiffusionHolder:
         self.ddim_eta = 0
         self.num_inference_steps = num_inference_steps
         
-        if set_auto_res:
-            assert height is None, "Either enable automatic setting of resolution or specify height/width"
-            assert width is None, "Either enable automatic setting of resolution or specify height/width"
+        if height is None and width is None:
             self.init_auto_res()
+        else:
+            assert height is not None, "specify both width and height"
+            assert width is not None, "specify both width and height"
+            self.height = height
+            self.width = width
             
         # Inpainting inits
         self.mask_empty = Image.fromarray(255*np.ones([self.width, self.height], dtype=np.uint8))