Skip to content

Merge branch 'bleve' into unstable #40

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

Merged
abhinavdangeti merged 4 commits into from
Oct 4, 2024
Merged

Merge branch 'bleve' into unstable #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f077bf9
Build libfaiss with AVX2 support when requested, rather than libfaiss…
abhinavdangeti Sep 6, 2024
26d9b35
MB-62230 - Extended c_api to search only specified clusters with para…
metonymic-smokey Sep 19, 2024
b747c55
MB-62230 - Updated closest_centroids API to include params (#38)
metonymic-smokey Sep 20, 2024
82c29ca
Merge branch 'bleve' into unstable
deepkaran Oct 4, 2024
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
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ option(FAISS_ENABLE_RAFT "Enable RAFT for GPU indexes." OFF)
option(FAISS_ENABLE_PYTHON "Build Python extension." ON)
option(FAISS_ENABLE_C_API "Build C API." OFF)

# Force FAISS_OPT_LEVEL to "generic" if not building on x86_64.
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64")
set(FAISS_OPT_LEVEL "generic" CACHE STRING "No AVX since not building on x86_64" FORCE)
endif()

if(FAISS_ENABLE_GPU)
set(CMAKE_CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER})
enable_language(CUDA)
Expand Down
8 changes: 7 additions & 1 deletion c_api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ set(FAISS_C_SRC
utils/distances_c.cpp
)
add_library(faiss_c ${FAISS_C_SRC})
target_link_libraries(faiss_c PRIVATE faiss)
if(FAISS_OPT_LEVEL STREQUAL "generic")
target_link_libraries(faiss_c PRIVATE faiss)
elseif(FAISS_OPT_LEVEL STREQUAL "avx2")
target_link_libraries(faiss_c PRIVATE faiss_avx2)
elseif(FAISS_OPT_LEVEL STREQUAL "avx512")
target_link_libraries(faiss_c PRIVATE faiss_avx512)
endif()
install(TARGETS faiss_c
EXPORT faiss-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
Expand Down
8 changes: 5 additions & 3 deletions c_api/IndexIVF_c_ex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "macros_impl.h"

using faiss::IndexIVF;
using faiss::SearchParameters;
using faiss::SearchParametersIVF;

int faiss_IndexIVF_set_direct_map(FaissIndexIVF* index, int direct_map_type) {
Expand Down Expand Up @@ -39,12 +40,13 @@ int faiss_Search_closest_eligible_centroids(
float* query,
int k,
float* centroid_distances,
idx_t* centroid_ids) {
idx_t* centroid_ids,
const FaissSearchParameters* params) {
try {
faiss::IndexIVF* index_ivf = reinterpret_cast<IndexIVF*>(index);
assert(index_ivf);

index_ivf->quantizer->search(n, query, k, centroid_distances, centroid_ids);
index_ivf->quantizer->search(n, query, k, centroid_distances, centroid_ids,
reinterpret_cast<const faiss::SearchParameters*>(params));
}
CATCH_AND_HANDLE
}
Expand Down
6 changes: 3 additions & 3 deletions c_api/IndexIVF_c_ex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@ int faiss_Search_closest_eligible_centroids(
float* query,
int k,
float* centroid_distances,
idx_t* centroid_ids
idx_t* centroid_ids,
const FaissSearchParameters* params
);

/*
Search the clusters whose IDs are in 'assign' and
return return the 'k' nearest neighbours from among them.
return the 'k' nearest neighbours from among them.

@param n: number of queries.
@param x: query vector, size n * d.
Expand Down Expand Up @@ -89,7 +90,6 @@ int faiss_IndexIVF_compute_distance_to_codes_for_list(
const uint8_t* codes,
float* dists);


#ifdef __cplusplus
}
#endif
Expand Down
22 changes: 15 additions & 7 deletions faiss/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@ endif()
set(FAISS_HEADERS ${FAISS_HEADERS} PARENT_SCOPE)

add_library(faiss ${FAISS_SRC})
if(NOT FAISS_OPT_LEVEL STREQUAL "generic")
set_target_properties(faiss PROPERTIES EXCLUDE_FROM_ALL TRUE)
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(
faiss PRIVATE
Expand Down Expand Up @@ -329,23 +332,28 @@ else()
target_link_libraries(faiss_avx512 PRIVATE ${LAPACK_LIBRARIES})
endif()

install(TARGETS faiss
EXPORT faiss-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)

if(FAISS_OPT_LEVEL STREQUAL "generic")
install(TARGETS faiss
EXPORT faiss-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
endif()
if(FAISS_OPT_LEVEL STREQUAL "avx2")
install(TARGETS faiss_avx2
EXPORT faiss-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endif()
if(FAISS_OPT_LEVEL STREQUAL "avx512")
install(TARGETS faiss_avx2 faiss_avx512
EXPORT faiss-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
Expand Down