Merge pull request #53 from unum-cloud/main-dev

Replacing mutexes with concurrent bitset
unum-cloud · May 25, 2023 · e528307 · e528307
2 parents 75af659 + 1b18637
commit e528307
Show file tree

Hide file tree

Showing 11 changed files with 628 additions and 323 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -21,13 +21,13 @@
         },
         {
             "label": "MacOS Build C++ Bench Debug",
-            "command": "cmake -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ -DCMAKE_BUILD_TYPE=Debug -B ./build_debug && make bench -C ./build_debug",
+            "command": "cmake -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ -DCMAKE_BUILD_TYPE=Debug -B ./build_debug && make -C ./build_debug",
             "args": [],
             "type": "shell",
         },
         {
             "label": "MacOS Build C++ Bench Release",
-            "command": "cmake -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -B ./build_release && make bench -C ./build_release",
+            "command": "cmake -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -B ./build_release && make -C ./build_release",
             "args": [],
             "type": "shell"
         }

diff --git a/docs/compilation.md b/docs/compilation.md
@@ -58,18 +58,28 @@ Benchmarking:
 
 ```sh
 pip install -e .
-pytest python/test.py
+pytest python/scripts/test.py
 ```
 
 Benchmarking:
 
 ```sh
-python python/bench.py \
+pip install faiss-cpu
+python python/scripts/bench.py \
     --vectors datasets/wiki_1M/base.1M.fbin \
     --queries datasets/wiki_1M/query.public.100K.fbin \
     --neighbors datasets/wiki_1M/groundtruth.public.100K.ibin
 ```
 
+> Optional parameters include `connectivity`, `expansion_add`, `expansion_search`.
+
+Checking the effect of different embedding dimensions on construction speed:
+
+```sh
+python python/scripts/bench_params.py dimensions
+python python/scripts/bench_params.py connectivity
+```
+
 ## JavaScript
 
 ```sh