Properly save

huggingface · Jul 23, 2023 · c8107b7 · c8107b7
1 parent e88bc1f
commit c8107b7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,13 +4,10 @@ real
 generated
 real
 output.jpg
-<<<<<<< HEAD
 wandb
 imagenet-text2image
-=======
 segmented.jpg
 
->>>>>>> 21b5600a636f39569160876cd6ea291220e8cbcb
 __pycache__/
 *.py[cod]
 *$py.class

diff --git a/muse/modeling_transformer.py b/muse/modeling_transformer.py
@@ -571,13 +571,9 @@ def forward(self, hidden_states, encoder_hidden_states=None, encoder_attention_m
         value = value.view(batch, kv_seq_len, self.num_heads, self.head_dim)  # (B, T, nh, hs)
 
         if self.use_memory_efficient_attention_xformers:
-<<<<<<< HEAD
-            attn_output = xops.memory_efficient_attention(query, key, value, op=self.xformers_attention_op, attn_bias=bias)
-=======
             attn_output = xops.memory_efficient_attention(
-                query, key, value, op=self.xformers_attention_op, p=self.attention_dropout if self.training else 0.0
+                query, key, value, op=self.xformers_attention_op, p=self.attention_dropout if self.training else 0.0, attn_bias=bias
             )
->>>>>>> 21b5600a636f39569160876cd6ea291220e8cbcb
             attn_output = attn_output.view(batch, q_seq_len, self.hidden_size)
         else:
             attention_mask = None