[Minor] Move FA Imports & Fix Import Check (#3307)

Signed-off-by: Alex Brooks <albrooks@redhat.com>
This commit is contained in:
Alex Brooks authored and GitHub committed 2026-05-02 08:34:29 +00:00
1 parent 04bfbbae61
commit e403acda3f
2 files changed
+23 -11

No files matched your search

@@ -56,20 +56,20 @@ else:
pass
# Fallback: Try FA3 from flash-attention source build
if flash_attn_func is None:
if flash_attn_varlen_func is None:
try:
from flash_attn_interface import flash_attn_varlen_func # noqa: F401
except (ImportError, ModuleNotFoundError):
pass
# Fallback: Try FA2 from flash-attn package (try multiple import paths)
if flash_attn_func is None:
if flash_attn_varlen_func is None:
try:
from flash_attn import flash_attn_varlen_func # noqa: F401
except (ImportError, ModuleNotFoundError):
pass
if flash_attn_func is None:
if flash_attn_varlen_func is None:
try:
from flash_attn.flash_attn_interface import ( # noqa: F401
flash_attn_varlen_func,
@@ -79,7 +79,7 @@ else:
# Fallback: Try vLLM's encapsulated flash attention dispatcher
# TODO discuss priority and remove potentially redundant fallbacks
if flash_attn_func is None:
if flash_attn_varlen_func is None:
try:
from vllm.vllm_flash_attn import ( # noqa: F401
flash_attn_varlen_func,