From 200ced8b1c69b722dffca93f77a6bb87184029e5 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Wed, 20 Sep 2023 13:15:40 -0400
Subject: [PATCH] refactor unipc code

---
 modules/sd_samplers_compvis.py                    | 6 +++---
 modules/{models/diffusion => }/uni_pc/__init__.py | 0
 modules/{models/diffusion => }/uni_pc/sampler.py  | 0
 modules/{models/diffusion => }/uni_pc/uni_pc.py   | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename modules/{models/diffusion => }/uni_pc/__init__.py (100%)
 rename modules/{models/diffusion => }/uni_pc/sampler.py (100%)
 rename modules/{models/diffusion => }/uni_pc/uni_pc.py (100%)

diff --git a/modules/sd_samplers_compvis.py b/modules/sd_samplers_compvis.py
index bd3e95c70..f0053e76c 100644
--- a/modules/sd_samplers_compvis.py
+++ b/modules/sd_samplers_compvis.py
@@ -7,11 +7,11 @@ import torch
 
 from modules.shared import state
 from modules import sd_samplers_common, prompt_parser, shared
-import modules.models.diffusion.uni_pc
+import modules.uni_pc
 
 
 samplers_data_compvis = [
-    sd_samplers_common.SamplerData('UniPC', lambda model: VanillaStableDiffusionSampler(modules.models.diffusion.uni_pc.UniPCSampler, model), [], {}),
+    sd_samplers_common.SamplerData('UniPC', lambda model: VanillaStableDiffusionSampler(modules.uni_pc.UniPCSampler, model), [], {}),
     sd_samplers_common.SamplerData('DDIM', lambda model: VanillaStableDiffusionSampler(ldm.models.diffusion.ddim.DDIMSampler, model), [], {"default_eta_is_0": True, "uses_ensd": True}),
     sd_samplers_common.SamplerData('PLMS', lambda model: VanillaStableDiffusionSampler(ldm.models.diffusion.plms.PLMSSampler, model), [], {}),
 ]
@@ -22,7 +22,7 @@ class VanillaStableDiffusionSampler:
         self.sampler = constructor(sd_model)
         self.is_ddim = hasattr(self.sampler, 'p_sample_ddim')
         self.is_plms = hasattr(self.sampler, 'p_sample_plms')
-        self.is_unipc = isinstance(self.sampler, modules.models.diffusion.uni_pc.UniPCSampler)
+        self.is_unipc = isinstance(self.sampler, modules.uni_pc.UniPCSampler)
         self.orig_p_sample_ddim = None
         if self.is_plms:
             self.orig_p_sample_ddim = self.sampler.p_sample_plms
diff --git a/modules/models/diffusion/uni_pc/__init__.py b/modules/uni_pc/__init__.py
similarity index 100%
rename from modules/models/diffusion/uni_pc/__init__.py
rename to modules/uni_pc/__init__.py
diff --git a/modules/models/diffusion/uni_pc/sampler.py b/modules/uni_pc/sampler.py
similarity index 100%
rename from modules/models/diffusion/uni_pc/sampler.py
rename to modules/uni_pc/sampler.py
diff --git a/modules/models/diffusion/uni_pc/uni_pc.py b/modules/uni_pc/uni_pc.py
similarity index 100%
rename from modules/models/diffusion/uni_pc/uni_pc.py
rename to modules/uni_pc/uni_pc.py