Merge remote-tracking branch 'origin/bigann'

aerospike-community · Jul 21, 2024 · 08235aa · 08235aa
2 parents 60ea83c + 43e0862
commit 08235aa
Show file tree

Hide file tree

Showing 12 changed files with 1,119 additions and 424 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ venv
 .idea
 aerospike/data/*.hdf5
 aerospike/data/*
+aerospike/results/*
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -62,13 +62,13 @@
             "console": "integratedTerminal"
         },
         {            
-            "name": "Python Debugger: hdf_import",
+            "name": "Python Debugger: hdf_import (prompt DS)",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/aerospike/hdf_import.py",
             "cwd": "${workspaceFolder}/aerospike",
             "args": [
-                    "--dataset", "random-xs-20-angular",
+                    "--dataset", "${input:enterDataset}",
                     "--concurrency", "5000",
                     "--idxdrop",
                     "--logfile", "./hdfimport.log",
@@ -78,7 +78,7 @@
             "console": "integratedTerminal"
         }, 
         {           
-            "name": "Python Debugger: hdf_import (prompt DS)",
+            "name": "Python Debugger: hdf_import (prompt HDF)",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/aerospike/hdf_import.py",
@@ -137,20 +137,33 @@
             "console": "integratedTerminal"
         },
         {
-            "name": "Python Debugger: hdf_query",
+            "name": "Python Debugger: hdf_query (prompt DS)",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/aerospike/hdf_query.py",
+            "cwd": "${workspaceFolder}/aerospike",
+            "args": [
+                    "--dataset", "${input:enterDataset}",
+                    "--logfile", "./hdfquery.log",
+                    "-r", "10"
+                    ],
+            "console": "integratedTerminal"
+        },
+        {
+            "name": "Python Debugger: hdf_query (proimpt HDF)",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/aerospike/hdf_query.py",
             "cwd": "${workspaceFolder}/aerospike",
             "args": [
-                    "--hdf", "random-xs-20-angular",
+                    "--hdf", "${input:enterDataset}",
                     "--logfile", "./hdfquery.log",
                     "-r", "10"
                     ],
             "console": "integratedTerminal"
         },
         {
-            "name": "Python Debugger: hdf_query (check prompt)",
+            "name": "Python Debugger: hdf_query (check prompt HDF)",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/aerospike/hdf_query.py",
@@ -171,7 +184,7 @@
             "cwd": "${workspaceFolder}/aerospike",
             "args": [
                     "--dataset", "glove-100-angular",
-                    "--logfile", "./hdfquery.log",
+                    "--logfile", "./hdfquery-glove.log",
                     "--check",
                     "-r", "10",
                     "--searchparams", "{\"ef\":10}"
@@ -186,15 +199,30 @@
             "cwd": "${workspaceFolder}/aerospike",
             "args": [
                     "--dataset", "glove-100-angular",
-                    "--logfile", "./hdfquery.log",
+                    "--logfile", "./hdfquery-glove.log",
                     "--check",
                     "-r", "10",
                     "--limit", "10"
                     ],
             "console": "integratedTerminal"
         },
         {
-            "name": "Python Debugger: hdf_create_dataset (prompt)",
+            "name": "Python Debugger: hdf_query (gist 960)",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/aerospike/hdf_query.py",
+            "cwd": "${workspaceFolder}/aerospike",
+            "args": [
+                    "--dataset", "gist-960-euclidean",
+                    "--logfile", "./hdfquery-gist1.log",                    
+                    "-r", "10",
+                    "--limit", "100",
+                    "--idxname", "ANN-data_euclidean_SQUARED_EUCLIDEAN_960_16_100_100_Idx"
+                    ],
+            "console": "integratedTerminal"
+        },
+        {
+            "name": "Python Debugger: hdf_create_dataset (prompt HDF)",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/aerospike/hdf_create_dataset.py",
@@ -232,14 +260,14 @@
             "console": "integratedTerminal"
         },
         {
-            "name": "Python Debugger: bigann_convert",
+            "name": "Python Debugger: bigann_convert (prompt DS)",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/aerospike/bigann_convert_hdf.py",
             "cwd": "${workspaceFolder}/aerospike",
             "args": [
                     "--dataset", "${input:enterBigDataset}",
-                    "--hdf", "bigtest.hdf5"
+                    "--hdf", "${input:enterBigHDFFile}"
                     ],
             "console": "integratedTerminal"
         },
@@ -256,12 +284,18 @@
         "type": "promptString",
         "description": "Enter Big Dataset",
         "default": "random-xs"
-      },
+    },
     {
         "id": "enterHDFFile",
         "type": "promptString",
         "description": "Enter HDF Path",
         "default": "test"
+      },
+      {
+        "id": "enterBigHDFFile",
+        "type": "promptString",
+        "description": "Enter HDF Path",
+        "default": "bigtest"
       }
   ]
 }