T1/kst ann t1 (#69)

* 1 * 1 * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * add random-xs * add random-xs * little fix * Update algos.yaml * Update algos.yaml * Update algos.yaml * Update algos.yaml * Update algos.yaml * Update algos.yaml * Update opt_faiss.py * Update algos.yaml --------- Co-authored-by: wuwei10 <wuwei10@kuaishou.com> Co-authored-by: Ubuntu <faiss@faiss.xa5q4pvx4bkedngrtrip3mrnbh.gx.internal.cloudapp.net> Co-authored-by: Harsha Vardhan Simhadri <harsha-simhadri@users.noreply.github.com>
harsha-simhadri · Apr 6, 2023 · 80e6293 · 80e6293
1 parent f51ced5
commit 80e6293
Show file tree

Hide file tree

Showing 4 changed files with 454 additions and 4 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -36,6 +36,9 @@ jobs:
           - algorithm: httpann_example
             dataset: random-range-xs
             library: httpann_example
+          - algorithm : kst_ann_t1
+            dataset: random-xs
+            library: kst_ann_t1
           - algorithm: buddy-t1
             dataset: random-xs
             library: faissconda            

diff --git a/algos.yaml b/algos.yaml
@@ -114,7 +114,21 @@ random-range-xs:
           query-args: |
             [{"rangeSearchProbeCount":20, "efSearch":100, "K1":2, "blockSize":4096, "radiusFactor":1.00, "identifier":"bbann"}]
 random-xs:
-
+    kst_ann_t1:
+      docker-tag: billion-scale-benchmark-kst_ann_t1
+      module: benchmark.algorithms.opt_faiss
+      constructor: opt_faiss
+      base-args: ["@metric"]
+      run-groups:
+        base:
+          args: |
+              [{"indexkey": "OPQ32_64,IVF1024_HNSWlibFp32_32,PQ64x4fsr",
+                "scale": 1,
+                "bias": 0 
+                }]
+          query-args: |
+              ["nprobe=8,quantizer_efSearch=32",
+              "nprobe=16,quantizer_efSearch=64"]
     kota-t2:
       docker-tag: billion-scale-benchmark-kota
       module: benchmark.algorithms.kota-t2
@@ -150,8 +164,6 @@ random-xs:
               "nprobe=64,quantizer_efSearch=64",
               "nprobe=64,quantizer_efSearch=128"
               ]
-
-
     faiss-t1:
       docker-tag: billion-scale-benchmark-faissconda
       module: benchmark.algorithms.faiss_t1
@@ -301,6 +313,31 @@ deep-10M:
           query-args: |
               [{"Ls":50, "BW":4, "T":16}]
 deep-1B:
+    kst_ann_t1:
+      docker-tag: billion-scale-benchmark-kst_ann_t1
+      module: benchmark.algorithms.opt_faiss
+      constructor: opt_faiss
+      base-args: ["@metric"]
+      run-groups:
+        base:
+          args: |
+              [{"indexkey": "OPQ96_192,IVF1048576_HNSWlibInt8_32,PQ96x4fsr",
+                "url": "https://comp21storage.blob.core.windows.net/participants/deep-1B.IVF1M_PQ96.faissindex",
+                "query_bs": 4096,
+                "scale": 1134.489,
+                "bias": -4.0839
+                }]
+          query-args: |
+                ["nprobe=8,quantizer_efSearch=32",
+                "nprobe=16,quantizer_efSearch=64",
+                "nprobe=32,quantizer_efSearch=32",
+                "nprobe=32,quantizer_efSearch=64",
+                "nprobe=32,quantizer_efSearch=128",
+                "nprobe=48,quantizer_efSearch=64",
+                "nprobe=48,quantizer_efSearch=96",
+                "nprobe=48,quantizer_efSearch=128",
+                "nprobe=48,quantizer_efSearch=256",
+                "nprobe=64,quantizer_efSearch=64"]
     faiss-t1:
       docker-tag: billion-scale-benchmark-faissconda
       module: benchmark.algorithms.faiss_t1
@@ -393,6 +430,31 @@ deep-1B:
               {"Ls":80, "BW":4, "T":16},
               {"Ls":100, "BW":4, "T":16}]
 msspacev-1B:
