From 7a1a211c999b9d88d341d8b75f0ff2e25b09ac15 Mon Sep 17 00:00:00 2001
From: Wing Lian <wing.lian@gmail.com>
Date: Fri, 14 Mar 2025 09:28:28 -0400
Subject: [PATCH] move ring flash attn to extras with flash-attn (#2414)

---
 requirements.txt |  1 -
 setup.py         | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 85807cd38..bdb085279 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -68,4 +68,3 @@ axolotl-contribs-mit==0.0.3
 
 # for sequence parallelism
 yunchang==0.6.0
-ring-flash-attn>=0.1.4
diff --git a/setup.py b/setup.py
index c4ffcdaeb..08395a396 100644
--- a/setup.py
+++ b/setup.py
@@ -17,11 +17,7 @@ def parse_requirements():
         lines = [r.strip() for r in requirements_file.readlines()]
         for line in lines:
             is_extras = (
-                "flash-attn" in line
-                or "flash-attention" in line
-                or "deepspeed" in line
-                or "mamba-ssm" in line
-                or "lion-pytorch" in line
+                "deepspeed" in line or "mamba-ssm" in line or "lion-pytorch" in line
             )
             if line.startswith("--extra-index-url"):
                 # Handle custom index URLs
@@ -39,7 +35,6 @@ def parse_requirements():
                 "bitsandbytes",
                 "triton",
                 "mamba-ssm",
-                "flash-attn",
                 "xformers",
                 "autoawq",
                 "liger-kernel",
@@ -124,9 +119,7 @@ setup(
         ],
     },
     extras_require={
-        "flash-attn": [
-            "flash-attn==2.7.4.post1",
-        ],
+        "flash-attn": ["flash-attn==2.7.4.post1", "ring-flash-attn>=0.1.4"],
         "deepspeed": [
             "deepspeed==0.16.4",
             "deepspeed-kernels",