rename efSearchGrid -> overqueryGrid

jbellis · Jan 17, 2025 · 1ece84b · 1ece84b
1 parent 7cbb2e1
commit 1ece84b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/jvector-examples/src/main/java/io/github/jbellis/jvector/example/Bench.java b/jvector-examples/src/main/java/io/github/jbellis/jvector/example/Bench.java
@@ -44,7 +44,7 @@ public static void main(String[] args) throws IOException {
 
         var mGrid = List.of(32); // List.of(16, 24, 32, 48, 64, 96, 128);
         var efConstructionGrid = List.of(100); // List.of(60, 80, 100, 120, 160, 200, 400, 600, 800);
-        var efSearchGrid = List.of(1.0, 2.0);
+        var overqueryGrid = List.of(1.0, 2.0); // rerankK = oq * topK
         List<Function<DataSet, CompressorParameters>> buildCompression = Arrays.asList(
                 ds -> new PQParameters(ds.getDimension() / 8, 256, ds.similarityFunction == VectorSimilarityFunction.EUCLIDEAN, UNWEIGHTED),
                 __ -> CompressorParameters.NONE
@@ -74,15 +74,15 @@ public static void main(String[] args) throws IOException {
                 "nv-qa-v4-100k",
                 "colbert-1M",
                 "gecko-100k");
-        executeNw(coreFiles, pattern, buildCompression, featureSets, searchCompression, mGrid, efConstructionGrid, efSearchGrid);
+        executeNw(coreFiles, pattern, buildCompression, featureSets, searchCompression, mGrid, efConstructionGrid, overqueryGrid);
 
         var extraFiles = List.of(
                 "openai-v3-large-3072-100k",
                 "openai-v3-large-1536-100k",
                 "e5-small-v2-100k",
                 "e5-base-v2-100k",
                 "e5-large-v2-100k");
-        executeNw(extraFiles, pattern, buildCompression, featureSets, searchCompression, mGrid, efConstructionGrid, efSearchGrid);
+        executeNw(extraFiles, pattern, buildCompression, featureSets, searchCompression, mGrid, efConstructionGrid, overqueryGrid);
 
         // smaller vectors from ann-benchmarks
         var hdf5Files = List.of(
@@ -99,7 +99,7 @@ public static void main(String[] args) throws IOException {
         for (var f : hdf5Files) {
             if (pattern.matcher(f).find()) {
                 DownloadHelper.maybeDownloadHdf5(f);
-                Grid.runAll(Hdf5Loader.load(f), mGrid, efConstructionGrid, featureSets, buildCompression, searchCompression, efSearchGrid);
+                Grid.runAll(Hdf5Loader.load(f), mGrid, efConstructionGrid, featureSets, buildCompression, searchCompression, overqueryGrid);
             }
         }
 
@@ -109,7 +109,7 @@ public static void main(String[] args) throws IOException {
                                               ds -> new PQParameters(ds.getDimension(), 256, true, UNWEIGHTED));
             buildCompression = Arrays.asList(__ -> CompressorParameters.NONE);
             var grid2d = DataSetCreator.create2DGrid(4_000_000, 10_000, 100);
-            Grid.runAll(grid2d, mGrid, efConstructionGrid, featureSets, buildCompression, searchCompression, efSearchGrid);
+            Grid.runAll(grid2d, mGrid, efConstructionGrid, featureSets, buildCompression, searchCompression, overqueryGrid);
         }
     }