fixed merge conflict

cmuparlay · May 16, 2024 · 6577718 · 6577718
2 parents 627bb2b + 889955d
commit 6577718
Show file tree

Hide file tree

Showing 17 changed files with 1,636 additions and 918 deletions.
diff --git a/algorithms/bench/benchUtils.h b/algorithms/bench/benchUtils.h
diff --git a/algorithms/bench/neighborsTime.C b/algorithms/bench/neighborsTime.C
@@ -98,7 +98,11 @@ int main(int argc, char* argv[]) {
   long cluster_size = P.getOptionIntValue("-cluster_size", 0);
   if(cluster_size<0) P.badArgument();
   long k = P.getOptionIntValue("-k", 0);
+<<<<<<< HEAD
   if (k > 1000 || k < 0) P.badArgument();
+=======
+  //if (k > 1000 || k < 0) P.badArgument();
+>>>>>>> 889955dcc0c40dba385245c4a4a08fba3d06a5e7
   double alpha = P.getOptionDoubleValue("-alpha", 1.0);
   int two_pass = P.getOptionIntValue("-two_pass", 0);
   if(two_pass > 1 | two_pass < 0) P.badArgument();

diff --git a/algorithms/utils/BUILD b/algorithms/utils/BUILD
@@ -2,25 +2,42 @@
 
 package(default_visibility = ["//algorithms:__subpackages__"])
 
+
 cc_library(
-    name = "types",
-    hdrs = ["types.h"],
+    name = "csvfile",
+    hdrs = ["csvfile.h"],
+)
+
+cc_library(
+    name = "beamSearch",
+    hdrs = ["beamSearch.h"],
     deps = [
+        "@parlaylib//parlay:io",
         "@parlaylib//parlay:parallel",
         "@parlaylib//parlay:primitives",
+        "@parlaylib//parlay:random",
+        ":types",
+        ":graph",
+        ":stats",
     ],
 )
 
 cc_library(
-    name = "NSGDist",
-    hdrs = ["NSGDist.h"],
+    name = "check_range_recall",
+    hdrs = ["check_nn_recall.h"],
     deps = [
         "@parlaylib//parlay:parallel",
         "@parlaylib//parlay:primitives",
+        ":beamSearch",
+        ":csvfile",
+        ":parse_results",
+        ":stats",
+        ":types",
     ],
 )
 
 cc_library(
+<<<<<<< HEAD
     name = "beamSearch",
     hdrs = ["beamSearch.h"],
     deps = [
@@ -30,32 +47,107 @@ cc_library(
         "@parlaylib//parlay:random",
         ":indexTools",
         ":types",
+=======
+    name = "check_nn_recall",
+    hdrs = ["check_nn_recall.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+        ":beamSearch",
+        ":csvfile",
+        ":parse_results",
+        ":stats",
+        ":types",
+    ],
+)
+
+cc_library(
+    name = "euclidean_point",
+    hdrs = ["euclidean_point.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+        "@parlaylib//parlay/internal:file_map",
+        "//algorithms/bench:parse_command_line",
+        ":parse_results",
+>>>>>>> 889955dcc0c40dba385245c4a4a08fba3d06a5e7
         ":NSGDist",
     ],
 )
 
 cc_library(
+<<<<<<< HEAD
     name = "stats",
     hdrs = ["stats.h"],
     deps = [
         "@parlaylib//parlay:parallel",
         "@parlaylib//parlay:primitives",
         ":indexTools",
+=======
+    name = "graph",
+    hdrs = ["graph.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+        "@parlaylib//parlay/internal:file_map",
+        "//algorithms/bench:parse_command_line",
+        ":parse_results",
+        ":NSGDist",
+    ],
+)
+
+cc_library(
+    name = "mips_point",
+    hdrs = ["mips_point.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+        "@parlaylib//parlay/internal:file_map",
+        "//algorithms/bench:parse_command_line",
+        ":NSGDist",
+>>>>>>> 889955dcc0c40dba385245c4a4a08fba3d06a5e7
         ":types",
     ],
 )
 
 cc_library(
+<<<<<<< HEAD
+=======
+    name = "mmap",
+    hdrs = ["mmap.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+        "@parlaylib//parlay/internal:file_map",
+        "//algorithms/bench:parse_command_line",
+    ],
+)
+
+cc_library(
+    name = "NSGDist",
+    hdrs = ["NSGDist.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+    ],
+)
+
+cc_library(
+>>>>>>> 889955dcc0c40dba385245c4a4a08fba3d06a5e7
     name = "parse_results",
     hdrs = ["parse_results.h"],
     deps = [
         "@parlaylib//parlay:parallel",
         "@parlaylib//parlay:primitives",
+<<<<<<< HEAD
         ":indexTools",
+=======
+>>>>>>> 889955dcc0c40dba385245c4a4a08fba3d06a5e7
     ],
 )
 
 cc_library(
+<<<<<<< HEAD
     name = "check_nn_recall",
     hdrs = ["check_nn_recall.h"],
     deps = [
@@ -65,11 +157,60 @@ cc_library(
         ":csvfile",
         ":indexTools",
         ":parse_results",
+=======
+    name = "point_range",
+    hdrs = ["point_range.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+        "@parlaylib//parlay/internal:file_map",
+        "//algorithms/bench:parse_command_line",
+>>>>>>> 889955dcc0c40dba385245c4a4a08fba3d06a5e7
         ":types",
     ],
 )
 
 cc_library(
+<<<<<<< HEAD
     name = "csvfile",
     hdrs = ["csvfile.h"],
 )
+=======
+    name = "stats",
+    hdrs = ["stats.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+    ],
+)
+
+cc_library(
+    name = "types",
+    hdrs = ["types.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+        ":mmap",
+    ],
+)
+
+cc_library(
+    name = "types",
+    hdrs = ["types.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+    ],
+)
+
+cc_library(
+    name = "union",
+    hdrs = ["union.h"],
+    deps = [
+        "@parlaylib//parlay:parallel",
+        "@parlaylib//parlay:primitives",
+    ],
+)
+
+
+>>>>>>> 889955dcc0c40dba385245c4a4a08fba3d06a5e7