Merge branch 'ryan/remove-attention-map-saving' into ryan/regional-conditioning

invokeai/backend/stable_diffusion/diffusion/__init__.py

@@ -1 +1,5 @@
+"""
+Initialization file for invokeai.models.diffusion
+"""
+
 from .shared_invokeai_diffusion import InvokeAIDiffuserComponent  # noqa: F401

invokeai/backend/stable_diffusion/diffusion/conditioning_data.py

@@ -33,6 +33,11 @@ class BasicConditioningInfo:
         return self
 
 
+@dataclass
+class ConditioningFieldData:
+    conditionings: List[BasicConditioningInfo]
+
+
 @dataclass
 class SDXLConditioningInfo(BasicConditioningInfo):
     """SDXL text conditioning information produced by Compel."""

invokeai/backend/stable_diffusion/diffusion/shared_invokeai_diffusion.py

@@ -378,7 +378,6 @@ class InvokeAIDiffuserComponent:
         """Runs the conditioned and unconditioned UNet forward passes sequentially for lower memory usage at the cost of
         slower execution speed.
         """
-
         # Since we are running the conditioned and unconditioned passes sequentially, we need to split the ControlNet
         # and T2I-Adapter residuals into two chunks.
         uncond_down_block, cond_down_block = None, None