aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2020-02-27 14:05:38 +0000
committerArne Juul <arnej@verizonmedia.com>2020-02-27 14:05:56 +0000
commitd11992e1a63cac289a6fe28e97565f60d42fdbab (patch)
tree793c79734b8cbbb5355a3a7d4ab7093e6d5a3886
parentccc613e98f3b2cd0f69cb48715646c7093da8134 (diff)
using NUM_DOCS is wrong for remove benchmark, use EFFECTIVE_DOCS
-rw-r--r--eval/src/tests/ann/bruteforce-nns.h4
-rw-r--r--eval/src/tests/ann/gist_benchmark.cpp1
-rw-r--r--eval/src/tests/ann/sift_benchmark.cpp1
3 files changed, 4 insertions, 2 deletions
diff --git a/eval/src/tests/ann/bruteforce-nns.h b/eval/src/tests/ann/bruteforce-nns.h
index 0c7c48654f7..ecac73c0d10 100644
--- a/eval/src/tests/ann/bruteforce-nns.h
+++ b/eval/src/tests/ann/bruteforce-nns.h
@@ -47,7 +47,7 @@ public:
TopK bruteforce_nns(const PointVector &query) {
TopK result;
BfHitHeap heap(result.K);
- for (uint32_t docid = 0; docid < NUM_DOCS; ++docid) {
+ for (uint32_t docid = 0; docid < EFFECTIVE_DOCS; ++docid) {
const PointVector &docvector = generatedDocs[docid];
double d = l2distCalc.l2sq_dist(query, docvector);
Hit h(docid, d);
@@ -64,7 +64,7 @@ void verifyBF(uint32_t qid) {
const PointVector &query = generatedQueries[qid];
TopK &result = bruteforceResults[qid];
double min_distance = result.hits[0].distance;
- for (uint32_t i = 0; i < NUM_DOCS; ++i) {
+ for (uint32_t i = 0; i < EFFECTIVE_DOCS; ++i) {
double dist = computeDistance(query, i);
if (dist < min_distance) {
fprintf(stderr, "WARN dist %.9g < mindist %.9g\n", dist, min_distance);
diff --git a/eval/src/tests/ann/gist_benchmark.cpp b/eval/src/tests/ann/gist_benchmark.cpp
index de8bff877e6..5a317e77e72 100644
--- a/eval/src/tests/ann/gist_benchmark.cpp
+++ b/eval/src/tests/ann/gist_benchmark.cpp
@@ -11,6 +11,7 @@
#define NUM_DIMS 960
#define NUM_DOCS 200000
+#define EFFECTIVE_DOCS NUM_DOCS
#define NUM_REACH 10000
#define NUM_Q 1000
diff --git a/eval/src/tests/ann/sift_benchmark.cpp b/eval/src/tests/ann/sift_benchmark.cpp
index b2fa66cd0f1..4bbe8f61ef1 100644
--- a/eval/src/tests/ann/sift_benchmark.cpp
+++ b/eval/src/tests/ann/sift_benchmark.cpp
@@ -12,6 +12,7 @@
#define NUM_DIMS 128
#define NUM_DOCS 1000000
+#define EFFECTIVE_DOCS NUM_DOCS
#define NUM_Q 1000
#define NUM_REACH 10000