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

feat(wrapper): add one more build_all api in IndexBuilder 

Former-commit-id: b24296b10003d45616d3a38c86ab4657f691713a
pull/191/head
Xu Peng 2019-04-17 11:47:57 +08:00 committed by xj.lin
parent 2269c0d980
commit 86342b9578
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,5 +9,6 @@ cmake_build
*.o *.o
*.lo *.lo
*.tar.gz *.tar.gz
*.log
cpp/third_party/thrift-0.12.0/ cpp/third_party/thrift-0.12.0/

22
cpp/src/wrapper/IndexBuilder.cpp
View File

@ -21,9 +21,11 @@ IndexBuilder::IndexBuilder(const Operand_ptr &opd) {
opd_ = opd; opd_ = opd;
} }
Index_ptr IndexBuilder::build_all(const long &nb, const vector<float> &xb, Index_ptr IndexBuilder::build_all(const long &nb,
const vector<long> &ids, const float* xb,
const long &nt, const vector<float> &xt) { const long* ids,
const long &nt,
const float* xt) {
std::shared_ptr<faiss::Index> index = nullptr; std::shared_ptr<faiss::Index> index = nullptr;
index.reset(faiss::index_factory(opd_->d, opd_->index_type.c_str())); index.reset(faiss::index_factory(opd_->d, opd_->index_type.c_str()));
@ -31,14 +33,20 @@ Index_ptr IndexBuilder::build_all(const long &nb, const vector<float> &xb,
// currently only cpu resources are used. // currently only cpu resources are used.
std::lock_guard<std::mutex> lk(cpu_resource); std::lock_guard<std::mutex> lk(cpu_resource);
if (!index->is_trained) { if (!index->is_trained) {
nt == 0 || xt.empty() ? index->train(nb, xb.data()) nt == 0 || xt == nullptr ? index->train(nb, xb)
: index->train(nt, xt.data()); : index->train(nt, xt);
} }
index->add(nb, xb.data()); index->add_with_ids(nb, xb, ids); // todo(linxj): support add_with_idmap
index->add_with_ids(nb, xb.data(), ids.data()); // todo(linxj): support add_with_idmap
} }
return std::make_shared<Index>(index); return std::make_shared<Index>(index);
}
Index_ptr IndexBuilder::build_all(const long &nb, const vector<float> &xb,
const vector<long> &ids,
const long &nt, const vector<float> &xt) {
return build_all(nb, xb.data(), ids.data(), nt, xt.data());
} }
// Be Factory pattern later // Be Factory pattern later

8
cpp/src/wrapper/IndexBuilder.h
View File

@ -19,6 +19,12 @@ class IndexBuilder {
public: public:
explicit IndexBuilder(const Operand_ptr &opd); explicit IndexBuilder(const Operand_ptr &opd);
Index_ptr build_all(const long &nb,
const float* xb,
const long* ids,
const long &nt = 0,
const float* xt = nullptr);
Index_ptr build_all(const long &nb, Index_ptr build_all(const long &nb,
const std::vector<float> &xb, const std::vector<float> &xb,
const std::vector<long> &ids, const std::vector<long> &ids,
@ -47,5 +53,3 @@ extern IndexBuilderPtr GetIndexBuilder(const Operand_ptr &opd);
} }
} }
} }