revert 49a96b9 due to conflicts during training

Author: lstein

Diff for: ldm/modules/attention.py

@@ -297,9 +297,9 @@ def forward(self, x, context=None):
 
     def _forward(self, x, context=None):
         x = x.contiguous() if x.device.type == 'mps' else x
-        x += self.attn1(self.norm1(x))
-        x += self.attn2(self.norm2(x), context=context)
-        x += self.ff(self.norm3(x))
+        x = self.attn1(self.norm1(x)) + x
+        x = self.attn2(self.norm2(x), context=context) + x
+        x = self.ff(self.norm3(x)) + x
         return x