admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-30 07:25:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

update...

Browse Source 
Former-commit-id: 42b56218b03ac7b8efb479e776ce601e12a45e6c
This commit is contained in:
xj.lin 2019-07-09 04:43:27 +08:00
parent 440e18bb0f
commit 015fe06fc4
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cpp/src/db/ExecutionEngineImpl.cpp
View File

@ -183,9 +183,9 @@ VecIndexPtr ExecutionEngineImpl::Load(const std::string &location) {
reader(bin, bin_length);
rp += bin_length;
auto xx = std::make_shared<uint8_t>();
xx.reset(bin);
load_data_list.Append(std::string(meta, meta_length), xx, bin_length);
auto binptr = std::make_shared<uint8_t>();
binptr.reset(bin);
load_data_list.Append(std::string(meta, meta_length), binptr, bin_length);
}
auto index_type = IndexType::INVALID;
@ -206,6 +206,10 @@ VecIndexPtr ExecutionEngineImpl::Load(const std::string &location) {
index_type = IndexType::SPTAG_KDT_RNT_CPU;
break;
}
default: {
ENGINE_LOG_ERROR << "wrong index_type";
return nullptr;
}
}
return LoadVecIndex(index_type, load_data_list);

17
cpp/src/wrapper/knowhere/vec_index.cpp
View File

@ -32,15 +32,22 @@ VecIndexPtr GetVecIndexFactory(const IndexType &type) {
index = std::make_shared<zilliz::knowhere::GPUIVF>(0);
break;
}
case IndexType::FAISS_IVFPQ_CPU: {
index = std::make_shared<zilliz::knowhere::IVFPQ>();
break;
}
case IndexType::FAISS_IVFPQ_GPU: {
index = std::make_shared<zilliz::knowhere::GPUIVFPQ>(0);
break;
}
case IndexType::SPTAG_KDT_RNT_CPU: {
index = std::make_shared<zilliz::knowhere::CPUKDTRNG>();
break;
}
//// TODO(linxj): Support NSG
//case IndexType ::NSG: {
// index = std::make_shared<zilliz::knowhere::NSG>();
// break;
//}
//case IndexType::NSG: { // TODO(linxj): bug.
// index = std::make_shared<zilliz::knowhere::NSG>();
// break;
//}
default: {
return nullptr;
}

6
cpp/src/wrapper/knowhere/vec_index.h
View File

@ -54,10 +54,12 @@ using VecIndexPtr = std::shared_ptr<VecIndex>;
enum class IndexType {
INVALID = 0,
FAISS_IDMAP = 1,
FAISS_IVFFLAT_GPU,
FAISS_IVFFLAT_CPU,
FAISS_IVFFLAT_GPU,
FAISS_IVFPQ_CPU,
FAISS_IVFPQ_GPU,
SPTAG_KDT_RNT_CPU,
NSG,
//NSG,
};
extern VecIndexPtr GetVecIndexFactory(const IndexType &type);