admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-29 06:55:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

review change

Browse Source
This commit is contained in:
xiaojun.lin 2019-11-25 16:44:00 +08:00
parent 6546bf5af8
commit 651b05a06d
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/src/index/knowhere/knowhere/common/Timer.cpp
View File

@ -18,6 +18,7 @@
#include <iostream> // TODO(linxj): using Log instead
#include "knowhere/common/Timer.h"
#include "knowhere/common/Log.h"
namespace knowhere {
@ -51,30 +52,18 @@ TimeRecorder::PrintTimeRecord(const std::string& msg, double span) {
std::cout << str_log << std::endl;
break;
}
// case 1: {
// SERVER_LOG_DEBUG << str_log;
// break;
//}
// case 2: {
// SERVER_LOG_INFO << str_log;
// break;
//}
// case 3: {
// SERVER_LOG_WARNING << str_log;
// break;
//}
// case 4: {
// SERVER_LOG_ERROR << str_log;
// break;
//}
// case 5: {
// SERVER_LOG_FATAL << str_log;
// break;
//}
// default: {
// SERVER_LOG_INFO << str_log;
// break;
//}
case 1: {
KNOWHERE_LOG_DEBUG << str_log;
break;
}
// case 2: {
// KNOWHERE_LOG_TRACE << str_log;
// break;
// }
// case 3: {
// KNOWHERE_LOG_WARNING << str_log;
// break;
// }
}
}

4
core/src/index/knowhere/knowhere/index/vector_index/nsg/NSG.cpp
View File

@ -719,7 +719,7 @@ NsgIndex::Search(const float* query, const unsigned& nq, const unsigned& dim, co
std::vector<std::vector<Neighbor>> resset(nq);
params.search_length = k;
TimeRecorder rc("search");
TimeRecorder rc("NsgIndex::search", 1);
// TODO(linxj): when to use openmp
if (nq <= 4) {
GetNeighbors(query, resset[0], nsg, &params);
@ -730,7 +730,7 @@ NsgIndex::Search(const float* query, const unsigned& nq, const unsigned& dim, co
GetNeighbors(single_query, resset[i], nsg, &params);
}
}
rc.RecordSection("cost");
rc.RecordSection("search");
for (unsigned int i = 0; i < nq; ++i) {
int64_t var = resset[i].size() - k;
if (var >= 0) {