New implementations of kernel 2 and 3 for graph500

benchmarks/graph500seq/dune

@@ -1,28 +1,27 @@
-; kernel1 and kronecker have been replaced with new, more optimized
-; implementations.
-(executable (name kronecker) (modules kronecker))
-(library (name kernel1Old) (modules kernel1Old))
-(executable (name kernel2) (modules kernel2) (libraries kernel1Old))
-(executable (name kernel3) (modules kernel3) (libraries kernel1Old))
-
-;;;;; Newer implementations ;;;;;
 
 (library
   (name generateSeq)
   (modules generateSeq)
-  (libraries graphTypes)
+  (libraries graphTypes fileHandler)
+)
+
+(library
+  (name fileHandler)
+  (modules fileHandler)
 )
 
 (executable
   (name gen)
   (modules gen)
-  (libraries unix generateSeq)
+  (libraries unix generateSeq fileHandler)
 )
 
 (library
   (name sparseGraphSeq)
   (modules sparseGraphSeq)
   (libraries graphTypes)
+  ;(preprocess; (pps ppx_inline_test ppx_assert))
+  ;(inline_tests)
 )
 
 (library
@@ -31,14 +30,64 @@
   (libraries generateSeq sparseGraphSeq unix)
 )
 
+(library
+  (name kernel2Seq)
+  (modules kernel2Seq)
+  (libraries generateSeq sparseGraphSeq unix)
+  ;(preprocess; (pps ppx_inline_test ppx_assert))
+  ;(inline_tests)
+)
+
+(library
+  (name kernel3Seq)
+  (modules kernel3Seq)
+  (libraries graphTypes generateSeq sparseGraphSeq unix)
+  ;(preprocess; (pps ppx_inline_test ppx_assert))
+  ;(inline_tests)
+)
+
+(executable
+  (name sampleSearchKeys)
+  (modules sampleSearchKeys)
+  (libraries graphTypes generateSeq sparseGraphSeq unix)
+)
+
 (executable
   (name kernel1_run)
   (modules kernel1_run)
-  (libraries graphTypes generateSeq kernel1Seq unix)
+  (libraries sparseGraphSeq graphTypes fileHandler kernel1Seq unix)
 )
 
