Merge remote-tracking branch 'origin/main' into 160-optimize-hit-counter

Taskfile.yaml

@@ -53,6 +53,7 @@ tasks:
       OBJC_DISABLE_INITIALIZE_FORK_SAFETY: "YES"
       RESULTS_DIR: ../../docs/pages/performance/fashion-mnist
     cmds:
+      - cp ../config.yml ann_benchmarks/algorithms/elastiknn/config.yml
       - venv/bin/python run.py --dataset fashion-mnist-784-euclidean --algorithm elastiknn-l2lsh --run-disabled --runs 3 --count 100 --parallelism 1 --force --local
       - mkdir -p $RESULTS_DIR
       - venv/bin/python plot.py --dataset fashion-mnist-784-euclidean --count 100 --output $RESULTS_DIR/plot.png | venv/bin/python ../parse_results.py > $RESULTS_DIR/results.md

ann-benchmarks/config.yml

@@ -0,0 +1,22 @@
+float:
+  any:
+    - base_args: ['@metric', '@dimension']
+      constructor: Exact
+      disabled: true
+      docker_tag: ann-benchmarks-elastiknn
+      module: ann_benchmarks.algorithms.elastiknn
+      name: elastiknn-exact
+      run_groups:
+        exact:
+          args: []
+  euclidean:
+    - base_args: []
+      constructor: L2Lsh
+      disabled: true
+      docker_tag: ann-benchmarks-elastiknn
+      module: ann_benchmarks.algorithms.elastiknn
+      name: elastiknn-l2lsh
+      run_groups:
+        elastiknn-l2lsh:
+          args: [[175], [7], [3900]]
+          query_args: [[100,500,1000], [0]]

docs/pages/performance/fashion-mnist/results.md

@@ -1,4 +1,5 @@
 |Model|Parameters|Recall|Queries per Second|
 |---|---|---|---|
-|eknn-l2lsh|L=128 k=8 w=4096 candidates=256 probes=8|0.940|126.091|
-|eknn-l2lsh|L=100 k=4 w=2048 candidates=1000 probes=3|0.960|195.211|
+|eknn-l2lsh|L=175 k=7 w=3900 candidates=100 probes=0|0.607|304.462|
+|eknn-l2lsh|L=175 k=7 w=3900 candidates=500 probes=0|0.921|269.909|
+|eknn-l2lsh|L=175 k=7 w=3900 candidates=1000 probes=0|0.962|239.598|

project/ElasticsearchPluginPlugin.scala

@@ -8,9 +8,9 @@ import java.util.zip.GZIPInputStream
 import scala.sys.process.Process
 
 /** SBT plugin providing functionality to run and build an Elasticsearch plugin. Also see:
-  * https://github.com/elastic/elasticsearch/blob/7ad3cf0d34/build-tools/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java,
-  * build.sbt file in https://github.com/shikhar/eskka
-  */
+ * https://github.com/elastic/elasticsearch/blob/7ad3cf0d34/build-tools/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java,
+ * build.sbt file in https://github.com/shikhar/eskka
+ */
 object ElasticsearchPluginPlugin extends AutoPlugin {
 
   override val trigger = noTrigger
@@ -132,7 +132,7 @@ object ElasticsearchPluginPlugin extends AutoPlugin {
     val log = sLog.value
     val elasticsearchVersionSuffix = {
       val osName = System.getProperty("os.name").toLowerCase()
-      val arch = System.getProperty("os.arch")
+      val arch = if (System.getProperty("os.arch") == "amd64") "x86_64" else System.getProperty("os.arch")
       if (osName.contains("mac")) s"darwin-$arch"
       else if (osName.contains("nix") || osName.contains("nux")) s"linux-$arch"
       else throw new RuntimeException(s"Unsupported operating system $osName, $arch")