milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NSG build failed using GPU-edition if set gpu_enable false

pull/608/head
fishpenguin 2019-11-29 11:38:27 +08:00
parent 018abff2ee
commit 4b8a72f9ae
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -33,6 +33,7 @@ Please mark all change in change log and use the ticket from JIRA.
- \#533 - NSG build failed with MetricType Inner Product - \#533 - NSG build failed with MetricType Inner Product
- \#543 - client raise exception in shards when search results is empty - \#543 - client raise exception in shards when search results is empty
- \#545 - Avoid dead circle of build index thread when error occurs - \#545 - Avoid dead circle of build index thread when error occurs
- \#547 - NSG build failed using GPU-edition if set gpu_enable false
- \#552 - Server down during building index_type: IVF_PQ using GPU-edition - \#552 - Server down during building index_type: IVF_PQ using GPU-edition
- \#561 - Milvus server should report exception/error message or terminate on mysql metadata backend error - \#561 - Milvus server should report exception/error message or terminate on mysql metadata backend error
- \#599 - Build index log is incorrect - \#599 - Build index log is incorrect

6
core/src/index/knowhere/knowhere/index/vector_index/IndexNSG.cpp
View File

@ -117,7 +117,13 @@ NSG::Train(const DatasetPtr& dataset, const Config& config) {
// TODO(linxj): dev IndexFactory, support more IndexType // TODO(linxj): dev IndexFactory, support more IndexType
#ifdef MILVUS_GPU_VERSION #ifdef MILVUS_GPU_VERSION
auto temp_resource = FaissGpuResourceMgr::GetInstance().GetRes(build_cfg->gpu_id);
#if temp_resource == nullptr
auto preprocess_index = std::make_shared<IVF>();
#else
auto preprocess_index = std::make_shared<GPUIVF>(build_cfg->gpu_id); auto preprocess_index = std::make_shared<GPUIVF>(build_cfg->gpu_id);
#endif
#else #else
auto preprocess_index = std::make_shared<IVF>(); auto preprocess_index = std::make_shared<IVF>();
#endif #endif