admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update_gpuresource' into 'branch-0.4.0'

Browse Source 
MS-484 1. update faiss version 2. idmap add search config

See merge request megasearch/milvus!485

Former-commit-id: b821c0cc0075c3f0ff6a293b37488daf79c29258
This commit is contained in:
jinhai 2019-09-05 12:00:39 +08:00
commit 2522b04294
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/src/core/cmake/ThirdPartyPackages.cmake
View File

@ -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}")

3
cpp/src/core/src/knowhere/index/vector_index/idmap.cpp
View File

@ -39,6 +39,9 @@ DatasetPtr IDMAP::Search(const DatasetPtr &dataset, const Config &config) {
}
auto k = config["k"].as<size_t>();
auto metric_type = config["metric_type"].as_string() == "L2" ?
faiss::METRIC_L2 : faiss::METRIC_INNER_PRODUCT;
index_->metric_type = metric_type;
GETTENSOR(dataset)