test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-12-05 05:18:52 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge branch 'fix_knowhere_merge' into 'branch-0.4.0'

Browse Source 
MS-442 fix merge error

See merge request megasearch/milvus!455

Former-commit-id: a1b879c2003546c395879395cdf9af239dcdb2ca
This commit is contained in:
jinhai 2019-08-30 15:16:43 +08:00
commit 400cfaee06
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpp/src/core/src/knowhere/index/vector_index/gpu_ivf.cpp
View File

@ -123,6 +123,7 @@ void GPUIVF::search_impl(int64_t n,
int64_t *labels,
const Config &cfg) {
if (auto device_index = std::static_pointer_cast<faiss::gpu::GpuIndexIVF>(index_)) {
// todo: allocate search memory
auto nprobe = cfg.get_with_default("nprobe", size_t(1));
std::lock_guard<std::mutex> lk(mutex_);

2
cpp/src/core/test/test_nsg/CMakeLists.txt
View File

@ -27,6 +27,8 @@ aux_source_directory(${CMAKE_SOURCE_DIR}/src/knowhere/index/vector_index/nsg nsg
set(interface_src
${CMAKE_SOURCE_DIR}/src/knowhere/index/vector_index/ivf.cpp
${CMAKE_SOURCE_DIR}/src/knowhere/index/vector_index/gpu_ivf.cpp
${CMAKE_SOURCE_DIR}/src/knowhere/index/vector_index/cloner.cpp
${CMAKE_SOURCE_DIR}/src/knowhere/index/vector_index/idmap.cpp
${CMAKE_SOURCE_DIR}/src/knowhere/index/vector_index/nsg_index.cpp
${CMAKE_SOURCE_DIR}/src/knowhere/adapter/structure.cpp
${CMAKE_SOURCE_DIR}/src/knowhere/common/exception.cpp