Skip to content

Commit 5c100fb

Browse files
authored
[Cherry-pick][BugFix] Update FA commit to support SM90 compilation (#59938)
1 parent b48bf6b commit 5c100fb

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

cmake/external/flashattn.cmake

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set(FLASHATTN_PREFIX_DIR ${THIRD_PARTY_PATH}/flashattn)
2020
set(FLASHATTN_SOURCE_SUBDIR csrc)
2121
set(FLASHATTN_INSTALL_DIR ${THIRD_PARTY_PATH}/install/flashattn)
2222
set(SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/flashattn)
23-
set(FLASHATTN_TAG 18106c1ba0ccee81b97ca947397c08a141815a47)
23+
set(FLASHATTN_TAG a96f8024714455fb86a326e20c3b7f700ec50772)
2424

2525
set(FLASHATTN_INCLUDE_DIR
2626
"${FLASHATTN_INSTALL_DIR}/include"
@@ -67,6 +67,20 @@ else()
6767
set(FLASHATTN_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
6868
endif()
6969

70+
set(FA_NVCC_ARCH_BIN "")
71+
foreach(arch ${NVCC_ARCH_BIN})
72+
string(STRIP ${arch} arch)
73+
if(arch STREQUAL "")
74+
continue()
75+
endif()
76+
77+
if(FA_NVCC_ARCH_BIN STREQUAL "")
78+
set(FA_NVCC_ARCH_BIN "${arch}")
79+
else()
80+
set(FA_NVCC_ARCH_BIN "${FA_NVCC_ARCH_BIN}-${arch}")
81+
endif()
82+
endforeach()
83+
7084
ExternalProject_Add(
7185
extern_flashattn
7286
${EXTERNAL_PROJECT_LOG_ARGS}
@@ -94,6 +108,7 @@ ExternalProject_Add(
94108
-DCMAKE_BUILD_TYPE=${THIRD_PARTY_BUILD_TYPE}
95109
-DCMAKE_JOB_POOL_COMPILE:STRING=compile
96110
-DCMAKE_JOB_POOLS:STRING=compile=4
111+
-DNVCC_ARCH_BIN=${FA_NVCC_ARCH_BIN}
97112
${EXTERNAL_OPTIONAL_ARGS}
98113
CMAKE_CACHE_ARGS
99114
-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}

0 commit comments

Comments
 (0)