summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2020-01-29 11:53:42 +0100
committerGitHub <noreply@github.com>2020-01-29 11:53:42 +0100
commitff2010ffd3c15c5518dbc9276cbc7b24cde77879 (patch)
tree434868fbed3a01383ce2b0bf4c7dce34807bdb33
parent4eeb091570fe9180b9cc7297105f926caaceec61 (diff)
parent5e7b05097f46c6a8efb6f90a02a1997e615deaf8 (diff)
Merge pull request #11995 from vespa-engine/toregge/fix-format-strings
Fix format strings.
-rw-r--r--eval/src/tests/ann/xp-annoy-nns.cpp11
-rw-r--r--eval/src/tests/ann/xp-hnswlike-nns.cpp15
2 files changed, 14 insertions, 12 deletions
diff --git a/eval/src/tests/ann/xp-annoy-nns.cpp b/eval/src/tests/ann/xp-annoy-nns.cpp
index 45392084c80..c34f9f6eb36 100644
--- a/eval/src/tests/ann/xp-annoy-nns.cpp
+++ b/eval/src/tests/ann/xp-annoy-nns.cpp
@@ -3,6 +3,7 @@
#include "nns.h"
#include "std-random.h"
#include <assert.h>
+#include <cinttypes>
#include <algorithm>
#include <queue>
#include <set>
@@ -389,11 +390,11 @@ AnnoyLikeNns::topK(uint32_t k, Vector vector, uint32_t search_k)
void
AnnoyLikeNns::dumpStats() {
fprintf(stderr, "stats for AnnoyLikeNns:\n");
- fprintf(stderr, "planeDistance() calls: %zu\n", plane_dist_cnt);
- fprintf(stderr, "weightedDistance() calls: %zu\n", w_cen_dist_cnt);
- fprintf(stderr, "leaf split() calls: %zu\n", leaf_split_cnt);
- fprintf(stderr, "topK() calls: %zu\n", find_top_k_cnt);
- fprintf(stderr, "findCandidates() calls: %zu\n", find_cand_cnt);
+ fprintf(stderr, "planeDistance() calls: %" PRIu64 "\n", plane_dist_cnt);
+ fprintf(stderr, "weightedDistance() calls: %" PRIu64 "\n", w_cen_dist_cnt);
+ fprintf(stderr, "leaf split() calls: %" PRIu64 "\n", leaf_split_cnt);
+ fprintf(stderr, "topK() calls: %" PRIu64 "\n", find_top_k_cnt);
+ fprintf(stderr, "findCandidates() calls: %" PRIu64 "\n", find_cand_cnt);
std::vector<uint32_t> depths;
_roots[0]->stats(depths);
std::vector<uint32_t> counts;
diff --git a/eval/src/tests/ann/xp-hnswlike-nns.cpp b/eval/src/tests/ann/xp-hnswlike-nns.cpp
index 5ab6bd4bdaf..72b3fdb21f9 100644
--- a/eval/src/tests/ann/xp-hnswlike-nns.cpp
+++ b/eval/src/tests/ann/xp-hnswlike-nns.cpp
@@ -3,6 +3,7 @@
#include <algorithm>
#include <assert.h>
#include <queue>
+#include <cinttypes>
#include "std-random.h"
#include "nns.h"
@@ -243,13 +244,13 @@ public:
if (_nodes.size() % 10000 == 0) {
double div = _nodes.size();
fprintf(stderr, "added docs: %d\n", (int)div);
- fprintf(stderr, "distance calls for layer: %zu is %.3f per doc\n", distcalls_search_layer, distcalls_search_layer/ div);
- fprintf(stderr, "distance calls for heuristic: %zu is %.3f per doc\n", distcalls_heuristic, distcalls_heuristic / div);
- fprintf(stderr, "distance calls for simple: %zu is %.3f per doc\n", distcalls_simple, distcalls_simple / div);
- fprintf(stderr, "distance calls for shrink: %zu is %.3f per doc\n", distcalls_shrink, distcalls_shrink / div);
- fprintf(stderr, "distance calls for refill: %zu is %.3f per doc\n", distcalls_refill, distcalls_refill / div);
- fprintf(stderr, "distance calls for other: %zu is %.3f per doc\n", distcalls_other, distcalls_other / div);
- fprintf(stderr, "refill needed calls: %zu is %.3f per doc\n", refill_needed_calls, refill_needed_calls / div);
+ fprintf(stderr, "distance calls for layer: %" PRIu64 " is %.3f per doc\n", distcalls_search_layer, distcalls_search_layer/ div);
+ fprintf(stderr, "distance calls for heuristic: %" PRIu64 " is %.3f per doc\n", distcalls_heuristic, distcalls_heuristic / div);
+ fprintf(stderr, "distance calls for simple: %" PRIu64 " is %.3f per doc\n", distcalls_simple, distcalls_simple / div);
+ fprintf(stderr, "distance calls for shrink: %" PRIu64 " is %.3f per doc\n", distcalls_shrink, distcalls_shrink / div);
+ fprintf(stderr, "distance calls for refill: %" PRIu64 " is %.3f per doc\n", distcalls_refill, distcalls_refill / div);
+ fprintf(stderr, "distance calls for other: %" PRIu64 " is %.3f per doc\n", distcalls_other, distcalls_other / div);
+ fprintf(stderr, "refill needed calls: %" PRIu64 " is %.3f per doc\n", refill_needed_calls, refill_needed_calls / div);
}
}