+    kst_ann_t1:
+      docker-tag: billion-scale-benchmark-kst_ann_t1
+      module: benchmark.algorithms.opt_faiss
+      constructor: opt_faiss
+      base-args: ["@metric"]
+      run-groups:
+        base:
+          args: |
+              [{"indexkey": "OPQ96_192,IVF1048576_HNSWlibInt8_32,PQ96x4fsr",
+                "url": "https://comp21storage.blob.core.windows.net/participants/msspacev-1B.IVF1M_PQ96.faissindex",
+                "query_bs": 4096,
+                "scale": 2.44,
+                "bias": 0 
+                }]
+          query-args: |
+              ["nprobe=8,quantizer_efSearch=32",
+              "nprobe=16,quantizer_efSearch=64",
+              "nprobe=32,quantizer_efSearch=32",
+              "nprobe=32,quantizer_efSearch=64",
+              "nprobe=32,quantizer_efSearch=128",
+              "nprobe=48,quantizer_efSearch=64",
+              "nprobe=48,quantizer_efSearch=96",
+              "nprobe=48,quantizer_efSearch=128",
+              "nprobe=48,quantizer_efSearch=256",
+              "nprobe=64,quantizer_efSearch=64"]
     kota-t2:
       docker-tag: billion-scale-benchmark-kota
       module: benchmark.algorithms.kota-t2
@@ -500,6 +562,31 @@ msspacev-1B:
                 {"nProbe":180, "efSearch":360, "K1":128, "blockSize":4096, "identifier": "bbann"}
               ]
 msturing-1B:
+    kst_ann_t1:
+      docker-tag: billion-scale-benchmark-kst_ann_t1
+      module: benchmark.algorithms.opt_faiss
+      constructor: opt_faiss
+      base-args: ["@metric"]
+      run-groups:
+        base:
+          args: |
+              [{"indexkey": "OPQ96_192,IVF1048576_HNSWlibInt8_32,PQ96x4fsr",
+                 "url": "https://comp21storage.blob.core.windows.net/participants/msturing-1B.IVF1M_PQ96.faissindex",            
+                 "query_bs":4096,
+                 "scale": 281.5,
+                 "bias": 16.6
+                 }]
+          query-args: |
+              ["nprobe=8,quantizer_efSearch=32",
+              "nprobe=16,quantizer_efSearch=64",
+              "nprobe=32,quantizer_efSearch=32",
+              "nprobe=32,quantizer_efSearch=64",
+              "nprobe=32,quantizer_efSearch=128",
+              "nprobe=48,quantizer_efSearch=64",
+              "nprobe=48,quantizer_efSearch=96",
+              "nprobe=48,quantizer_efSearch=128",
+              "nprobe=48,quantizer_efSearch=256",
+              "nprobe=64,quantizer_efSearch=64"]
     kota-t2:
       docker-tag: billion-scale-benchmark-kota
       module: benchmark.algorithms.kota-t2
@@ -605,6 +692,31 @@ msturing-1B:
               {"Ls":80, "BW":4, "T":16},
               {"Ls":100, "BW":4, "T":16}]
 bigann-1B:
+    kst_ann_t1:
+      docker-tag: billion-scale-benchmark-kst_ann_t1
+      module: benchmark.algorithms.opt_faiss
+      constructor: opt_faiss
+      base-args: ["@metric"]
+      run-groups:
+        base:
+          args: |
+              [{"indexkey": "OPQ96_192,IVF1048576_HNSWlibInt8_32,PQ96x4fsr",
+                 "url": "https://comp21storage.blob.core.windows.net/participants/bigann-1B.IVF1M_PQ96.faissindex",
+                 "query_bs":4096,
+                 "scale": 2.23,
+                 "bias": -10.794
+                 }]
+          query-args: |
+              ["nprobe=8,quantizer_efSearch=32",
+              "nprobe=16,quantizer_efSearch=64",
+              "nprobe=32,quantizer_efSearch=32",
+              "nprobe=32,quantizer_efSearch=64",
+              "nprobe=32,quantizer_efSearch=128",
+              "nprobe=48,quantizer_efSearch=64",
+              "nprobe=48,quantizer_efSearch=96",
+              "nprobe=48,quantizer_efSearch=128",
+              "nprobe=48,quantizer_efSearch=256",
+              "nprobe=64,quantizer_efSearch=64"]
     kota-t2:
       docker-tag: billion-scale-benchmark-kota
       module: benchmark.algorithms.kota-t2
@@ -1013,7 +1125,6 @@ bigann-10M:
               [{"R":100, "L":100, "B":0.3, "M":15}]
           query-args: |
               [{"Ls":50, "BW":4, "T":16}]
-
 msturing-1M:
     diskann-t2:
       docker-tag: billion-scale-benchmark-diskann