Add vector/matrix builders. Add comments to benchmark

Author: dpanfilyonok

benchmarks/GraphBLAS-sharp.Benchmarks/BfsBenchmark.fs

@@ -28,6 +28,8 @@ type BfsBenchmark() =
     member this.LevelBFS () =
         levelBFS matrix source
 
+    /// Sequence of paths to files where data for benchmarking will be taken from
     static member GraphPaths = seq {
+        // Gets all mtx files from following directory
         yield! Directory.EnumerateFiles(Path.Join [|"Datasets"; "1"|], "*.mtx")
     }

benchmarks/GraphBLAS-sharp.Benchmarks/Config.fs

@@ -36,7 +36,6 @@ type TEPSColumn() =
         member this.PriorityInCategory: int = 0
         member this.UnitType: UnitType = UnitType.Dimensionless
 
-
 type Config() =
     inherit ManualConfig()
 

benchmarks/GraphBLAS-sharp.Benchmarks/DownloadGraphs.fsx

@@ -1,27 +1,26 @@
 #r "nuget: FSharp.Data"
-#r "nuget: Luna.ConsoleProgressBar"
 
 open System
 open System.IO
 open System.Net
 open System.IO.Compression
 open FSharp.Data
 open FSharp.Data.CsvExtensions
-open Luna.ConsoleProgressBar
 
-let downloadGraphs graphName archiveType url (outputDir: string) =
+let downloadAndUnzip graphName archiveType url outputDir =
     use client = new WebClient()
-    // use bar = new ConsoleProgressBar()
-    // client.DownloadProgressChanged.Add (fun e ->
-    //     bar.Report (float e.ProgressPercentage / 100.)
-    // )
     match archiveType with
     | "zip" ->
         let archive = Path.Combine [| outputDir; Path.ChangeExtension(graphName, ".zip") |]
         client.AsyncDownloadFile(Uri url, archive) |> Async.RunSynchronously
         ZipFile.ExtractToDirectory(archive, outputDir)
     | _ -> ()
 
+(*
+    Get all "graphs.csv" flies
+    -> load all rows from all csv files
+    -> download and unzip graph archives
+*)
 seq {
     for dir in fsi.CommandLineArgs.[1..] do
         yield! Directory.EnumerateFiles(dir, "graphs.csv", SearchOption.AllDirectories)
@@ -31,5 +30,5 @@ seq {
     CsvFile.Load(pathToCsv, separators=",", hasHeaders=true).Rows |> Seq.allPairs <| Seq.singleton pathToCsv)
 |> Seq.iter (fun (row, pathToCsv) ->
     let datasetRootPath = Path.GetDirectoryName pathToCsv
-    downloadGraphs row?GraphName row?ArchiveType row?Url datasetRootPath)
+    downloadAndUnzip row?GraphName row?ArchiveType row?Url datasetRootPath)
 

src/GraphBLAS-sharp/Abstracts.fs

@@ -27,8 +27,8 @@ type Matrix<'a when 'a : struct and 'a : equality>(nrow: int, ncol: int) =
 
     static member inline (+) (x: Matrix<'a>, y: Matrix<'a>) = x.EWiseAdd y
     static member inline (*) (x: Matrix<'a>, y: Matrix<'a>) = x.EWiseMult y
-    static member inline (.@) (x: Matrix<'a>, y: Matrix<'b>) = x.Mxm y
-    static member inline (.@) (x: Matrix<'a>, y: Vector<'b>) = x.Mxv y
+    static member inline (@.) (x: Matrix<'a>, y: Matrix<'b>) = x.Mxm y
+    static member inline (@.) (x: Matrix<'a>, y: Vector<'b>) = x.Mxv y
 
 and [<AbstractClass>] Vector<'a when 'a : struct and 'a : equality>(size: int) =
     abstract Size: int
@@ -49,7 +49,7 @@ and [<AbstractClass>] Vector<'a when 'a : struct and 'a : equality>(size: int) =
 
     static member inline (+) (x: Vector<'a>, y: Vector<'a>) = x.EWiseAdd y
     static member inline (*) (x: Vector<'a>, y: Vector<'a>) = x.EWiseMult y
-    static member inline (.@) (x: Vector<'a>, y: Matrix<'b>) = x.Vxm y
+    static member inline (@.) (x: Vector<'a>, y: Matrix<'b>) = x.Vxm y
 
 and Mask1D = {
     Indices: int list

src/GraphBLAS-sharp/Algorithms/BFS.fs

@@ -16,7 +16,7 @@ module BFS =
         while !> (frontier.Reduce BooleanMonoid.any) && currentLevel < vertexCount do
             levels.Fill(Mask1D.regular frontier) <- Scalar currentLevel
             frontier.Clear()
-            frontier.[Mask1D.complemented levels] <- (frontier .@ matrix) (Mask1D.complemented levels) BooleanSemiring.anyAll
+            frontier.[Mask1D.complemented levels] <- (frontier @. matrix) (Mask1D.complemented levels) BooleanSemiring.anyAll
             currentLevel <- currentLevel + 1
 
         upcast levels

src/GraphBLAS-sharp/Algorithms/SSSP.fs

@@ -10,6 +10,6 @@ module SSSP =
         let distance = SparseVector(vertexCount, [source, 0.])
 
         for _ in 1 .. vertexCount - 1 do
-            distance.[Mask1D.none] <- (distance .@ matrix) Mask1D.none FloatSemiring.addMult
+            distance.[Mask1D.none] <- (distance @. matrix) Mask1D.none FloatSemiring.addMult
 
         upcast distance

src/GraphBLAS-sharp/Backend.fs

@@ -0,0 +1,3 @@
+namespace GraphBLAS.FSharp
+
+exception DimensionalMismatchException of string

src/GraphBLAS-sharp/Exceptions.fs

@@ -9,9 +9,5 @@ module GlobalContext =
         | COO
         | Dense
 
-    type VectorBackendFormat =
-        | Sparse
-        | Dense
-
     let mutable oclContext = OpenCLEvaluationContext()
     let mutable matrixBackendFormat = CSR

src/GraphBLAS-sharp/GlobalContext.fs

@@ -9,14 +9,14 @@
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Helpers.fs" />
-    <Compile Include="GlobalContext.fs" />
+    <Compile Include="Exceptions.fs" />
     <Compile Include="Operators.fs" />
     <Compile Include="Monoid.fs" />
     <Compile Include="Semiring.fs" />
+    <Compile Include="GlobalContext.fs" />
     <Compile Include="Scalar.fs" />
     <Compile Include="Abstracts.fs" />
     <Compile Include="Implementations.fs" />
-    <Compile Include="Backend.fs" />
     <Compile Include="Matrix.fs" />
     <Compile Include="Vector.fs" />
     <Compile Include="Masks.fs" />
@@ -28,4 +28,4 @@
     <Compile Include="Algorithms/TriangleCounting.fs" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>