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

fix MapOffsetToUid (#4493) 

Signed-off-by: shengjun.li <shengjun.li@zilliz.com>
pull/4503/head
shengjun.li 2020-12-23 10:22:09 +08:00 committed by GitHub
parent 705e5cde8e
commit f9222da52b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/index/knowhere/knowhere/index/vector_index/IndexBinaryIDMAP.cpp
View File

@ -51,6 +51,8 @@ BinaryIDMAP::Query(const DatasetPtr& dataset_ptr, const Config& config) {
auto p_dist = (float*)malloc(p_dist_size);
QueryImpl(rows, (uint8_t*)p_data, k, p_dist, p_id, config);
MapOffsetToUid(p_id, static_cast<size_t>(elems));
auto ret_ds = std::make_shared<Dataset>();
ret_ds->Set(meta::IDS, p_id);
ret_ds->Set(meta::DISTANCE, p_dist);
@ -122,8 +124,6 @@ BinaryIDMAP::QueryImpl(int64_t n, const uint8_t* data, int64_t k, float* distanc
}
index_->metric_type = default_type;
MapOffsetToUid(labels, static_cast<size_t>(n * k));
}
} // namespace knowhere

3
core/src/index/knowhere/knowhere/index/vector_index/IndexBinaryIVF.cpp
View File

@ -58,6 +58,7 @@ BinaryIVF::Query(const DatasetPtr& dataset_ptr, const Config& config) {
auto p_dist = (float*)malloc(p_dist_size);
QueryImpl(rows, (uint8_t*)p_data, k, p_dist, p_id, config);
MapOffsetToUid(p_id, static_cast<size_t>(elems));
auto ret_ds = std::make_shared<Dataset>();
ret_ds->Set(meta::IDS, p_id);
@ -187,8 +188,6 @@ BinaryIVF::QueryImpl(int64_t n, const uint8_t* data, int64_t k, float* distances
distances[i] = static_cast<float>(i_distances[i]);
}
}
MapOffsetToUid(labels, static_cast<size_t>(n * k));
}
} // namespace knowhere

4
core/src/index/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp
View File

@ -82,6 +82,8 @@ IDMAP::Query(const DatasetPtr& dataset_ptr, const Config& config) {
auto p_dist = (float*)malloc(p_dist_size);
QueryImpl(rows, (float*)p_data, k, p_dist, p_id, config);
MapOffsetToUid(p_id, static_cast<size_t>(elems));
auto ret_ds = std::make_shared<Dataset>();
ret_ds->Set(meta::IDS, p_id);
ret_ds->Set(meta::DISTANCE, p_dist);
@ -139,8 +141,6 @@ IDMAP::QueryImpl(int64_t n, const float* data, int64_t k, float* distances, int6
index_->metric_type = GetMetricType(config[Metric::TYPE].get<std::string>());
index_->search(n, (float*)data, k, distances, labels, GetBlacklist());
index_->metric_type = default_type;
MapOffsetToUid(labels, static_cast<size_t>(n * k));
}
} // namespace knowhere

3
core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.cpp
View File

@ -104,6 +104,7 @@ IVF::Query(const DatasetPtr& dataset_ptr, const Config& config) {
auto p_dist = (float*)malloc(p_dist_size);
QueryImpl(rows, (float*)p_data, k, p_dist, p_id, config);
MapOffsetToUid(p_id, static_cast<size_t>(elems));
auto ret_ds = std::make_shared<Dataset>();
ret_ds->Set(meta::IDS, p_id);
@ -311,8 +312,6 @@ IVF::QueryImpl(int64_t n, const float* data, int64_t k, float* distances, int64_
<< ", data search cost: " << faiss::indexIVF_stats.search_time;
faiss::indexIVF_stats.quantization_time = 0;
faiss::indexIVF_stats.search_time = 0;
MapOffsetToUid(labels, static_cast<size_t>(n * k));
}
void

2
core/src/index/knowhere/knowhere/index/vector_index/gpu/IndexGPUIDMAP.cpp
View File

@ -105,8 +105,6 @@ GPUIDMAP::QueryImpl(int64_t n, const float* data, int64_t k, float* distances, i
index_->metric_type = GetMetricType(config[Metric::TYPE].get<std::string>());
index_->search(n, (float*)data, k, distances, labels, GetBlacklist());
index_->metric_type = default_type;
MapOffsetToUid(labels, static_cast<size_t>(n * k));
}
void

2
core/src/index/knowhere/knowhere/index/vector_index/gpu/IndexGPUIVF.cpp
View File

@ -148,8 +148,6 @@ GPUIVF::QueryImpl(int64_t n, const float* data, int64_t k, float* distances, int
device_index->search(search_size, (float*)data + i * dim, k, distances + i * k, labels + i * k,
GetBlacklist());
}
MapOffsetToUid(labels, static_cast<size_t>(n * k));
} else {
KNOWHERE_THROW_MSG("Not a GpuIndexIVF type.");
}

4
core/src/index/unittest/test_annoy.cpp
View File

@ -60,7 +60,7 @@ TEST_P(AnnoyTest, annoy_basic) {
ASSERT_ANY_THROW(index_->Dim());
}
index_->BuildAll(base_dataset, conf); // Train + Add
index_->BuildAll(base_dataset, conf); // Train + AddWithoutIds
ASSERT_EQ(index_->Count(), nb);
ASSERT_EQ(index_->Dim(), dim);
@ -94,7 +94,7 @@ TEST_P(AnnoyTest, annoy_basic) {
TEST_P(AnnoyTest, annoy_delete) {
assert(!xb.empty());
index_->BuildAll(base_dataset, conf); // Train + Add
index_->BuildAll(base_dataset, conf); // Train + AddWithoutIds
ASSERT_EQ(index_->Count(), nb);
ASSERT_EQ(index_->Dim(), dim);