From 2a3380089f59905565301f11d13c1dde426d4c27 Mon Sep 17 00:00:00 2001
From: ravishankar <rakri@microsoft.com>
Date: Sun, 8 Dec 2024 21:13:25 -0800
Subject: [PATCH 1/5] Fix: fix all warnings

---
 src/aux_compute_groundtruth.cpp | 2 +-
 src/hnsw.cpp                    | 2 +-
 src/lsh.cpp                     | 4 ++--
 src/relative_ng.cpp             | 2 +-
 tests/load_random_dist.cpp      | 4 ++--
 tests/search_lsh.cpp            | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/aux_compute_groundtruth.cpp b/src/aux_compute_groundtruth.cpp
index 2608229..27caf1d 100644
--- a/src/aux_compute_groundtruth.cpp
+++ b/src/aux_compute_groundtruth.cpp
@@ -274,7 +274,7 @@ inline void save_groundtruth_as_one_file(const std::string filename,
 }
 
 template<typename T>
-int aux_main(int argv, char **argc) {
+int aux_main([[maybe_unused]] int argv, char **argc) {
   size_t      npoints, nqueries, dim;
   std::string base_file(argc[2]);
   std::string query_file(argc[3]);
diff --git a/src/hnsw.cpp b/src/hnsw.cpp
index 9c365c9..49579fd 100644
--- a/src/hnsw.cpp
+++ b/src/hnsw.cpp
@@ -268,7 +268,7 @@ namespace grann {
   _u32 HNSW<T>::search(const T *query, _u32 res_count,
                        const Parameters &search_params, _u32 *indices,
                        float *distances, QueryStats *stats,
-											 std::vector<label> search_filters) {
+											 [[maybe_unused]] std::vector<label> search_filters) {
     _u32                     search_list_size = search_params.Get<_u32>("L");
     std::vector<unsigned>    init_ids;
     tsl::robin_set<unsigned> visited(10 * search_list_size);
diff --git a/src/lsh.cpp b/src/lsh.cpp
index 44e1bf8..fa92144 100644
--- a/src/lsh.cpp
+++ b/src/lsh.cpp
@@ -149,8 +149,8 @@ namespace grann {
 
   template<typename T>
   _u32 LSHIndex<T>::search(const T *query, _u32 res_count,
-                           const Parameters &search_params, _u32 *indices,
-                           float *distances, QueryStats *stats, std::vector<label> search_filters) {
+                           [[maybe_unused]] const Parameters &search_params, _u32 *indices,
+                           float *distances, QueryStats *stats, [[maybe_unused]] std::vector<label> search_filters) {
     float *query_float = new float[this->_aligned_dim];
     grann::convert_types(query, query_float, 1, this->_aligned_dim);
 
diff --git a/src/relative_ng.cpp b/src/relative_ng.cpp
index 1a32591..243da5c 100644
--- a/src/relative_ng.cpp
+++ b/src/relative_ng.cpp
@@ -207,7 +207,7 @@ namespace grann {
   _u32 RelativeNG<T>::search(const T *query, _u32 res_count,
                              const Parameters &search_params, _u32 *indices,
                              float *distances, QueryStats *stats,
-														 std::vector<label> search_filters) {
+														 [[maybe_unused]] std::vector<label> search_filters) {
     _u32                     search_list_size = search_params.Get<_u32>("L");
     std::vector<unsigned>    init_ids;
     tsl::robin_set<unsigned> visited(10 * search_list_size);
diff --git a/tests/load_random_dist.cpp b/tests/load_random_dist.cpp
index b501a00..11d511d 100644
--- a/tests/load_random_dist.cpp
+++ b/tests/load_random_dist.cpp
@@ -13,8 +13,8 @@ int main(int argc, char* argv[]) {
         if(strcmp(argv[1], "gaussian") == 0) grann::load_bin<float>(argv[2], data, npts, ndim);
         else grann::load_bin<float>(argv[2], data, npts, ndim);
     
-        for(int i = 0; i < npts; i++) {
-            for(int j = 0; j < ndim; j++) {
+        for(_u64 i = 0; i < npts; i++) {
+            for(_u64 j = 0; j < ndim; j++) {
                 std::cout << data[i * ndim + j] << " ";
             }
             std::cout << std::endl;
diff --git a/tests/search_lsh.cpp b/tests/search_lsh.cpp
index 6098338..95b2a0e 100644
--- a/tests/search_lsh.cpp
+++ b/tests/search_lsh.cpp
@@ -16,7 +16,7 @@
 #include "utils.h"
 
 template<typename T>
-int search_index(int argc, char** argv) {
+int search_index([[maybe_unused]] int argc, char** argv) {
   T*                query = nullptr;
   unsigned*         gt_ids = nullptr;
   float*            gt_dists = nullptr;

From 213f3fb2eb425e6df5ec8c5cdd27be1df8c7b8a0 Mon Sep 17 00:00:00 2001
From: ravishankar <rakri@microsoft.com>
Date: Sun, 22 Dec 2024 19:51:06 -0800
Subject: [PATCH 2/5] update gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8487ac3..07ce38b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,7 @@
 *.out
 *.app
 
+# VS Code
+.vscode
+
 /build
\ No newline at end of file

From ce36f3cf43595ef8b3ce330be834e993237eaed1 Mon Sep 17 00:00:00 2001
From: ravishankar <rakri@microsoft.com>
Date: Thu, 26 Dec 2024 23:29:06 -0800
Subject: [PATCH 3/5] Res: Add basic results

---
 results/hnsw_results.txt | 70 ++++++++++++++++++++++++++++++++++++++++
 run-script.sh            |  4 +++
 2 files changed, 74 insertions(+)
 create mode 100644 results/hnsw_results.txt
 create mode 100644 run-script.sh

diff --git a/results/hnsw_results.txt b/results/hnsw_results.txt
new file mode 100644
index 0000000..04d3415
--- /dev/null
+++ b/results/hnsw_results.txt
@@ -0,0 +1,70 @@
+Reading bin file /nvmessd1/fbv4/prec1M.fbin ...Metadata: #pts = 1010812, #dims = 384, aligned_dim = 384... done.
+Initialized HNSW Object with 1010812 points, dim=384.
+Writing bin: /tmp/temp_data
+bin: #pts = 101209, #dims = 384, size = 155457032B
+Finished writing bin.
+Reading bin file /tmp/temp_data ...Metadata: #pts = 101209, #dims = 384, aligned_dim = 384... done.
+Initialized HNSW Object with 101209 points, dim=384.
+Starting hnsw build with listSize L=100, degree bound R=64, and alpha=1 on HNSW level 0
+Medoid identified as 66687
+10% of build completed 
20% of build completed 
30% of build completed 
40% of build completed 
50% of build completed 
60% of build completed 
70% of build completed 
80% of build completed 
90% of build completed 
100% of build completed 
110% of build completed 
Starting final cleanup..done.
+Total build time: 6.93749s
+Starting hnsw build with listSize L=100, degree bound R=64, and alpha=1 on HNSW level 1
+Medoid identified as 121334
+10% of build completed 
20% of build completed 
30% of build completed 
40% of build completed 
50% of build completed 
60% of build completed 
70% of build completed 
80% of build completed 
90% of build completed 
100% of build completed 
110% of build completed 
Starting final cleanup..done.
+Total build time: 227.508s
+Writing bin: /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_0_data.bin
+bin: #pts = 101209, #dims = 384, size = 155457032B
+Finished writing bin.
+Writing bin: /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_0_tags.bin
+bin: #pts = 101209, #dims = 1, size = 404844B
+Finished writing bin.
+Writing bin: /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_1_data.bin
+bin: #pts = 1010812, #dims = 384, size = 1552607240B
+Finished writing bin.
+Writing bin: /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_1_tags.bin
+bin: #pts = 1010812, #dims = 1, size = 4043256B
+Finished writing bin.
+Reading bin file /nvmessd1/fbv4/queries.fbin ...Metadata: #pts = 13265, #dims = 384, aligned_dim = 384... done.
+ Stat(/nvmessd1/fbv4/prec1M_gt100.bin) returned: 0
+Opened: /nvmessd1/fbv4/prec1M_gt100.bin, size: 10612008, cache_size: 10612008
+Reading truthset file /nvmessd1/fbv4/prec1M_gt100.bin ...
+Metadata: #pts = 13265, #dims = 100...
+Initialized Empty HNSW Object at level 0
+Initialized Empty HNSW Object at level 1
+Reading bin file /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_0_data.bin ...Metadata: #pts = 101209, #dims = 384, aligned_dim = 384... done.
+Reading bin file /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_0_tags.bin ...
+Metadata: #pts = 101209, #dims = 1.
+ Stat(/nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_0_labels.txt) returned: -1
+ Stat(/nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_0_universal_label.txt) returned: -1
+Loading hnsw index /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2.....done. HNSW has 101209 nodes and 2586058 out-edges
+Reading bin file /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_1_data.bin ...Metadata: #pts = 1010812, #dims = 384, aligned_dim = 384... done.
+Reading bin file /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_1_tags.bin ...
+Metadata: #pts = 1010812, #dims = 1.
+ Stat(/nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_1_labels.txt) returned: -1
+ Stat(/nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_1_universal_label.txt) returned: -1
+Loading hnsw index /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2.....done. HNSW has 1010812 nodes and 30399957 out-edges
+Vamana loaded
+  Ls        QPS     Mean Latency (mus)  99.9% Latency   Recall@50      Mean Cmps.   Mean Hops     99.9% Cmps.  99.9% Hops
+=========================================================================================================================
+  50      418.51               2388.76        9666.19       60.11         4372.71      107.99         5794.00      134.00
+  75      321.80               3107.39        4142.11       67.63         6164.37      156.83         7860.00      184.00
+ 100      246.79               4051.94        5192.97       72.57         7910.50      206.05         9759.00      231.00
+ 150      171.90               5817.18        7129.74       78.79        11286.21      305.22        13752.00      325.00
+ 200      131.59               7599.39        9262.54       82.64        14524.84      404.71        17510.00      422.00
+Done searching. Now saving results 
+Writing bin: /hnsw_results_50_idx_uint32.bin
+bin: #pts = 13265, #dims = 50, size = 2653008B
+Finished writing bin.
+Writing bin: /hnsw_results_75_idx_uint32.bin
+bin: #pts = 13265, #dims = 50, size = 2653008B
+Finished writing bin.
+Writing bin: /hnsw_results_100_idx_uint32.bin
+bin: #pts = 13265, #dims = 50, size = 2653008B
+Finished writing bin.
+Writing bin: /hnsw_results_150_idx_uint32.bin
+bin: #pts = 13265, #dims = 50, size = 2653008B
+Finished writing bin.
+Writing bin: /hnsw_results_200_idx_uint32.bin
+bin: #pts = 13265, #dims = 50, size = 2653008B
+Finished writing bin.
diff --git a/run-script.sh b/run-script.sh
new file mode 100644
index 0000000..59afda3
--- /dev/null
+++ b/run-script.sh
@@ -0,0 +1,4 @@
+cd build/tests
+./build_hnsw float l2 /nvmessd1/fbv4/prec1M.fbin /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2 64 100 0 0.1 2 48 >> ../../results/hnsw_results.txt
+./search_hnsw float l2 /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2 2 1 /nvmessd1/fbv4/queries.fbin /nvmessd1/fbv4/prec1M_gt100.bin 50 /hnsw_results 50 75 100 150 200 >> ../../results/hnsw_results.txt
+

From a3a1c4d5b3964755c93e9a6482d7fcae836c88f2 Mon Sep 17 00:00:00 2001
From: ravishankar <rakri@microsoft.com>
Date: Sun, 29 Dec 2024 20:36:12 -0800
Subject: [PATCH 4/5] Res: add diksann results

---
 results/diskann_results.txt | 65 +++++++++++++++++++++++++++++++++++++
 run-script.sh               | 11 +++++--
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 results/diskann_results.txt

diff --git a/results/diskann_results.txt b/results/diskann_results.txt
new file mode 100644
index 0000000..ea2fc77
--- /dev/null
+++ b/results/diskann_results.txt
@@ -0,0 +1,65 @@
+Parameters set: C=750, L=100, R=64, alpha=1.2, pruning_rule=0
+Reading bin file /nvmessd1/fbv4/prec1M.fbin ...Metadata: #pts = 1010812, #dims = 384, aligned_dim = 384... done.
+Initialized Vamana Object with 1010812 points, dim=384.
+Starting vamana build with listSize L=100, degree bound R=64, and alpha=1.2
+Medoid identified as 121334
+
0% of build completed...
10% of build completed...
20% of build completed...
30% of build completed...
40% of build completed...
50% of build completed...
60% of build completed...
70% of build completed...
80% of build completed...
90% of build completed...
100% of build completed...
+Starting final cleanup..done.
+      Percentile      Out Degree       In Degree
+=======================================================
+               0               1               0
+              10               5               4
+              20              14              13
+              30              33              25
+              40              56              34
+              50              64              41
+              60              64              48
+              70              64              57
+              80              64              69
+              90              64              91
+             100              64            1841
+0.137% points are unreachable and 121334 is the most popular in-degree node.
+Total build time: 177s
+Writing bin: /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_data.bin
+bin: #pts = 1010812, #dims = 384, size = 1552607240B
+Finished writing bin.
+Writing bin: /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_tags.bin
+bin: #pts = 1010812, #dims = 1, size = 4043256B
+Finished writing bin.
+Reading bin file /nvmessd1/fbv4/queries.fbin ...Metadata: #pts = 13265, #dims = 384, aligned_dim = 384... done.
+ Stat(/nvmessd1/fbv4/prec1M_gt100.bin) returned: 0
+Opened: /nvmessd1/fbv4/prec1M_gt100.bin, size: 10612008, cache_size: 10612008
+Reading truthset file /nvmessd1/fbv4/prec1M_gt100.bin ...
+Metadata: #pts = 13265, #dims = 100...
+Initialized Empty Vamana Object.
+Reading bin file /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_data.bin ...Metadata: #pts = 1010812, #dims = 384, aligned_dim = 384... done.
+Reading bin file /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_tags.bin ...
+Metadata: #pts = 1010812, #dims = 1.
+ Stat(/nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_labels.txt) returned: -1
+ Stat(/nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_universal_label.txt) returned: -1
+ Stat(/nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_labels_to_medoids.txt) returned: -1
+Loading vamana index /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2.....done. Vamana has 1010812 nodes and 46579132 out-edges
+Vamana loaded
+  Ls        QPS     Mean Latency (mus)  99.9% Latency   Recall@50      Mean Cmps.   Mean Hops     99.9% Cmps.  99.9% Hops
+=========================================================================================================================
+  50      615.67               1623.61       14838.88       63.49         3206.50       61.68         5951.00      108.00
+  75      448.79               2228.09       15617.64       70.07         4329.50       85.88         7324.00      140.00
+ 100      356.66               2803.67       16355.62       74.37         5423.03      110.24         8419.00      163.00
+ 150      255.54               3913.10       17790.04       79.83         7551.57      159.31        10822.00      209.00
+ 200      188.95               5292.23       19229.31       83.25         9614.83      208.65        13237.00      258.00
+Done searching. Now saving results 
+Writing bin: /diskann_results_50_idx_uint32.bin
+bin: #pts = 13265, #dims = 50, size = 2653008B
+Finished writing bin.
+Writing bin: /diskann_results_75_idx_uint32.bin
+bin: #pts = 13265, #dims = 50, size = 2653008B
+Finished writing bin.
+Writing bin: /diskann_results_100_idx_uint32.bin
+bin: #pts = 13265, #dims = 50, size = 2653008B
+Finished writing bin.
+Writing bin: /diskann_results_150_idx_uint32.bin
+bin: #pts = 13265, #dims = 50, size = 2653008B
+Finished writing bin.
+Writing bin: /diskann_results_200_idx_uint32.bin
+bin: #pts = 13265, #dims = 50, size = 2653008B
+Finished writing bin.
diff --git a/run-script.sh b/run-script.sh
index 59afda3..578336c 100644
--- a/run-script.sh
+++ b/run-script.sh
@@ -1,4 +1,9 @@
-cd build/tests
-./build_hnsw float l2 /nvmessd1/fbv4/prec1M.fbin /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2 64 100 0 0.1 2 48 >> ../../results/hnsw_results.txt
-./search_hnsw float l2 /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2 2 1 /nvmessd1/fbv4/queries.fbin /nvmessd1/fbv4/prec1M_gt100.bin 50 /hnsw_results 50 75 100 150 200 >> ../../results/hnsw_results.txt
+# HNSW
+# cd build/tests
+# ./build_hnsw float l2 /nvmessd1/fbv4/prec1M.fbin /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2 64 100 0 0.1 2 48 >> ../../results/hnsw_results.txt
+# ./search_hnsw float l2 /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2 2 1 /nvmessd1/fbv4/queries.fbin /nvmessd1/fbv4/prec1M_gt100.bin 50 /hnsw_results 50 75 100 150 200 >> ../../results/hnsw_results.txt
 
+# DiskANN
+cd build/tests
+./build_vamana float l2 /nvmessd1/fbv4/prec1M.fbin 0 /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2 64 100 1.2 48 >> ../../results/diskann_results.txt
+./search_vamana float l2 /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2 1 /nvmessd1/fbv4/queries.fbin /nvmessd1/fbv4/prec1M_gt100.bin 50 /diskann_results 0 50 75 100 150 200 >> ../../results/diskann_results.txt 
\ No newline at end of file

From f349df848a62d11489901277662f458776ab5383 Mon Sep 17 00:00:00 2001
From: ravishankar <rakri@microsoft.com>
Date: Sun, 29 Dec 2024 21:36:51 -0800
Subject: [PATCH 5/5] Misc: fix code and add new results

---
 results/diskann_results.txt | 35 ++++++++++++++++++---------
 results/hnsw_results.txt    | 48 +++++++++++++++++++++++++++----------
 run-script.sh               | 12 +++++-----
 src/hnsw.cpp                | 13 +++++++++-
 src/vamana.cpp              | 14 +++++++++++
 tests/search_hnsw.cpp       |  2 +-
 6 files changed, 93 insertions(+), 31 deletions(-)

diff --git a/results/diskann_results.txt b/results/diskann_results.txt
index ea2fc77..fefcc70 100644
--- a/results/diskann_results.txt
+++ b/results/diskann_results.txt
@@ -3,7 +3,18 @@ Reading bin file /nvmessd1/fbv4/prec1M.fbin ...Metadata: #pts = 1010812, #dims =
 Initialized Vamana Object with 1010812 points, dim=384.
 Starting vamana build with listSize L=100, degree bound R=64, and alpha=1.2
 Medoid identified as 121334
-
0% of build completed...
10% of build completed...
20% of build completed...
30% of build completed...
40% of build completed...
50% of build completed...
60% of build completed...
70% of build completed...
80% of build completed...
90% of build completed...
100% of build completed...
+
+0% of build completed...
+10% of build completed...
+20% of build completed...
+30% of build completed...
+40% of build completed...
+50% of build completed...
+60% of build completed...
+70% of build completed...
+80% of build completed...
+90% of build completed...
+100% of build completed...
 Starting final cleanup..done.
       Percentile      Out Degree       In Degree
 =======================================================
@@ -11,15 +22,16 @@ Starting final cleanup..done.
               10               5               4
               20              14              13
               30              33              25
-              40              56              34
+              40              57              34
               50              64              41
               60              64              48
               70              64              57
               80              64              69
               90              64              91
-             100              64            1841
-0.137% points are unreachable and 121334 is the most popular in-degree node.
-Total build time: 177s
+             100              64            1853
+0.159% points are unreachable and 121334 is the most popular in-degree node.
+Average degree 46.1
+Total build time: 176s
 Writing bin: /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_data.bin
 bin: #pts = 1010812, #dims = 384, size = 1552607240B
 Finished writing bin.
@@ -38,15 +50,16 @@ Metadata: #pts = 1010812, #dims = 1.
  Stat(/nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_labels.txt) returned: -1
  Stat(/nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_universal_label.txt) returned: -1
  Stat(/nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2_labels_to_medoids.txt) returned: -1
-Loading vamana index /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2.....done. Vamana has 1010812 nodes and 46579132 out-edges
+Loading vamana index /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2.....done. Vamana has 1010812 nodes and 46618450 out-edges
+Average out degree: 46.12
 Vamana loaded
   Ls        QPS     Mean Latency (mus)  99.9% Latency   Recall@50      Mean Cmps.   Mean Hops     99.9% Cmps.  99.9% Hops
 =========================================================================================================================
-  50      615.67               1623.61       14838.88       63.49         3206.50       61.68         5951.00      108.00
-  75      448.79               2228.09       15617.64       70.07         4329.50       85.88         7324.00      140.00
- 100      356.66               2803.67       16355.62       74.37         5423.03      110.24         8419.00      163.00
- 150      255.54               3913.10       17790.04       79.83         7551.57      159.31        10822.00      209.00
- 200      188.95               5292.23       19229.31       83.25         9614.83      208.65        13237.00      258.00
+  50      541.45               1846.24        9149.36       63.40         3206.93       61.64         5830.00      109.00
+  75      436.28               2292.00        3844.28       70.03         4332.75       85.89         7265.00      139.00
+ 100      346.48               2886.06        4673.74       74.36         5427.74      110.27         8551.00      165.00
+ 150      248.03               4031.63        6059.32       79.82         7554.02      159.32        11098.00      213.00
+ 200      192.08               5206.02        7170.83       83.23         9619.01      208.68        13168.00      255.00
 Done searching. Now saving results 
 Writing bin: /diskann_results_50_idx_uint32.bin
 bin: #pts = 13265, #dims = 50, size = 2653008B
diff --git a/results/hnsw_results.txt b/results/hnsw_results.txt
index 04d3415..cd9ecd7 100644
--- a/results/hnsw_results.txt
+++ b/results/hnsw_results.txt
@@ -7,12 +7,36 @@ Reading bin file /tmp/temp_data ...Metadata: #pts = 101209, #dims = 384, aligned
 Initialized HNSW Object with 101209 points, dim=384.
 Starting hnsw build with listSize L=100, degree bound R=64, and alpha=1 on HNSW level 0
 Medoid identified as 66687
-10% of build completed 
20% of build completed 
30% of build completed 
40% of build completed 
50% of build completed 
60% of build completed 
70% of build completed 
80% of build completed 
90% of build completed 
100% of build completed 
110% of build completed 
Starting final cleanup..done.
-Total build time: 6.93749s
+10% of build completed 
+20% of build completed 
+30% of build completed 
+40% of build completed 
+50% of build completed 
+60% of build completed 
+70% of build completed 
+80% of build completed 
+90% of build completed 
+100% of build completed 
+110% of build completed 
+Starting final cleanup..done.
+Total build time: 7.71948s
+Average out degree: 25.5526
 Starting hnsw build with listSize L=100, degree bound R=64, and alpha=1 on HNSW level 1
 Medoid identified as 121334
-10% of build completed 
20% of build completed 
30% of build completed 
40% of build completed 
50% of build completed 
60% of build completed 
70% of build completed 
80% of build completed 
90% of build completed 
100% of build completed 
110% of build completed 
Starting final cleanup..done.
-Total build time: 227.508s
+10% of build completed 
+20% of build completed 
+30% of build completed 
+40% of build completed 
+50% of build completed 
+60% of build completed 
+70% of build completed 
+80% of build completed 
+90% of build completed 
+100% of build completed 
+110% of build completed 
+Starting final cleanup..done.
+Total build time: 216.582s
+Average out degree: 30.0825
 Writing bin: /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_0_data.bin
 bin: #pts = 101209, #dims = 384, size = 155457032B
 Finished writing bin.
@@ -37,21 +61,21 @@ Reading bin file /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_0_tags.
 Metadata: #pts = 101209, #dims = 1.
  Stat(/nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_0_labels.txt) returned: -1
  Stat(/nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_0_universal_label.txt) returned: -1
-Loading hnsw index /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2.....done. HNSW has 101209 nodes and 2586058 out-edges
+Loading hnsw index /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2.....done. HNSW has 101209 nodes and 2586154 out-edgesAverage out degree: 25.55
 Reading bin file /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_1_data.bin ...Metadata: #pts = 1010812, #dims = 384, aligned_dim = 384... done.
 Reading bin file /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_1_tags.bin ...
 Metadata: #pts = 1010812, #dims = 1.
  Stat(/nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_1_labels.txt) returned: -1
  Stat(/nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2_1_universal_label.txt) returned: -1
-Loading hnsw index /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2.....done. HNSW has 1010812 nodes and 30399957 out-edges
-Vamana loaded
+Loading hnsw index /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2.....done. HNSW has 1010812 nodes and 30407802 out-edgesAverage out degree: 30.08
+HNSW loaded
   Ls        QPS     Mean Latency (mus)  99.9% Latency   Recall@50      Mean Cmps.   Mean Hops     99.9% Cmps.  99.9% Hops
 =========================================================================================================================
-  50      418.51               2388.76        9666.19       60.11         4372.71      107.99         5794.00      134.00
-  75      321.80               3107.39        4142.11       67.63         6164.37      156.83         7860.00      184.00
- 100      246.79               4051.94        5192.97       72.57         7910.50      206.05         9759.00      231.00
- 150      171.90               5817.18        7129.74       78.79        11286.21      305.22        13752.00      325.00
- 200      131.59               7599.39        9262.54       82.64        14524.84      404.71        17510.00      422.00
+  50      414.68               2410.85       10848.68       60.12         4371.73      107.99         5964.00      137.00
+  75      319.63               3128.54        4045.87       67.64         6164.12      156.81         7805.00      182.00
+ 100      244.31               4093.08        5202.52       72.54         7913.30      206.06         9744.00      228.00
+ 150      170.24               5874.00        7300.73       78.75        11289.65      305.20        13669.00      323.00
+ 200      130.21               7679.69        9555.61       82.60        14530.51      404.75        17512.00      422.00
 Done searching. Now saving results 
 Writing bin: /hnsw_results_50_idx_uint32.bin
 bin: #pts = 13265, #dims = 50, size = 2653008B
diff --git a/run-script.sh b/run-script.sh
index 578336c..4da83b2 100644
--- a/run-script.sh
+++ b/run-script.sh
@@ -1,9 +1,9 @@
 # HNSW
-# cd build/tests
-# ./build_hnsw float l2 /nvmessd1/fbv4/prec1M.fbin /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2 64 100 0 0.1 2 48 >> ../../results/hnsw_results.txt
-# ./search_hnsw float l2 /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2 2 1 /nvmessd1/fbv4/queries.fbin /nvmessd1/fbv4/prec1M_gt100.bin 50 /hnsw_results 50 75 100 150 200 >> ../../results/hnsw_results.txt
+cd build/tests
+./build_hnsw float l2 /nvmessd1/fbv4/prec1M.fbin /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2 64 100 0 0.1 2 48 >> ../../results/hnsw_results.txt
+./search_hnsw float l2 /nvmessd1/fbv4/avarhade/grann/hnsw_prec1M_L100_R64_a1.2 2 1 /nvmessd1/fbv4/queries.fbin /nvmessd1/fbv4/prec1M_gt100.bin 50 /hnsw_results 50 75 100 150 200 >> ../../results/hnsw_results.txt
 
 # DiskANN
-cd build/tests
-./build_vamana float l2 /nvmessd1/fbv4/prec1M.fbin 0 /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2 64 100 1.2 48 >> ../../results/diskann_results.txt
-./search_vamana float l2 /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2 1 /nvmessd1/fbv4/queries.fbin /nvmessd1/fbv4/prec1M_gt100.bin 50 /diskann_results 0 50 75 100 150 200 >> ../../results/diskann_results.txt 
\ No newline at end of file
+# cd build/tests
+# ./build_vamana float l2 /nvmessd1/fbv4/prec1M.fbin 0 /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2 64 100 1.2 48 >> ../../results/diskann_results.txt
+# ./search_vamana float l2 /nvmessd1/fbv4/avarhade/grann/diskann_prec1M_L100_R64_a1.2 1 /nvmessd1/fbv4/queries.fbin /nvmessd1/fbv4/prec1M_gt100.bin 50 /diskann_results 0 50 75 100 150 200 >> ../../results/diskann_results.txt 
\ No newline at end of file
diff --git a/src/hnsw.cpp b/src/hnsw.cpp
index 49579fd..47dcb77 100644
--- a/src/hnsw.cpp
+++ b/src/hnsw.cpp
@@ -104,9 +104,14 @@ namespace grann {
                   << this->_num_points << " points. " << std::endl;
       return;
     }
+    _u64 total_out_degree = 0;
+    for (const auto& neighbors : this->_out_nbrs) {
+      total_out_degree += neighbors.size();
+    }
+    double avg_out_degree = static_cast<double>(total_out_degree) / this->_num_points;
 
     std::cout << "..done. HNSW has " << nodes << " nodes and " << cc
-                << " out-edges" << std::endl;
+                << " out-edges" << "Average out degree: " << avg_out_degree << std::endl;
   }
 
   /**************************************************************
@@ -254,6 +259,11 @@ namespace grann {
           this->_out_nbrs[node].emplace_back(id);
       }
     }
+    _u64 total_out_degree = 0;
+    for (const auto& neighbors : this->_out_nbrs) {
+      total_out_degree += neighbors.size();
+    }
+    double avg_out_degree = static_cast<double>(total_out_degree) / this->_num_points;
 
     std::cout << "done." << std::endl;
     this->_has_built = true;
@@ -262,6 +272,7 @@ namespace grann {
     std::cout << "Total build time: "
                 << ((double) build_timer.elapsed() / (double) 1000000) << "s"
                 << std::endl;
+    std::cout << "Average out degree: " << avg_out_degree << std::endl;
   }
 
   template<typename T>
diff --git a/src/vamana.cpp b/src/vamana.cpp
index f7a8d35..89728fb 100644
--- a/src/vamana.cpp
+++ b/src/vamana.cpp
@@ -128,9 +128,15 @@ namespace grann {
                   << this->_num_points << " points. " << std::endl;
       return;
     }
+    double total_out_degree = 0;
+    for (const auto& neighbors : this->_out_nbrs) {
+      total_out_degree += neighbors.size();
+    }
+    double average_out_degree = total_out_degree / this->_num_points;
 
     std::cout << "..done. Vamana has " << nodes << " nodes and " << cc
                 << " out-edges" << std::endl;
+    std::cout << "Average out degree: " << average_out_degree << std::endl;
   }
 
   /**************************************************************
@@ -326,11 +332,19 @@ namespace grann {
           this->_out_nbrs[node].emplace_back(id);
       }
     }
+    // Calculate average out degree of neighbors
+    double total_out_degree = 0;
+    for (_u64 node = 0; node < this->_num_points; node++) {
+      total_out_degree += this->_out_nbrs[node].size();
+    }
+    double average_out_degree = total_out_degree / this->_num_points;
 
     std::cout << "done." << std::endl;
     this->_has_built = true;
     this->update_degree_stats();
 
+    std::cout << "Average degree " << average_out_degree << std::endl;
+
     std::cout << "Total build time: "
                 << ((double) build_timer.elapsed() / (double) 1000000) << "s"
                 << std::endl;
diff --git a/tests/search_hnsw.cpp b/tests/search_hnsw.cpp
index fd4ea3b..13af99e 100644
--- a/tests/search_hnsw.cpp
+++ b/tests/search_hnsw.cpp
@@ -89,7 +89,7 @@ int search_index(int argc, char** argv) {
 
   grann::HNSW<T> hnsw(metric, num_levels - 1);
   hnsw.load(hnsw_prefix.c_str());  // to load Vamana Index
-  std::cout << "Vamana loaded" << std::endl;
+  std::cout << "HNSW loaded" << std::endl;
   grann::Parameters search_params;
 
   std::string recall_string = "Recall@" + std::to_string(recall_at);