Skip to content

Commit

Permalink
Merge branch 'branch-23.12' into fix_ann_bench_doc
Browse files Browse the repository at this point in the history
  • Loading branch information
@tfeher
tfeher authored Oct 17, 2023
2 parents c0dcdfa + f7835fa commit 2e5c282
Show file tree
Hide file tree
Showing 15 changed files with 743 additions and 723 deletions.
346 changes: 183 additions & 163 deletions docs/source/raft_ann_benchmarks.md
View file

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions python/raft-ann-bench/src/raft-ann-bench/run/conf/bigann-100M.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@
"build_param": {"M":12, "efConstruction":500, "numThreads":32},
"file": "bigann-100M/hnswlib/M12",
"search_params": [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
]
},
{
Expand All @@ -102,16 +102,16 @@
"build_param": {"M":16, "efConstruction":500, "numThreads":32},
"file": "bigann-100M/hnswlib/M16",
"search_params": [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
]
},
{
Expand All @@ -120,16 +120,16 @@
"build_param": {"M":24, "efConstruction":500, "numThreads":32},
"file": "bigann-100M/hnswlib/M24",
"search_params": [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
]
},
{
Expand All @@ -138,16 +138,16 @@
"build_param": {"M":36, "efConstruction":500, "numThreads":32},
"file": "bigann-100M/hnswlib/M36",
"search_params": [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
]
},
{
Expand Down
80 changes: 40 additions & 40 deletions python/raft-ann-bench/src/raft-ann-bench/run/conf/deep-100M.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
"build_param": {"M":12, "efConstruction":500, "numThreads":32},
"file": "deep-100M/hnswlib/M12",
"search_params": [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
]
},
{
Expand All @@ -38,16 +38,16 @@
"build_param": {"M":16, "efConstruction":500, "numThreads":32},
"file": "deep-100M/hnswlib/M16",
"search_params": [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
]
},
{
Expand All @@ -56,16 +56,16 @@
"build_param": {"M":24, "efConstruction":500, "numThreads":32},
"file": "deep-100M/hnswlib/M24",
"search_params": [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
]
},
{
Expand All @@ -74,16 +74,16 @@
"build_param": {"M":36, "efConstruction":500, "numThreads":32},
"file": "deep-100M/hnswlib/M36",
"search_params": [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
]
},
{
Expand Down
80 changes: 40 additions & 40 deletions python/raft-ann-bench/src/raft-ann-bench/run/conf/deep-image-96-inner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
"build_param": {"M":12, "efConstruction":500, "numThreads":32},
"file" : "index/deep-image-96-inner/hnswlib/M12",
"search_params" : [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
],
"search_result_file" : "result/deep-image-96-inner/hnswlib/M12"
},
Expand All @@ -37,16 +37,16 @@
"build_param": {"M":16, "efConstruction":500, "numThreads":32},
"file" : "index/deep-image-96-inner/hnswlib/M16",
"search_params" : [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
],
"search_result_file" : "result/deep-image-96-inner/hnswlib/M16"
},
Expand All @@ -56,16 +56,16 @@
"build_param": {"M":24, "efConstruction":500, "numThreads":32},
"file" : "index/deep-image-96-inner/hnswlib/M24",
"search_params" : [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
],
"search_result_file" : "result/deep-image-96-inner/hnswlib/M24"
},
Expand All @@ -75,16 +75,16 @@
"build_param": {"M":36, "efConstruction":500, "numThreads":32},
"file" : "index/deep-image-96-inner/hnswlib/M36",
"search_params" : [
{"ef":10, "numThreads":1},
{"ef":20, "numThreads":1},
{"ef":40, "numThreads":1},
{"ef":60, "numThreads":1},
{"ef":80, "numThreads":1},
{"ef":120, "numThreads":1},
{"ef":200, "numThreads":1},
{"ef":400, "numThreads":1},
{"ef":600, "numThreads":1},
{"ef":800, "numThreads":1}
{"ef":10},
{"ef":20},
{"ef":40},
{"ef":60},
{"ef":80},
{"ef":120},
{"ef":200},
{"ef":400},
{"ef":600},
{"ef":800}
],
"search_result_file" : "result/deep-image-96-inner/hnswlib/M36"
},
Expand Down
Loading

0 comments on commit 2e5c282

Please sign in to comment.