* feat: migrate multi-vector query and reranker logic to C++ - Add Reranker base class with RrfReRanker and WeightedReRanker implementations - Add Collection::MultiQuery interface for multi-vector queries with reranking - Add MultiVectorQuery struct in doc.h with forward declaration for Reranker - Add C API bindings for reranker and MultiQuery (zvec_reranker_*, zvec_multi_vector_query_*, zvec_collection_multi_query) - Add Python binding for reranker classes with py::function bridge for callback - Validate duplicate field names in multi-vector queries (C++ and Python consistent) - Remove TODO comment about concurrent execution (SQLEngine is not thread-safe) - Update collection.h MultiQuery doc comment from concurrently to sequentially - Add C++ collection tests (6 MultiQuery test cases) - Add C API tests (reranker functions + multi_vector_query end-to-end) - Implement Python test cases (11 previously skipped tests now active) - Simplify Python query_executor validation for unified duplicate field check * style: format Python files with ruff * fix: adapt to main branch API changes (VectorQuery->Query rename, validate_and_sanitize) * fix: multi_vector tests now use multiple same-type vector fields (dense2, sparse2) * fix: suppress RET501 for intentional default return None in RerankFunction._get_object * style: ruff format test_collection.py * refact multi vector query * format code * fix(multi-vector): expose SubVectorQuery in Python binding, fix tests - Register _SubVectorQuery in pybind11 with from_vector_query() factory - Convert _VectorQuery to _SubVectorQuery in MultiVectorQueryExecutor - Relax RRF/Weighted score assertion tolerance from 1e-10 to 1e-6 - Fix WeightedReRanker test metric to IP (matching HnswIndexParam default) * style: ruff format query_executor.py * fix: define _USE_MATH_DEFINES for M_PI on Windows (MSVC) * refactor: include reranker.h directly in query.h instead of forward declaration * refactor(reranker): move topn from member variable to rerank() parameter * refact code * style(python): fix ruff UP035/UP037 in multi_vector_reranker - import Callable from collections.abc instead of typing (UP035) - remove redundant quotes around MetricType annotations (UP037) * chore: trigger PR sync * refact code * fix(examples): restore CMakeLists.txt formatting broken by clang-format * refactor(reranker): remove redundant metrics_ map by querying schema directly, and use insert return value to avoid duplicate set lookup * refactor(reranker): defer schema binding to query time and remove C API callback reranker
87 lines
3.2 KiB
CMake
87 lines
3.2 KiB
CMake
include(${PROJECT_ROOT_DIR}/cmake/bazel.cmake)
|
|
include(${PROJECT_ROOT_DIR}/cmake/option.cmake)
|
|
|
|
set(CMAKE_CXX_STANDARD 17)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
find_package(pybind11 REQUIRED)
|
|
|
|
set(SRC_LISTS
|
|
binding.cc
|
|
model/python_collection.cc
|
|
model/python_doc.cc
|
|
model/python_reranker.cc
|
|
model/param/python_param.cc
|
|
model/schema/python_schema.cc
|
|
model/common/python_config.cc
|
|
typing/python_type.cc
|
|
)
|
|
|
|
pybind11_add_module(_zvec ${SRC_LISTS})
|
|
|
|
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
|
target_link_libraries(_zvec PRIVATE
|
|
-Wl,--whole-archive
|
|
$<TARGET_FILE:core_knn_flat_static>
|
|
$<TARGET_FILE:core_knn_flat_sparse_static>
|
|
$<TARGET_FILE:core_knn_hnsw_static>
|
|
$<TARGET_FILE:core_knn_hnsw_rabitq_static>
|
|
$<TARGET_FILE:core_knn_hnsw_sparse_static>
|
|
$<TARGET_FILE:core_knn_ivf_static>
|
|
$<TARGET_FILE:core_knn_vamana_static>
|
|
$<TARGET_FILE:core_knn_cluster_static>
|
|
$<TARGET_FILE:core_mix_reducer_static>
|
|
$<TARGET_FILE:core_metric_static>
|
|
$<TARGET_FILE:core_utility_static>
|
|
$<TARGET_FILE:core_quantizer_static>
|
|
-Wl,--no-whole-archive
|
|
zvec_db
|
|
)
|
|
target_link_options(_zvec PRIVATE
|
|
"LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports.map"
|
|
)
|
|
elseif (APPLE)
|
|
target_link_libraries(_zvec PRIVATE
|
|
-Wl,-force_load,$<TARGET_FILE:core_knn_flat_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_knn_flat_sparse_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_knn_hnsw_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_knn_hnsw_rabitq_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_knn_hnsw_sparse_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_knn_ivf_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_knn_vamana_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_knn_cluster_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_mix_reducer_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_metric_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_utility_static>
|
|
-Wl,-force_load,$<TARGET_FILE:core_quantizer_static>
|
|
zvec_db
|
|
)
|
|
target_link_libraries(_zvec PRIVATE
|
|
-Wl,-exported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/exports.mac
|
|
)
|
|
elseif (MSVC)
|
|
set(_zvec_whole_archive_libs
|
|
core_knn_flat_static
|
|
core_knn_flat_sparse_static
|
|
core_knn_hnsw_static
|
|
core_knn_hnsw_sparse_static
|
|
core_knn_ivf_static
|
|
core_knn_vamana_static
|
|
core_knn_cluster_static
|
|
core_mix_reducer_static
|
|
core_metric_static
|
|
core_utility_static
|
|
core_quantizer_static
|
|
)
|
|
target_link_libraries(_zvec PRIVATE
|
|
${_zvec_whole_archive_libs}
|
|
zvec_db
|
|
)
|
|
foreach(_lib ${_zvec_whole_archive_libs})
|
|
target_link_options(_zvec PRIVATE
|
|
"/WHOLEARCHIVE:$<TARGET_FILE:${_lib}>"
|
|
)
|
|
endforeach()
|
|
endif ()
|
|
|
|
target_include_directories(_zvec PRIVATE ${PYBIND11_INCLUDE_DIR} ${PROJECT_ROOT_DIR}/src ${PROJECT_ROOT_DIR}/src/binding/python/include) |