From 6b422840b4baf782acb27707b82b4dd5ec382f6c Mon Sep 17 00:00:00 2001 From: "xj.lin" Date: Thu, 5 Sep 2019 11:59:24 +0800 Subject: [PATCH] MS-484 1. update faiss version 2. idmap add search config Former-commit-id: e9b2131870e0a011a94c6cd2fed8166d9ebd80a5 --- cpp/src/core/cmake/ThirdPartyPackages.cmake | 2 +- cpp/src/core/src/knowhere/index/vector_index/idmap.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cpp/src/core/cmake/ThirdPartyPackages.cmake b/cpp/src/core/cmake/ThirdPartyPackages.cmake index 945f50fb73..2ec0c3a418 100644 --- a/cpp/src/core/cmake/ThirdPartyPackages.cmake +++ b/cpp/src/core/cmake/ThirdPartyPackages.cmake @@ -261,7 +261,7 @@ else() message(STATUS ${FAISS_SOURCE_URL}) endif() # set(FAISS_MD5 "a589663865a8558205533c8ac414278c") -set(FAISS_MD5 "31167ecbd1903fec600dc4ac00b9be9e") +set(FAISS_MD5 "57da9c4f599cc8fa4260488b1c96e1cc") if(DEFINED ENV{KNOWHERE_ARROW_URL}) set(ARROW_SOURCE_URL "$ENV{KNOWHERE_ARROW_URL}") diff --git a/cpp/src/core/src/knowhere/index/vector_index/idmap.cpp b/cpp/src/core/src/knowhere/index/vector_index/idmap.cpp index 8f068f72de..ba35f8cc49 100644 --- a/cpp/src/core/src/knowhere/index/vector_index/idmap.cpp +++ b/cpp/src/core/src/knowhere/index/vector_index/idmap.cpp @@ -39,6 +39,9 @@ DatasetPtr IDMAP::Search(const DatasetPtr &dataset, const Config &config) { } auto k = config["k"].as(); + auto metric_type = config["metric_type"].as_string() == "L2" ? + faiss::METRIC_L2 : faiss::METRIC_INNER_PRODUCT; + index_->metric_type = metric_type; GETTENSOR(dataset)