Remove Clip Skip and FreeU

DOCS.md

@@ -87,11 +87,3 @@ Enable `Use negative TI` to append [`fast_negative`](https://civitai.com/models/
 * `2`: more quality
 * `3`: balanced
 * `4`: more speed
-
-#### FreeU
-
-[FreeU](https://github.com/ChenyangSi/FreeU) re-weights the contributions sourced from the UNet’s skip connections and backbone feature maps. Can sometimes improve image quality.
-
-#### Clip Skip
-
-When enabled, the last CLIP layer is skipped. Can sometimes improve image quality.

README.md

@@ -65,7 +65,7 @@ Gradio app for Stable Diffusion 1.5 featuring:
 * Compel prompt weighting
 * Hand-written style templates
 * Multiple samplers with Karras scheduling
-* DeepCache, FreeU, and Clip Skip available
+* DeepCache available
 * Real-ESRGAN upscaling
 
 ## Usage

app.py

@@ -302,16 +302,6 @@ with gr.Blocks(
                     label="Use negative TI",
                     value=False,
                 )
-                use_freeu = gr.Checkbox(
-                    elem_classes=["checkbox"],
-                    label="FreeU",
-                    value=False,
-                )
-                use_clip_skip = gr.Checkbox(
-                    elem_classes=["checkbox"],
-                    label="Clip skip",
-                    value=False,
-                )
 
             # Image-to-Image settings
             gr.HTML("<h3>Image-to-Image</h3>")
@@ -451,8 +441,6 @@ with gr.Blocks(
             scale,
             num_images,
             use_karras,
-            use_freeu,
-            use_clip_skip,
             use_ip_face,
             use_negative_embedding,
             DISABLE_IMAGE_PROMPT,

lib/inference.py

@@ -80,8 +80,6 @@ def generate(
     scale=1,
     num_images=1,
     karras=False,
-    freeu=False,
-    clip_skip=False,
     ip_face=False,
     negative_embedding=False,
     Error=Exception,
@@ -108,11 +106,7 @@ def generate(
     KIND = "img2img" if image_prompt is not None else "txt2img"
     KIND = f"controlnet_{KIND}" if control_image_prompt is not None else KIND
 
-    EMBEDDINGS_TYPE = (
-        ReturnedEmbeddingsType.PENULTIMATE_HIDDEN_STATES_NORMALIZED
-        if clip_skip
-        else ReturnedEmbeddingsType.LAST_HIDDEN_STATES_NORMALIZED
-    )
+    EMBEDDINGS_TYPE = ReturnedEmbeddingsType.LAST_HIDDEN_STATES_NORMALIZED
 
     if ip_image_prompt:
         IP_ADAPTER = "full-face" if ip_face else "plus"
@@ -143,7 +137,6 @@ def generate(
         deepcache,
         scale,
         karras,
-        freeu,
         progress,
     )
 

lib/loader.py

@@ -29,14 +29,6 @@ class Loader:
                 cls._instance.log = Logger("Loader")
         return cls._instance
 
-    @property
-    def _has_freeu(self):
-        if self.pipe is not None:
-            attrs = ["b1", "b2", "s1", "s2"]
-            block = self.pipe.unet.up_blocks[0]
-            return all(getattr(block, attr, None) is not None for attr in attrs)
-        return False
-
     def _should_unload_upscaler(self, scale=1):
         if self.upscaler is not None and self.upscaler.scale != scale:
             return True
@@ -50,11 +42,6 @@ class Loader:
             return True
         return False
 
-    def _should_unload_freeu(self, freeu=False):
-        if self._has_freeu and not freeu:
-            return True
-        return False
-
     def _should_unload_ip_adapter(self, model="", ip_adapter=""):
         # unload if model changed
         if self.model and self.model.lower() != model.lower():
@@ -106,11 +93,6 @@ class Loader:
             self.pipe.deepcache.disable()
             delattr(self.pipe, "deepcache")
 
-    def _unload_freeu(self, freeu=False):
-        if self._has_freeu and not freeu:
-            self.log.info("Disabling FreeU")
-            self.pipe.disable_freeu()
-
     # Copied from https://github.com/huggingface/diffusers/blob/v0.28.0/src/diffusers/loaders/ip_adapter.py#L300
     def _unload_ip_adapter(self):
         if self.ip_adapter is not None:
@@ -145,15 +127,11 @@ class Loader:
         ip_adapter="",
         deepcache=1,
         scale=1,
-        freeu=False,
     ):
         to_unload = []
         if self._should_unload_deepcache(deepcache):  # remove deepcache first
             self._unload_deepcache()
 
-        if self._should_unload_freeu(freeu):
-            self._unload_freeu()
-
         if self._should_unload_upscaler(scale):
             self._unload_upscaler()
             to_unload.append("upscaler")
@@ -181,11 +159,6 @@ class Loader:
             return True
         return False
 
-    def _should_load_freeu(self, freeu=False):
-        if not self._has_freeu and freeu:
-            return True
-        return False
-
     def _should_load_deepcache(self, interval=1):
         has_deepcache = hasattr(self.pipe, "deepcache")
         if not has_deepcache and interval != 1:
@@ -222,12 +195,6 @@ class Loader:
             self.pipe.deepcache.set_params(cache_interval=interval)
             self.pipe.deepcache.enable()
 
-    # https://github.com/ChenyangSi/FreeU
-    def _load_freeu(self, freeu=False):
-        if self._should_load_freeu(freeu):
-            self.log.info("Enabling FreeU")
-            self.pipe.enable_freeu(b1=1.5, b2=1.6, s1=0.9, s2=0.2)
-
     def _load_ip_adapter(self, ip_adapter=""):
         if self._should_load_ip_adapter(ip_adapter):
             msg = "Loading IP-Adapter"
@@ -298,7 +265,6 @@ class Loader:
         deepcache,
         scale,
         karras,
-        freeu,
         progress,
     ):
         device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
@@ -351,7 +317,7 @@ class Loader:
             )
             self.controlnet = annotator
 
-        self._unload(kind, model, annotator, ip_adapter, deepcache, scale, freeu)
+        self._unload(kind, model, annotator, ip_adapter, deepcache, scale)
         self._load_pipeline(kind, model, progress, **pipe_kwargs)
 
         # error loading model
@@ -379,7 +345,6 @@ class Loader:
         CURRENT_STEP = 1
         TOTAL_STEPS = sum(
             [
-                self._should_load_freeu(freeu),
                 self._should_load_deepcache(deepcache),
                 self._should_load_ip_adapter(ip_adapter),
                 self._should_load_upscaler(scale),
@@ -387,11 +352,6 @@ class Loader:
         )
 
         desc = "Configuring pipeline"
-        if not self._has_freeu and freeu:
-            self._load_freeu(freeu)
-            safe_progress(progress, CURRENT_STEP, TOTAL_STEPS, desc)
-            CURRENT_STEP += 1
-
         if self._should_load_deepcache(deepcache):
             self._load_deepcache(deepcache)
             safe_progress(progress, CURRENT_STEP, TOTAL_STEPS, desc)