admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-01 16:35:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

#331 update clang-format

Browse Source
This commit is contained in:
yudong.cai 2019-11-29 14:40:42 +08:00
parent 3a0cc24d57
commit 3af4da6d52
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,7 @@ GPUIVF::search_impl(int64_t n, const float* data, int64_t k, float* distances, i
if (auto device_index = std::dynamic_pointer_cast<faiss::gpu::GpuIndexIVF>(index_)) {
auto search_cfg = std::dynamic_pointer_cast<IVFCfg>(cfg);
device_index->nprobe = search_cfg->nprobe;
//assert(device_index->getNumProbes() == search_cfg->nprobe);
// assert(device_index->getNumProbes() == search_cfg->nprobe);
ResScope rs(res_, gpu_id_);
device_index->search(n, (float*)data, k, distances, labels);
} else {

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

@ -121,10 +121,10 @@ IVF::Search(const DatasetPtr& dataset, const Config& config) {
try {
auto elems = rows * search_cfg->k;
auto res_ids = (int64_t *) malloc(sizeof(int64_t) * elems);
auto res_dis = (float *) malloc(sizeof(float) * elems);
auto res_ids = (int64_t*)malloc(sizeof(int64_t) * elems);
auto res_dis = (float*)malloc(sizeof(float) * elems);
search_impl(rows, (float *) p_data, search_cfg->k, res_dis, res_ids, config);
search_impl(rows, (float*)p_data, search_cfg->k, res_dis, res_ids, config);
// std::stringstream ss_res_id, ss_res_dist;
// for (int i = 0; i < 10; ++i) {
@ -155,8 +155,7 @@ IVF::Search(const DatasetPtr& dataset, const Config& config) {
// auto dists = std::make_shared<NumericArray<arrow::FloatType>>(dist_array_data);
// std::vector<ArrayPtr> array{ids, dists};
return std::make_shared<Dataset>((void *) res_ids, (void *) res_dis);
return std::make_shared<Dataset>((void*)res_ids, (void*)res_dis);
} catch (faiss::FaissException& e) {
KNOWHERE_THROW_MSG(e.what());
} catch (std::exception& e) {