Merge pull request #3 from Jeadie/jack/testing

enable benchmark to be triggered manually
erikbern · May 26, 2023 · 5f9e456 · 5f9e456
2 parents 16858dc + e2ca849
commit 5f9e456
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
   pull_request:
+  workflow_dispatch:
 
 # Cancel the workflow for the previous commit when the new commit is pushed.
 concurrency:

diff --git a/ann_benchmarks/algorithms/annoy/module.py b/ann_benchmarks/algorithms/annoy/module.py
@@ -1,7 +1,6 @@
 import annoy
 
-from .ann_benchmarks.algorithms.base.module import BaseANN
-
+from ..base.module import BaseANN
 
 class Annoy(BaseANN):
     def __init__(self, metric, n_trees):

diff --git a/ann_benchmarks/algorithms/qdrant/config.yml b/ann_benchmarks/algorithms/qdrant/config.yml
@@ -8,5 +8,12 @@ float:
     name: qdrant
     run_groups:
       default:
-        args: [[true, false]]
-        query_args: [[null, 8, 16, 32, 64, 128, 256]]
+        args: [
+          [True, False], #quantization
+          [ 8, 16, 24, 32, 40, 48, 64, 72 ], #m
+          [ 64, 128, 256, 512 ], #ef_construct
+        ]
+        query-args: [
+          [null, 8, 16, 32, 64, 128, 256, 512, 768], #hnsw_ef
+          [True, False], # re-score
+        ]
diff --git a/ann_benchmarks/algorithms/qdrant/module.py b/ann_benchmarks/algorithms/qdrant/module.py
@@ -8,7 +8,7 @@
                                        VectorParams, OptimizersConfigDiff, ScalarQuantization,
                                        ScalarQuantizationConfig, ScalarType, HnswConfigDiff)
 
-from ..base import BaseANN
+from ..base.module import BaseANN
 
 TIMEOUT = 30
 BATCH_SIZE = 128

diff --git a/ann_benchmarks/definitions.py b/ann_benchmarks/definitions.py
@@ -87,8 +87,6 @@ def load_configs(point_type: str, base_dir: str = "ann_benchmarks/algorithms") -
                 algorithm_name = os.path.basename(os.path.dirname(config_file))
                 if point_type in config_data:
                     configs[algorithm_name] = config_data[point_type]
-                else:
-                    print(f"'point_type' key does not exist in {config_file}")
             except yaml.YAMLError as e:
                 print(f"Error loading YAML from {config_file}: {e}")
     return configs