From 07c31e86ff302cfd5b0d65fd4af296577d09a05d Mon Sep 17 00:00:00 2001 From: Mickael Ide Date: Mon, 31 Jul 2023 17:16:45 +0200 Subject: [PATCH] Update benchmark configuration --- cpp/bench/ann/conf/bigann-100M.json | 52 +- cpp/bench/ann/conf/deep-100M.json | 860 ++++++++++++++------- cpp/bench/ann/conf/sift-128-euclidean.json | 12 +- cpp/bench/ann/src/raft/raft_benchmark.cu | 2 +- scripts/ann-benchmarks/run.py | 8 +- 5 files changed, 618 insertions(+), 316 deletions(-) diff --git a/cpp/bench/ann/conf/bigann-100M.json b/cpp/bench/ann/conf/bigann-100M.json index 0ff7df4776..0e59936f0e 100644 --- a/cpp/bench/ann/conf/bigann-100M.json +++ b/cpp/bench/ann/conf/bigann-100M.json @@ -147,56 +147,56 @@ { - "name" : "ivf_flat.nlist100K", - "algo" : "ivf_flat", + "name" : "raft_ivf_flat.nlist100K", + "algo" : "raft_ivf_flat", "build_param": { "nlist" : 100000, "niter" : 25, "ratio" : 5 }, - "file" : "index/bigann-100M/ivf_flat/nlist100K", + "file" : "index/bigann-100M/raft_ivf_flat/nlist100K", "search_params" : [ - {"max_batch":10000, "max_k":10, "nprobe":20}, - {"max_batch":10000, "max_k":10, "nprobe":30}, - {"max_batch":10000, "max_k":10, "nprobe":40}, - {"max_batch":10000, "max_k":10, "nprobe":50}, - {"max_batch":10000, "max_k":10, "nprobe":100}, - {"max_batch":10000, "max_k":10, "nprobe":200}, - {"max_batch":10000, "max_k":10, "nprobe":500}, - {"max_batch":10000, "max_k":10, "nprobe":1000} + {"nprobe":20}, + {"nprobe":30}, + {"nprobe":40}, + {"nprobe":50}, + {"nprobe":100}, + {"nprobe":200}, + {"nprobe":500}, + {"nprobe":1000} ], - "search_result_file" : "result/bigann-100M/ivf_flat/nlist100K" + "search_result_file" : "result/bigann-100M/raft_ivf_flat/nlist100K" }, { - "name" : "cagra.dim32", - "algo" : "cagra", + "name" : "raft_cagra.dim32", + "algo" : "raft_cagra", "build_param": { "index_dim" : 32 }, - "file" : "index/bigann-100M/cagra/dim32", + "file" : "index/bigann-100M/raft_cagra/dim32", "search_params" : [ - "itopk": 32, - "itopk": 64, - "itopk": 128 + {"itopk": 32}, + {"itopk": 64}, + {"itopk": 128} ], - "search_result_file" : "result/bigann-100M/cagra/dim32" + "search_result_file" : "result/bigann-100M/raft_cagra/dim32" }, { - "name" : "cagra.dim64", - "algo" : "cagra", + "name" : "raft_cagra.dim64", + "algo" : "raft_cagra", "build_param": { "index_dim" : 64 }, - "file" : "index/bigann-100M/cagra/dim64", + "file" : "index/bigann-100M/raft_cagra/dim64", "search_params" : [ - "itopk": 32, - "itopk": 64, - "itopk": 128 + {"itopk": 32}, + {"itopk": 64}, + {"itopk": 128} ], - "search_result_file" : "result/bigann-100M/cagra/dim64" + "search_result_file" : "result/bigann-100M/raft_cagra/dim64" } ] } diff --git a/cpp/bench/ann/conf/deep-100M.json b/cpp/bench/ann/conf/deep-100M.json index 97d670b614..2f2ec92489 100644 --- a/cpp/bench/ann/conf/deep-100M.json +++ b/cpp/bench/ann/conf/deep-100M.json @@ -197,349 +197,653 @@ { - "name" : "ivf_flat.nlist100K", - "algo" : "ivf_flat", + "name" : "raft_ivf_flat.nlist10K", + "algo" : "raft_ivf_flat", + "build_param": { + "nlist" : 10000, + "niter" : 25, + "ratio" : 5 + }, + "file" : "index/deep-100M/raft_ivf_flat/nlist10K", + "search_params" : [ + {"nprobe":5}, + {"nprobe":10}, + {"nprobe":20}, + {"nprobe":30}, + {"nprobe":40}, + {"nprobe":50}, + {"nprobe":100}, + {"nprobe":200}, + {"nprobe":500}, + {"nprobe":1000} + ], + "search_result_file" : "result/deep-100M/raft_ivf_flat/nlist10K" + }, + { + "name" : "raft_ivf_flat.nlist100K", + "algo" : "raft_ivf_flat", "build_param": { "nlist" : 100000, "niter" : 25, "ratio" : 5 }, - "file" : "index/deep-100M/ivf_flat/nlist100K", + "file" : "index/deep-100M/raft_ivf_flat/nlist100K", + "search_params" : [ + {"nprobe":5}, + {"nprobe":10}, + {"nprobe":20}, + {"nprobe":30}, + {"nprobe":40}, + {"nprobe":50}, + {"nprobe":100}, + {"nprobe":200}, + {"nprobe":500}, + {"nprobe":1000} + ], + "search_result_file" : "result/deep-100M/raft_ivf_flat/nlist100K" + }, + + { + "name" : "raft_ivf_pq.nlist10K", + "algo" : "raft_ivf_pq", + "build_param": { + "nlist" : 10000, + "niter" : 25, + "ratio" : 5 + }, + "file" : "index/deep-100M/raft_ivf_pq/nlist10K", + "search_params" : [ + {"nprobe":3}, + {"nprobe":10}, + {"nprobe":20}, + {"nprobe":30}, + {"nprobe":40}, + {"nprobe":50}, + {"nprobe":100}, + {"nprobe":200}, + {"nprobe":500}, + {"nprobe":1000} + ], + "search_result_file" : "result/deep-100M/raft_ivf_pq/nlist10K" + }, + { + "name" : "raft_ivf_pq.nlist10Kdim64", + "algo" : "raft_ivf_pq", + "build_param": { + "nlist" : 10000, + "niter" : 25, + "ratio" : 5, + "pq_dim": 64 + }, + "file" : "index/deep-100M/raft_ivf_pq/nlist10Kdim64", + "search_params" : [ + {"nprobe":5}, + {"nprobe":10}, + {"nprobe":20}, + {"nprobe":30}, + {"nprobe":40}, + {"nprobe":50}, + {"nprobe":100}, + {"nprobe":200}, + {"nprobe":500}, + {"nprobe":1000} + ], + "search_result_file" : "result/deep-100M/raft_ivf_pq/nlist10Kdim64" + }, + { + "name" : "raft_ivf_pq.nlist10Kdim32", + "algo" : "raft_ivf_pq", + "build_param": { + "nlist" : 10000, + "niter" : 25, + "ratio" : 5, + "pq_dim": 32 + }, + "file" : "index/deep-100M/raft_ivf_pq/nlist10Kdim32", + "search_params" : [ + {"nprobe":5}, + {"nprobe":10}, + {"nprobe":20}, + {"nprobe":30}, + {"nprobe":40}, + {"nprobe":50}, + {"nprobe":100}, + {"nprobe":200}, + {"nprobe":500}, + {"nprobe":1000} + ], + "search_result_file" : "result/deep-100M/raft_ivf_pq/nlist10Kdim32" + }, + { + "name" : "raft_ivf_pq.nlist100K", + "algo" : "raft_ivf_pq", + "build_param": { + "nlist" : 100000, + "niter" : 25, + "ratio" : 5 + }, + "file" : "index/deep-100M/raft_ivf_pq/nlist100K", + "search_params" : [ + {"nprobe":5}, + {"nprobe":10}, + {"nprobe":20}, + {"nprobe":30}, + {"nprobe":40}, + {"nprobe":50}, + {"nprobe":100}, + {"nprobe":200}, + {"nprobe":500}, + {"nprobe":1000} + ], + "search_result_file" : "result/deep-100M/raft_ivf_pq/nlist100K" + }, + { + "name" : "raft_ivf_pq.nlist100Kdim64", + "algo" : "raft_ivf_pq", + "build_param": { + "nlist" : 100000, + "niter" : 25, + "ratio" : 5, + "pq_dim": 64 + }, + "file" : "index/deep-100M/raft_ivf_pq/nlist100Kdim64", + "search_params" : [ + {"nprobe":5}, + {"nprobe":10}, + {"nprobe":20}, + {"nprobe":30}, + {"nprobe":40}, + {"nprobe":50}, + {"nprobe":100}, + {"nprobe":200}, + {"nprobe":500}, + {"nprobe":1000} + ], + "search_result_file" : "result/deep-100M/raft_ivf_pq/nlist100Kdim64" + }, + { + "name" : "raft_ivf_pq.nlist100Kdim32", + "algo" : "raft_ivf_pq", + "build_param": { + "nlist" : 100000, + "niter" : 25, + "ratio" : 5, + "pq_dim": 32 + }, + "file" : "index/deep-100M/raft_ivf_pq/nlist100Kdim32", "search_params" : [ - {"max_batch":10000, "max_k":10, "nprobe":20}, - {"max_batch":10000, "max_k":10, "nprobe":30}, - {"max_batch":10000, "max_k":10, "nprobe":40}, - {"max_batch":10000, "max_k":10, "nprobe":50}, - {"max_batch":10000, "max_k":10, "nprobe":100}, - {"max_batch":10000, "max_k":10, "nprobe":200}, - {"max_batch":10000, "max_k":10, "nprobe":500}, - {"max_batch":10000, "max_k":10, "nprobe":1000} + {"nprobe":5}, + {"nprobe":10}, + {"nprobe":20}, + {"nprobe":30}, + {"nprobe":40}, + {"nprobe":50}, + {"nprobe":100}, + {"nprobe":200}, + {"nprobe":500}, + {"nprobe":1000} ], - "search_result_file" : "result/deep-100M/ivf_flat/nlist100K" + "search_result_file" : "result/deep-100M/raft_ivf_pq/nlist100Kdim32" }, { - "name" : "cagra.dim32", + "name" : "raft_cagra.dim32", "algo" : "raft_cagra", "build_param": { "index_dim": 32, "intermediate_graph_degree": 48 }, - "file": "index/deep-100M/cagra/dim32", - "search_params": [ - { - "itopk": 32, - "search_width": 1, - "max_iterations": 0, - "algo": "single_cta" - }, - { - "itopk": 32, - "search_width": 1, - "max_iterations": 32, - "algo": "single_cta" - }, - { - "itopk": 64, - "search_width": 4, - "max_iterations": 16, - "algo": "single_cta" - }, - { - "itopk": 64, - "search_width": 1, - "max_iterations": 64, - "algo": "single_cta" - }, - { - "itopk": 96, - "search_width": 2, - "max_iterations": 48, - "algo": "single_cta" - }, - { - "itopk": 128, - "search_width": 8, - "max_iterations": 16, - "algo": "single_cta" - }, - { - "itopk": 128, - "search_width": 2, - "max_iterations": 64, - "algo": "single_cta" - }, - { - "itopk": 192, - "search_width": 8, - "max_iterations": 24, - "algo": "single_cta" - }, - { - "itopk": 192, - "search_width": 2, - "max_iterations": 96, - "algo": "single_cta" - }, - { - "itopk": 256, - "search_width": 8, - "max_iterations": 32, - "algo": "single_cta" - }, - { - "itopk": 384, - "search_width": 8, - "max_iterations": 48, - "algo": "single_cta" - }, - { - "itopk": 512, - "search_width": 8, - "max_iterations": 64, - "algo": "single_cta" - } - ], - "search_result_file": "result/deep-100M/cagra/dim32" - }, - { - "name": "cagra.dim32.multi_cta", - "algo": "raft_cagra", - "build_param": { - "index_dim": 32, - "intermediate_graph_degree": 48 - }, - "file": "index/deep-100M/cagra/dim32", - "search_params": [ - { - "itopk": 32, - "search_width": 1, - "max_iterations": 0, - "algo": "multi_cta" - }, - { - "itopk": 32, - "search_width": 1, - "max_iterations": 32, - "algo": "multi_cta" - }, - { - "itopk": 64, - "search_width": 4, - "max_iterations": 16, - "algo": "multi_cta" - }, - { - "itopk": 64, - "search_width": 1, - "max_iterations": 64, - "algo": "multi_cta" - }, - { - "itopk": 96, - "search_width": 2, - "max_iterations": 48, - "algo": "multi_cta" - }, - { - "itopk": 128, - "search_width": 8, - "max_iterations": 16, - "algo": "multi_cta" - }, - { - "itopk": 128, - "search_width": 2, - "max_iterations": 64, - "algo": "multi_cta" - }, - { - "itopk": 192, - "search_width": 8, - "max_iterations": 24, - "algo": "multi_cta" - }, - { - "itopk": 192, - "search_width": 2, - "max_iterations": 96, - "algo": "multi_cta" - }, - { - "itopk": 256, - "search_width": 8, - "max_iterations": 32, - "algo": "multi_cta" - }, - { - "itopk": 384, - "search_width": 8, - "max_iterations": 48, - "algo": "multi_cta" - }, - { - "itopk": 512, - "search_width": 8, - "max_iterations": 64, - "algo": "multi_cta" - } - ], - "search_result_file": "result/deep-100M/cagra/dim32_multi_cta" - }, - { - "name": "cagra.dim32.multi_kernel", - "algo": "raft_cagra", - "build_param": { - "index_dim": 32, - "intermediate_graph_degree": 48 - }, - "file": "index/deep-100M/cagra/dim32", - "search_params": [ - { - "itopk": 32, - "search_width": 1, - "max_iterations": 0, - "algo": "multi_kernel" - }, - { - "itopk": 32, - "search_width": 1, - "max_iterations": 32, - "algo": "multi_kernel" - }, - { - "itopk": 64, - "search_width": 4, - "max_iterations": 16, - "algo": "multi_kernel" - }, - { - "itopk": 64, - "search_width": 1, - "max_iterations": 64, - "algo": "multi_kernel" - }, - { - "itopk": 96, - "search_width": 2, - "max_iterations": 48, - "algo": "multi_kernel" - }, - { - "itopk": 128, - "search_width": 8, - "max_iterations": 16, - "algo": "multi_kernel" - }, - { - "itopk": 128, - "search_width": 2, - "max_iterations": 64, - "algo": "multi_kernel" - }, - { - "itopk": 192, - "search_width": 8, - "max_iterations": 24, - "algo": "multi_kernel" - }, - { - "itopk": 192, - "search_width": 2, - "max_iterations": 96, - "algo": "multi_kernel" - }, - { - "itopk": 256, - "search_width": 8, - "max_iterations": 32, - "algo": "multi_kernel" - }, - { - "itopk": 384, - "search_width": 8, - "max_iterations": 48, - "algo": "multi_kernel" - }, - { - "itopk": 512, - "search_width": 8, - "max_iterations": 64, - "algo": "multi_kernel" - } - ], - "search_result_file": "result/deep-100M/cagra/dim32_multi_kernel" - }, - { - "name": "cagra.dim64", - "algo": "raft_cagra", - "build_param": { - "index_dim": 64 - }, - "file": "index/deep-100M/cagra/dim64", + "file": "index/deep-100M/raft_cagra/dim32", "search_params" : [ { "itopk": 32, "search_width": 1, - "max_iterations": 0 + "max_iterations": 0, + "algo": "single_cta" + }, + { + "itopk": 32, + "search_width": 1, + "max_iterations": 32, + "algo": "single_cta" + }, + { + "itopk": 64, + "search_width": 4, + "max_iterations": 16, + "algo": "single_cta" + }, + { + "itopk": 64, + "search_width": 1, + "max_iterations": 64, + "algo": "single_cta" + }, + { + "itopk": 96, + "search_width": 2, + "max_iterations": 48, + "algo": "single_cta" + }, + { + "itopk": 128, + "search_width": 8, + "max_iterations": 16, + "algo": "single_cta" + }, + { + "itopk": 128, + "search_width": 2, + "max_iterations": 64, + "algo": "single_cta" + }, + { + "itopk": 192, + "search_width": 8, + "max_iterations": 24, + "algo": "single_cta" + }, + { + "itopk": 192, + "search_width": 2, + "max_iterations": 96, + "algo": "single_cta" + }, + { + "itopk": 256, + "search_width": 8, + "max_iterations": 32, + "algo": "single_cta" + }, + { + "itopk": 384, + "search_width": 8, + "max_iterations": 48, + "algo": "single_cta" + }, + { + "itopk": 512, + "search_width": 8, + "max_iterations": 64, + "algo": "single_cta" + }, + + { + "itopk": 32, + "search_width": 1, + "max_iterations": 0, + "algo": "multi_cta" + }, + { + "itopk": 32, + "search_width": 1, + "max_iterations": 32, + "algo": "multi_cta" + }, + { + "itopk": 64, + "search_width": 4, + "max_iterations": 16, + "algo": "multi_cta" + }, + { + "itopk": 64, + "search_width": 1, + "max_iterations": 64, + "algo": "multi_cta" + }, + { + "itopk": 96, + "search_width": 2, + "max_iterations": 48, + "algo": "multi_cta" + }, + { + "itopk": 128, + "search_width": 8, + "max_iterations": 16, + "algo": "multi_cta" + }, + { + "itopk": 128, + "search_width": 2, + "max_iterations": 64, + "algo": "multi_cta" + }, + { + "itopk": 192, + "search_width": 8, + "max_iterations": 24, + "algo": "multi_cta" + }, + { + "itopk": 192, + "search_width": 2, + "max_iterations": 96, + "algo": "multi_cta" + }, + { + "itopk": 256, + "search_width": 8, + "max_iterations": 32, + "algo": "multi_cta" + }, + { + "itopk": 384, + "search_width": 8, + "max_iterations": 48, + "algo": "multi_cta" + }, + { + "itopk": 512, + "search_width": 8, + "max_iterations": 64, + "algo": "multi_cta" + }, + + { + "itopk": 32, + "search_width": 1, + "max_iterations": 0, + "algo": "multi_kernel" + }, + { + "itopk": 32, + "search_width": 1, + "max_iterations": 32, + "algo": "multi_kernel" + }, + { + "itopk": 64, + "search_width": 4, + "max_iterations": 16, + "algo": "multi_kernel" + }, + { + "itopk": 64, + "search_width": 1, + "max_iterations": 64, + "algo": "multi_kernel" + }, + { + "itopk": 96, + "search_width": 2, + "max_iterations": 48, + "algo": "multi_kernel" + }, + { + "itopk": 128, + "search_width": 8, + "max_iterations": 16, + "algo": "multi_kernel" + }, + { + "itopk": 128, + "search_width": 2, + "max_iterations": 64, + "algo": "multi_kernel" + }, + { + "itopk": 192, + "search_width": 8, + "max_iterations": 24, + "algo": "multi_kernel" + }, + { + "itopk": 192, + "search_width": 2, + "max_iterations": 96, + "algo": "multi_kernel" + }, + { + "itopk": 256, + "search_width": 8, + "max_iterations": 32, + "algo": "multi_kernel" + }, + { + "itopk": 384, + "search_width": 8, + "max_iterations": 48, + "algo": "multi_kernel" + }, + { + "itopk": 512, + "search_width": 8, + "max_iterations": 64, + "algo": "multi_kernel" + } + ], + "search_result_file": "result/deep-100M/raft_cagra/dim32" + }, + { + "name" : "raft_cagra.dim64", + "algo" : "raft_cagra", + "build_param": { + "index_dim": 64 + }, + "file": "index/deep-100M/raft_cagra/dim64", + "search_params" : [ + { + "itopk": 32, + "search_width": 1, + "max_iterations": 0, + "algo": "single_cta" + }, + { + "itopk": 32, + "search_width": 1, + "max_iterations": 32, + "algo": "single_cta" + }, + { + "itopk": 64, + "search_width": 4, + "max_iterations": 16, + "algo": "single_cta" + }, + { + "itopk": 64, + "search_width": 1, + "max_iterations": 64, + "algo": "single_cta" + }, + { + "itopk": 96, + "search_width": 2, + "max_iterations": 48, + "algo": "single_cta" + }, + { + "itopk": 128, + "search_width": 8, + "max_iterations": 16, + "algo": "single_cta" + }, + { + "itopk": 128, + "search_width": 2, + "max_iterations": 64, + "algo": "single_cta" + }, + { + "itopk": 192, + "search_width": 8, + "max_iterations": 24, + "algo": "single_cta" + }, + { + "itopk": 192, + "search_width": 2, + "max_iterations": 96, + "algo": "single_cta" + }, + { + "itopk": 256, + "search_width": 8, + "max_iterations": 32, + "algo": "single_cta" + }, + { + "itopk": 384, + "search_width": 8, + "max_iterations": 48, + "algo": "single_cta" + }, + { + "itopk": 512, + "search_width": 8, + "max_iterations": 64, + "algo": "single_cta" + }, + + { + "itopk": 32, + "search_width": 1, + "max_iterations": 0, + "algo": "multi_cta" + }, + { + "itopk": 32, + "search_width": 1, + "max_iterations": 32, + "algo": "multi_cta" + }, + { + "itopk": 64, + "search_width": 4, + "max_iterations": 16, + "algo": "multi_cta" + }, + { + "itopk": 64, + "search_width": 1, + "max_iterations": 64, + "algo": "multi_cta" + }, + { + "itopk": 96, + "search_width": 2, + "max_iterations": 48, + "algo": "multi_cta" + }, + { + "itopk": 128, + "search_width": 8, + "max_iterations": 16, + "algo": "multi_cta" + }, + { + "itopk": 128, + "search_width": 2, + "max_iterations": 64, + "algo": "multi_cta" + }, + { + "itopk": 192, + "search_width": 8, + "max_iterations": 24, + "algo": "multi_cta" + }, + { + "itopk": 192, + "search_width": 2, + "max_iterations": 96, + "algo": "multi_cta" + }, + { + "itopk": 256, + "search_width": 8, + "max_iterations": 32, + "algo": "multi_cta" + }, + { + "itopk": 384, + "search_width": 8, + "max_iterations": 48, + "algo": "multi_cta" + }, + { + "itopk": 512, + "search_width": 8, + "max_iterations": 64, + "algo": "multi_cta" + }, + + { + "itopk": 32, + "search_width": 1, + "max_iterations": 0, + "algo": "multi_kernel" }, { "itopk": 32, "search_width": 1, - "max_iterations": 32 + "max_iterations": 32, + "algo": "multi_kernel" }, { "itopk": 64, "search_width": 4, - "max_iterations": 16 + "max_iterations": 16, + "algo": "multi_kernel" }, { "itopk": 64, "search_width": 1, - "max_iterations": 64 + "max_iterations": 64, + "algo": "multi_kernel" }, { "itopk": 96, "search_width": 2, - "max_iterations": 48 + "max_iterations": 48, + "algo": "multi_kernel" }, { "itopk": 128, "search_width": 8, - "max_iterations": 16 + "max_iterations": 16, + "algo": "multi_kernel" }, { "itopk": 128, "search_width": 2, - "max_iterations": 64 + "max_iterations": 64, + "algo": "multi_kernel" }, { "itopk": 192, "search_width": 8, - "max_iterations": 24 + "max_iterations": 24, + "algo": "multi_kernel" }, { "itopk": 192, "search_width": 2, - "max_iterations": 96 + "max_iterations": 96, + "algo": "multi_kernel" }, { "itopk": 256, "search_width": 8, - "max_iterations": 32 + "max_iterations": 32, + "algo": "multi_kernel" }, { "itopk": 384, "search_width": 8, - "max_iterations": 48 + "max_iterations": 48, + "algo": "multi_kernel" }, { "itopk": 512, "search_width": 8, - "max_iterations": 64 + "max_iterations": 64, + "algo": "multi_kernel" } ], - "search_result_file" : "result/deep-100M/cagra/dim32" + "search_result_file": "result/deep-100M/raft_cagra/dim64" } ] } diff --git a/cpp/bench/ann/conf/sift-128-euclidean.json b/cpp/bench/ann/conf/sift-128-euclidean.json index 98983fd62e..c4b8905b1d 100644 --- a/cpp/bench/ann/conf/sift-128-euclidean.json +++ b/cpp/bench/ann/conf/sift-128-euclidean.json @@ -1319,33 +1319,33 @@ }, { - "name" : "cagra.dim32", + "name" : "raft_cagra.dim32", "algo" : "raft_cagra", "build_param": { "index_dim" : 32 }, - "file" : "index/sift-128-euclidean/cagra/dim32", + "file" : "index/sift-128-euclidean/raft_cagra/dim32", "search_params" : [ {"itopk": 32}, {"itopk": 64}, {"itopk": 128} ], - "search_result_file" : "result/sift-128-euclidean/cagra/dim32" + "search_result_file" : "result/sift-128-euclidean/raft_cagra/dim32" }, { - "name" : "cagra.dim64", + "name" : "raft_cagra.dim64", "algo" : "raft_cagra", "build_param": { "index_dim" : 64 }, - "file" : "index/sift-128-euclidean/cagra/dim64", + "file" : "index/sift-128-euclidean/raft_cagra/dim64", "search_params" : [ {"itopk": 32}, {"itopk": 64}, {"itopk": 128} ], - "search_result_file" : "result/sift-128-euclidean/cagra/dim64" + "search_result_file" : "result/sift-128-euclidean/raft_cagra/dim64" } ] } diff --git a/cpp/bench/ann/src/raft/raft_benchmark.cu b/cpp/bench/ann/src/raft/raft_benchmark.cu index dcc4ae18be..aa055db750 100644 --- a/cpp/bench/ann/src/raft/raft_benchmark.cu +++ b/cpp/bench/ann/src/raft/raft_benchmark.cu @@ -88,7 +88,7 @@ template void parse_search_param(const nlohmann::json& conf, typename raft::bench::ann::RaftIvfPQ::SearchParam& param) { - param.pq_param.n_probes = conf.at("numProbes"); + param.pq_param.n_probes = conf.at("nprobe"); if (conf.contains("internalDistanceDtype")) { std::string type = conf.at("internalDistanceDtype"); if (type == "float") { diff --git a/scripts/ann-benchmarks/run.py b/scripts/ann-benchmarks/run.py index e2236dce81..e906b26e23 100644 --- a/scripts/ann-benchmarks/run.py +++ b/scripts/ann-benchmarks/run.py @@ -104,7 +104,7 @@ def main(): help="run only comma separated list of named indices. \ parameter `algorithms` is ignored", default=None) - parser.add_argument("--force", + parser.add_argument("-f", "--force", help="re-run algorithms even if their results \ already exist", action="store_true") @@ -117,10 +117,8 @@ def main(): build = True search = True else: - if args.build: - build = args.build - if args.search: - search = args.search + build = args.build + search = args.search # Read configuration file associated to dataset conf_filepath = args.configuration