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

Merge branch '0.5.0' into '0.5.0' 

update

See merge request megasearch/milvus!774

Former-commit-id: e0cc5fcb9b94db5369d30d28c20bfcc5f208f94d
pull/191/head
jinhai 2019-10-19 19:34:10 +08:00
parent e5fd7bd966 ac20f4f9a6
commit 160e08b400
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/db/engine/ExecutionEngineImpl.cpp
View File

@ -124,6 +124,11 @@ ExecutionEngineImpl::HybridLoad() const {
return; return;
} }
if (index_->GetType() == IndexType::FAISS_IDMAP) {
ENGINE_LOG_WARNING << "HybridLoad with type FAISS_IDMAP, ignore";
return;
}
const std::string key = location_ + ".quantizer"; const std::string key = location_ + ".quantizer";
std::vector<uint64_t> gpus = scheduler::get_gpu_pool(); std::vector<uint64_t> gpus = scheduler::get_gpu_pool();
@ -178,6 +183,9 @@ ExecutionEngineImpl::HybridUnset() const {
if (index_type_ != EngineType::FAISS_IVFSQ8H) { if (index_type_ != EngineType::FAISS_IVFSQ8H) {
return; return;
} }
if (index_->GetType() == IndexType::FAISS_IDMAP) {
return;
}
index_->UnsetQuantizer(); index_->UnsetQuantizer();
} }