Merge branch 'branch-0.3.0' into 'branch-0.3.1'

Update faiss parameter

See merge request megasearch/milvus!146

Former-commit-id: 5dca72d958dd89ace538540338dab91bf95eb2f3
This commit is contained in:
jinhai 2019-07-02 15:09:00 +08:00
commit 4672a9e045
2 changed files with 5 additions and 1 deletions

View File

@ -13,6 +13,7 @@
#include "Index.h"
#include "faiss/index_io.h"
#include "faiss/IndexIVF.h"
namespace zilliz {
namespace milvus {
@ -55,6 +56,9 @@ bool Index::add_with_ids(idx_t n, const float *xdata, const long *xids) {
bool Index::search(idx_t n, const float *data, idx_t k, float *distances, long *labels) const {
try {
if(auto ivf_index = std::dynamic_pointer_cast<faiss::IndexIVF>(index_)) {
ivf_index->nprobe = 100;
}
index_->search(n, data, k, distances, labels);
}
catch (std::exception &e) {

View File

@ -39,7 +39,7 @@ string Operand::get_index_type(const int &nb) {
}
case IVF: {
index_str += (ncent != 0 ? index_type + std::to_string(ncent) :
index_type + std::to_string(int(nb / 1000000.0 * 16384)));
index_type + std::to_string(int(nb / 1000000.0 * 1638)));
break;
}
case IDMAP: {