-(alias
-  (name buildbench)
-  (deps kronecker.exe kernel2.exe kernel3.exe
-        gen.exe kernel1_run.exe)
+(executable
+  (name kernel2_run)
+  (modules kernel2_run)
+  (modes byte exe)
+  (libraries sparseGraphSeq graphTypes fileHandler kernel2Seq unix)
 )
+
+(executable
+  (name kernel2_run_multicore)
+  (modules kernel2_run_multicore)
+  (modes byte exe)
+  (libraries domainslib sparseGraphSeq graphTypes fileHandler kernel2Seq unix)
+)
+
+(executable
+  (name kernel3_run)
+  (modules kernel3_run)
+  (modes byte exe)
+  (libraries sparseGraphSeq graphTypes fileHandler kernel3Seq unix)
+)
+
+(executable
+  (name kernel3_run_multicore)
+  (modules kernel3_run_multicore)
+  (modes byte exe)
+  (libraries domainslib sparseGraphSeq graphTypes fileHandler kernel3Seq unix)
+)
+
+;(alias
+;  (name buildbench)
+;  (deps kronecker.exe kernel2.exe kernel3.exe
+;        gen.exe kernel1_run.exe)
+;)

benchmarks/graph500seq/fileHandler.ml

@@ -0,0 +1,10 @@
+let to_file ~filename (data : 'a ) =
+  let out = open_out filename in
+  Marshal.to_channel out data [];
+  close_out out
+
+let from_file filename =
+  let in_ = open_in filename in
+  let res : 'a = Marshal.from_channel in_ in
+  close_in in_;
+  res

benchmarks/graph500seq/fileHandler.mli

@@ -0,0 +1,3 @@
+val to_file : filename:string -> 'a -> unit
+
+val from_file : string -> 'a

benchmarks/graph500seq/gen.ml

@@ -18,9 +18,9 @@ let () =
     Printf.eprintf "Must provide graph file argument.\n"; exit 1
   end;
   let scale = !scale and edge_factor = !edge_factor in
-  Printf.printf "Generating edge list...\n%!";
+  Printf.printf "Generating edge list of scale %d...\n%!" scale;
   let t0 = Unix.gettimeofday () in
   let edges = GenerateSeq.go ~scale ~edge_factor in
   let t1 = Unix.gettimeofday () in
   Printf.printf "Generated. Time: %f s.\n" (t1 -. t0);
-  GenerateSeq.to_file ~filename:!filename edges;
+  FileHandler.to_file ~filename:!filename edges;

benchmarks/graph500seq/genAndKernel1.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+SCALE=$1
+
+gen () { ./_build/default/gen.exe -scale $SCALE edges.data; }
+
+kernel1 () { ./_build/default/kernel1_run.exe edges.data -o sparse.data; }
+
+getSamples () { ./_build/default/sampleSearchKeys.exe sparse.data -o samples.data; }
+
+gen && kernel1 && getSamples 
+
+

benchmarks/graph500seq/generateSamples.ml

@@ -0,0 +1,3 @@
+let _ = 
+    let samples = Array.init nsamples (fun _ -> SparseGraphSeq.get_sample graph) in
+    FileHandler.to_file ~filename:!filename samples

benchmarks/graph500seq/generateSeq.ml

@@ -85,16 +85,5 @@ let kronecker ~scale ~edge_factor : (vertex * vertex * weight) array =
 let go ~scale ~edge_factor =
   kronecker ~scale ~edge_factor
 
-let to_file ~filename (edges : edge array) =
-  let out = open_out filename in
-  Marshal.to_channel out edges [];
-  close_out out
-
-let from_file filename =
-  let in_ = open_in filename in
-  let res : edge array = Marshal.from_channel in_ in
-  close_in in_;
-  res
-
 let generate_to_file ~scale ~edge_factor ~filename =
-  go ~scale ~edge_factor |> to_file ~filename
+  go ~scale ~edge_factor |> FileHandler.to_file ~filename

benchmarks/graph500seq/generateSeq.mli

@@ -1,6 +1,4 @@
 open GraphTypes
 
 val go : scale:int -> edge_factor:int -> edge array
-val to_file : filename:string -> edge array -> unit
-val from_file : string -> edge array
 val generate_to_file : scale:int -> edge_factor:int -> filename:string -> unit

benchmarks/graph500seq/graphTypes.mli

@@ -0,0 +1,3 @@
+type vertex = int
+type weight = float
+type edge = vertex * vertex * weight

benchmarks/graph500seq/kernel1_run.ml

@@ -1,18 +1,23 @@
-let filename = ref ""
+let usage_msg = "kernel1Seq_run.exe <edge_list_input_file> -o <sparse_graph_output_file>"
+let edge_list_input_filename = ref ""
+let sparse_graph_output_filename = ref ""
+
+let speclist = [("-o", Arg.Set_string sparse_graph_output_filename, "Set output file name")]
 
 let () =
   Random.self_init ();
-  Arg.parse [] (fun s -> filename := s)
-    "kernel1Par.exe EDGE_LIST_FILE";
-  if !filename = "" then begin
-    Printf.eprintf "Must provide graph file argument.\n"; exit 1
+  Arg.parse speclist (fun s -> edge_list_input_filename := s) usage_msg;
+  if !edge_list_input_filename = "" then begin
+    Printf.eprintf "Must provide edge list input file argument.\n"; exit 1
   end;
-  Printf.printf "Reading edge list from %s...\n%!" !filename;
+  Printf.printf "Reading edge list from %s...\n%!" !edge_list_input_filename;
   let t0 = Unix.gettimeofday () in
-  let edges = GenerateSeq.from_file !filename in
+  let edges = FileHandler.from_file !edge_list_input_filename in
   let t1 = Unix.gettimeofday () in
   Printf.printf "Done. Time: %f s.\nBuilding sparse representation...\n%!" (t1 -. t0);
   let t0 = Unix.gettimeofday () in
-  ignore @@ Sys.opaque_identity @@ Kernel1Seq.kernel1 edges;
+  let sparse_graph = Kernel1Seq.kernel1 edges in
   let t1 = Unix.gettimeofday () in
   Printf.printf "Done. Time: %f\n" (t1 -. t0);
+  FileHandler.to_file ~filename:!sparse_graph_output_filename sparse_graph;
+