Merge branch 'main' into 1226

xdit-project · Dec 26, 2024 · 45af87e · 45af87e
2 parents d8298c9 + 92187b8
commit 45af87e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/xfuser/core/long_ctx_attention/ring/ring_flash_attn.py b/xfuser/core/long_ctx_attention/ring/ring_flash_attn.py
@@ -11,7 +11,10 @@
 except ImportError:
     flash_attn = None
     _flash_attn_forward = None
+<<<<<<< HEAD
     from yunchang.kernels.attention import pytorch_attn_forward
+=======
+>>>>>>> main
 
 def xdit_ring_flash_attn_forward(
     process_group,