From 5306c6acbbf700ca64401661bc0502602bc02c16 Mon Sep 17 00:00:00 2001 From: Dan Saunders Date: Mon, 14 Apr 2025 14:41:52 +0000 Subject: [PATCH] fix --- src/axolotl/monkeypatch/attention/ring_attn/patch.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/axolotl/monkeypatch/attention/ring_attn/patch.py b/src/axolotl/monkeypatch/attention/ring_attn/patch.py index 36d58c510..160e57052 100644 --- a/src/axolotl/monkeypatch/attention/ring_attn/patch.py +++ b/src/axolotl/monkeypatch/attention/ring_attn/patch.py @@ -57,12 +57,7 @@ class RingAttnFunc(str, Enum): def register_ring_attn( sequence_parallel_degree: int, heads_k_stride: int | None, -<<<<<<< HEAD ring_attn_func: RingAttnFunc | None, -======= - sample_packing: bool, - ring_attn_func: str | None, ->>>>>>> 8799e9a6 (adding all batch ring-flash-attn methods via single adapter) ): """ Create ring attention group and substitute flash attn with ring flash attn. @@ -125,10 +120,6 @@ def register_ring_attn( substitute_hf_flash_attn( process_group=get_ring_attn_group(), heads_k_stride=heads_k_stride or 1 ) -<<<<<<< HEAD -======= - # TODO(djsaunde): handle other ring attn funcs in this branch ->>>>>>> 8799e9a6 (adding all batch ring-flash-attn methods via single adapter) elif ring_attn_func in [ RingAttnFunc.BATCH_RING, RingAttnFunc.BATCH_ZIGZAG,