Skip to content

Enable faiss "sve" opt_level #1587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enable faiss "sve" opt_level #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cpp/bench/ann/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ function(ConfigureAnnBench)
nlohmann_json::nlohmann_json
sqlite3
Threads::Threads
${CMAKE_DL_LIBS}
$<$<BOOL:${GPU_BUILD}>:CUDA::cudart_static>
$<TARGET_NAME_IF_EXISTS:OpenMP::OpenMP_CXX>
$<TARGET_NAME_IF_EXISTS:conda_env>
Expand Down
17 changes: 15 additions & 2 deletions cpp/cmake/thirdparty/get_faiss.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,18 @@ function(find_and_configure_faiss)
endif()

include(cmake/modules/FindAVX)
include(cmake/modules/FindSVE)
# Link against AVX CPU lib if it exists
set(CUVS_FAISS_OPT_LEVEL "generic")
if(CXX_AVX2_FOUND)
set(CUVS_FAISS_OPT_LEVEL "avx2")
endif()

if(CXX_SVE_FOUND)
set(CUVS_FAISS_OPT_LEVEL "sve")
endif

rapids_cpm_find(faiss ${version} ${find_args}
GLOBAL_TARGETS faiss faiss_avx2 faiss_gpu_objs faiss::faiss faiss::faiss_avx2
GLOBAL_TARGETS faiss faiss_avx2 faiss_gpu_objs faiss::faiss faiss::faiss_avx2 faiss::faiss_sve
CPM_ARGS ${cpm_args}
OPTIONS
"FAISS_ENABLE_GPU ${PKG_ENABLE_GPU}"
Expand Down Expand Up @@ -68,6 +71,12 @@ function(find_and_configure_faiss)
# faiss will have the conda includes/link dirs
target_link_libraries(faiss_avx2 PRIVATE $<TARGET_NAME_IF_EXISTS:conda_env>)
endif()
if(TARGET faiss_sve AND NOT TARGET faiss::faiss_sve)
add_library(faiss::faiss_sve ALIAS faiss_sve)
# We need to ensure that faiss has all the conda information. So we use this approach so that
# faiss will have the conda includes/link dirs
target_link_libraries(faiss_sve PRIVATE $<TARGET_NAME_IF_EXISTS:conda_env>)
endif()
if(TARGET faiss_gpu_objs AND NOT TARGET faiss::faiss_gpu_objs)
add_library(faiss::faiss_gpu_objs ALIAS faiss_gpu_objs)
# We need to ensure that faiss has all the conda information. So we use this approach so that
Expand All @@ -92,10 +101,14 @@ function(find_and_configure_faiss)
# and fail due to invalid compiler flags.
if(PKG_ENABLE_GPU AND PKG_BUILD_STATIC_LIBS AND CXX_AVX2_FOUND)
set(CUVS_FAISS_TARGETS "$<LINK_GROUP:RESCAN,$<LINK_LIBRARY:WHOLE_ARCHIVE,faiss_gpu_objs>,faiss::faiss_avx2>" PARENT_SCOPE)
elseif(PKG_ENABLE_GPU AND PKG_BUILD_STATIC_LIBS AND CXX_SVE_FOUND)
set(CUVS_FAISS_TARGETS "$<LINK_GROUP:RESCAN,$<LINK_LIBRARY:WHOLE_ARCHIVE,faiss_gpu_objs>,faiss::faiss_sve>" PARENT_SCOPE)
elseif(PKG_ENABLE_GPU AND PKG_BUILD_STATIC_LIBS)
set(CUVS_FAISS_TARGETS "$<LINK_GROUP:RESCAN,$<LINK_LIBRARY:WHOLE_ARCHIVE,faiss_gpu_objs>,faiss::faiss>" PARENT_SCOPE)
elseif(CXX_AVX2_FOUND)
set(CUVS_FAISS_TARGETS faiss::faiss_avx2 PARENT_SCOPE)
elseif(CXX_SVE_FOUND)
set(CUVS_FAISS_TARGETS faiss::faiss_sve PARENT_SCOPE)
else()
set(CUVS_FAISS_TARGETS faiss::faiss PARENT_SCOPE)
endif()
Expand Down
Loading