revert: kirill's changes comming with pagerank pr

Author: artemiipatov

benchmarks/GraphBLAS-sharp.Benchmarks/Algorithms/BFS.fs

@@ -12,8 +12,8 @@ open GraphBLAS.FSharp.Objects.ArraysExtensions
 open GraphBLAS.FSharp.Backend.Quotes
 
 [<AbstractClass>]
-[<IterationCount(100)>]
-[<WarmupCount(10)>]
+[<IterationCount(10)>]
+[<WarmupCount(3)>]
 [<Config(typeof<Configs.Matrix>)>]
 type Benchmarks<'elem when 'elem : struct>(
     buildFunToBenchmark,
@@ -27,7 +27,7 @@ type Benchmarks<'elem when 'elem : struct>(
     let mutable matrix = Unchecked.defaultof<ClMatrix<'elem>>
     let mutable matrixHost = Unchecked.defaultof<_>
 
-    member val ResultLevels = Unchecked.defaultof<ClArray<'elem option>> with get,set
+    member val ResultLevels = Unchecked.defaultof<ClVector<'elem>> with get,set
 
     [<ParamsSource("AvailableContexts")>]
     member val OclContextInfo = Unchecked.defaultof<Utils.BenchmarkContext * int> with get, set
@@ -71,7 +71,10 @@ type Benchmarks<'elem when 'elem : struct>(
     member this.ClearInputMatrix() =
         matrix.Dispose this.Processor
 
-    member this.ClearResult() = this.ResultLevels.FreeAndWait this.Processor
+    member this.ClearResult() =
+        match this.ResultLevels with
+        | ClVector.Dense result -> result.FreeAndWait this.Processor
+        | _ -> failwith "Impossible"
 
     member this.ReadMatrix() =
         let converter =
@@ -136,6 +139,30 @@ type BFSWithoutTransferBenchmarkInt32() =
     static member InputMatrixProvider =
         Benchmarks<_>.InputMatrixProviderBuilder "BFSBenchmarks.txt"
 
+type BFSPushPullWithoutTransferBenchmarkInt32() =
+
+    inherit WithoutTransferBenchmark<int>(
+        (Algorithms.BFS.singleSourcePushPull ArithmeticOperations.intSumOption ArithmeticOperations.intMulOption),
+        int32,
+        (fun _ -> Utils.nextInt (System.Random())),
+        0,
+        (fun context matrix -> ClMatrix.CSR <| matrix.ToCSR.ToDevice context))
+
+    static member InputMatrixProvider =
+        Benchmarks<_>.InputMatrixProviderBuilder "BFSBenchmarks.txt"
+
+type SSSPWithoutTransferBenchmarkInt32() =
+
+    inherit WithoutTransferBenchmark<int>(
+        Algorithms.SSSP.run,
+        int32,
+        (fun _ -> Utils.nextInt (System.Random())),
+        0,
+        (fun context matrix -> ClMatrix.CSR <| matrix.ToCSR.ToDevice context))
+
+    static member InputMatrixProvider =
+        Benchmarks<_>.InputMatrixProviderBuilder "BFSBenchmarks.txt"
+
 type WithTransferBenchmark<'elem when 'elem : struct>(
     buildFunToBenchmark,
     converter: string -> 'elem,
@@ -167,8 +194,11 @@ type WithTransferBenchmark<'elem when 'elem : struct>(
     override this.Benchmark() =
         this.LoadMatrixToGPU()
         this.BFS()
-        this.ResultLevels.ToHost this.Processor |> ignore
-        this.Processor.PostAndReply Msg.MsgNotifyMe
+        match this.ResultLevels with
+        | ClVector.Dense result ->
+            result.ToHost this.Processor |> ignore
+            this.Processor.PostAndReply Msg.MsgNotifyMe
+        | _ -> failwith "Impossible"
 
 type BFSWithTransferBenchmarkInt32() =
 

benchmarks/GraphBLAS-sharp.Benchmarks/GraphBLAS-sharp.Benchmarks.fsproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -25,6 +25,7 @@
     <Compile Include="Matrix/Map2/MathNET.fs" />
     <Compile Include="Vector/Map2.fs" />
     <Compile Include="Algorithms/BFS.fs" />
+    <Compile Include="Algorithms/PageRank.fs" />
     <Compile Include="Program.fs" />
     <Folder Include="Datasets" />
   </ItemGroup>

benchmarks/GraphBLAS-sharp.Benchmarks/Matrix/Map2/Map2.fs

@@ -46,7 +46,7 @@ type Benchmarks<'matrixT, 'elem when 'matrixT :> IDeviceMemObject and 'elem : st
     static member AvailableContexts = Utils.availableContexts
 
     static member InputMatricesProviderBuilder pathToConfig =
-        let datasetFolder = "EWiseAdd"
+        let datasetFolder = ""
         pathToConfig
         |> Utils.getMatricesFilenames
         |> Seq.map

benchmarks/GraphBLAS-sharp.Benchmarks/Matrix/SpGeMM/Expand.fs

@@ -13,7 +13,7 @@ open GraphBLAS.FSharp.Benchmarks
 [<AbstractClass>]
 [<IterationCount(100)>]
 [<WarmupCount(10)>]
-[<Config(typeof<Configs.Matrix2>)>]
+[<Config(typeof<Configs.Matrix>)>]
 type Benchmarks<'elem when 'elem : struct>(
         buildFunToBenchmark,
         converter: string -> 'elem,
@@ -22,11 +22,9 @@ type Benchmarks<'elem when 'elem : struct>(
 
     let mutable funToBenchmark = None
 
-    let mutable firstMatrix = Unchecked.defaultof<ClMatrix<'elem>>
-    let mutable secondMatrix = Unchecked.defaultof<ClMatrix<'elem>>
+    let mutable matrix = Unchecked.defaultof<ClMatrix<'elem>>
 
-    let mutable firstMatrixHost = Unchecked.defaultof<_>
-    let mutable secondMatrixHost = Unchecked.defaultof<_>
+    let mutable matrixHost = Unchecked.defaultof<_>
 
     member val ResultMatrix = Unchecked.defaultof<ClMatrix.COO<'elem> option> with get, set
 
@@ -36,7 +34,7 @@ type Benchmarks<'elem when 'elem : struct>(
     [<ParamsSource("InputMatrixProvider")>]
     member val InputMatrixReader = Unchecked.defaultof<MtxReader> with get, set
 
-    member this.OclContext:ClContext = (fst this.OclContextInfo).ClContext
+    member this.OclContext: ClContext = (fst this.OclContextInfo).ClContext
     member this.WorkGroupSize = snd this.OclContextInfo
 
     member this.Processor =
@@ -76,24 +74,21 @@ type Benchmarks<'elem when 'elem : struct>(
         reader.ReadMatrix converter
 
     member this.Mxm() =
-        this.ResultMatrix <- this.FunToBenchmark this.Processor DeviceOnly firstMatrix secondMatrix
+        this.ResultMatrix <- this.FunToBenchmark this.Processor DeviceOnly matrix matrix
 
     member this.ClearInputMatrices() =
-        firstMatrix.Dispose this.Processor
-        secondMatrix.Dispose this.Processor
+        matrix.Dispose this.Processor
 
     member this.ClearResult() =
         match this.ResultMatrix with
         | Some matrix -> matrix.Dispose this.Processor
         | None -> ()
 
     member this.ReadMatrices() =
-        firstMatrixHost <- this.ReadMatrix this.InputMatrixReader
-        secondMatrixHost <- this.ReadMatrix this.InputMatrixReader
+        matrixHost <- this.ReadMatrix this.InputMatrixReader
 
     member this.LoadMatricesToGPU () =
-        firstMatrix <- buildMatrix this.OclContext firstMatrixHost
-        secondMatrix <- buildMatrix this.OclContext secondMatrixHost
+        matrix <- buildMatrix this.OclContext matrixHost
 
     abstract member GlobalSetup : unit -> unit
 

benchmarks/GraphBLAS-sharp.Benchmarks/Matrix/SpGeMM/Masked.fs

@@ -51,7 +51,7 @@ type Masked<'elem when 'elem : struct>(
     static member AvaliableContexts = Utils.availableContexts
 
     static member InputMatrixProviderBuilder pathToConfig =
-        let datasetFolder = "Mxm"
+        let datasetFolder = ""
         pathToConfig
         |> Utils.getMatricesFilenames
         |> Seq.map

benchmarks/GraphBLAS-sharp.Benchmarks/Program.fs

@@ -4,7 +4,9 @@ open BenchmarkDotNet.Running
 [<EntryPoint>]
 let main argv =
     let benchmarks =
-        BenchmarkSwitcher [| typeof<Algorithms.BFS.BFSWithoutTransferBenchmarkInt32> |]
+        BenchmarkSwitcher [| typeof<Algorithms.BFS.BFSWithoutTransferBenchmarkInt32>
+                             typeof<Algorithms.BFS.BFSPushPullWithoutTransferBenchmarkInt32>
+                             typeof<Algorithms.PageRank.PageRankWithoutTransferBenchmarkFloat32> |]
 
     benchmarks.Run argv |> ignore
     0

benchmarks/GraphBLAS-sharp.Benchmarks/Vector/Map2.fs

@@ -27,7 +27,7 @@ type Benchmarks<'elem when 'elem : struct>(
 
     member val HostVectorPair = Unchecked.defaultof<Vector<'elem> * Vector<'elem>> with get, set
 
-    member val ResultVector = Unchecked.defaultof<ClVector<'elem>> with get,set
+    member val ResultVector = Unchecked.defaultof<ClVector<'elem> option> with get,set
 
     [<ParamsSource("AvailableContexts")>]
     member val OclContextInfo = Unchecked.defaultof<Utils.BenchmarkContext * int> with get, set
@@ -67,7 +67,9 @@ type Benchmarks<'elem when 'elem : struct>(
         secondVector.Dispose this.Processor
 
     member this.ClearResult() =
-        this.ResultVector.Dispose this.Processor
+        match this.ResultVector with
+        | Some v -> v.Dispose this.Processor
+        | None -> ()
 
     member this.CreateVectors()  =
         this.HostVectorPair <- List.last (Gen.sample this.Size 1 generator)
@@ -162,8 +164,12 @@ module WithTransfer =
         override this.Benchmark () =
             this.LoadVectorsToGPU()
             this.Map2()
-            this.ResultVector.ToHost this.Processor |> ignore
-            this.Processor.PostAndReply Msg.MsgNotifyMe
+            match this.ResultVector with
+            | Some v ->
+                v.ToHost this.Processor |> ignore
+                this.Processor.PostAndReply Msg.MsgNotifyMe
+            | None -> ()
+
 
         [<IterationCleanup>]
         override this.IterationCleanup () =