Add matrix shape columns to benchmarks summary; change run strategy

Author: dpanfilyonok

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksEWiseAdd.fs

@@ -23,22 +23,23 @@ with
         let (ClContext context) = this
         let device = context.Device
         let deviceName = Cl.GetDeviceInfo(device, DeviceInfo.Name, &e).ToString()
-        sprintf "%20s" deviceName
-
-type InputMatrixFormat = {
-    MatrixName: string
-    MatrixStructure: COOFormat<float>
-}
-with
-    override this.ToString() =
-        sprintf "%s (%i, %i)"
-            this.MatrixName
-            this.MatrixStructure.RowCount
-            this.MatrixStructure.ColumnCount
+        if deviceName.Length < 20 then
+            sprintf "%s" deviceName
+        else
+            let platform = Cl.GetDeviceInfo(device, DeviceInfo.Platform, &e).CastTo<Platform>()
+            let platformName = Cl.GetPlatformInfo(platform, PlatformInfo.Name, &e).ToString()
+            let deviceType =
+                match Cl.GetDeviceInfo(device, DeviceInfo.Type, &e).CastTo<DeviceType>() with
+                | DeviceType.Cpu -> "CPU"
+                | DeviceType.Gpu -> "GPU"
+                | DeviceType.Accelerator -> "Accelerator"
+                | _ -> "another"
+
+            sprintf "%s, %s" platformName deviceType
 
 [<MinColumn; MaxColumn>]
 [<Config(typeof<Config>)>]
-[<SimpleJob(RunStrategy.Throughput)>]
+[<SimpleJob(RunStrategy.ColdStart, targetCount=1)>]
 type EWiseAddBenchmarks() =
     let mutable leftCOO = Unchecked.defaultof<Matrix<float>>
     let mutable rightCOO = Unchecked.defaultof<Matrix<float>>
@@ -179,7 +180,7 @@ type EWiseAddBenchmarks() =
             let (nrows, ncols, nnz) =
                 matrixInfo.[0], matrixInfo.[1], matrixInfo.[2]
 
-            [ 0 .. nnz - 1 ]
+            [0 .. nnz - 1]
             |> List.map
                 (fun _ ->
                     streamReader.ReadLine().Split(' ')

benchmarks/GraphBLAS-sharp.Benchmarks/Config.fs

@@ -1,37 +1,52 @@
 namespace GraphBLAS.FSharp.Benchmarks
 
-open GraphBLAS.FSharp.Algorithms
-open BenchmarkDotNet.Attributes
 open BenchmarkDotNet.Configs
 open BenchmarkDotNet.Columns
 open BenchmarkDotNet.Reports
 open BenchmarkDotNet.Running
 open BenchmarkDotNet.Filters
-open System.IO
+open GraphBLAS.FSharp
+
+type InputMatrixFormat = {
+    MatrixName: string
+    MatrixStructure: COOFormat<float>
+}
+with
+    override this.ToString() =
+        sprintf "%s" this.MatrixName
+
+type MatrixShapeColumn(columnName: string, getShape: InputMatrixFormat -> int) =
+    interface IColumn with
+        member this.AlwaysShow: bool = true
+        member this.Category: ColumnCategory = ColumnCategory.Params
+        member this.ColumnName: string = columnName
+        member this.GetValue(summary: Summary, benchmarkCase: BenchmarkCase): string =
+            let inputMatrix = benchmarkCase.Parameters.["InputMatrix"] :?> InputMatrixFormat
+            sprintf "%i" <| getShape inputMatrix
+        member this.GetValue(summary: Summary, benchmarkCase: BenchmarkCase, style: SummaryStyle): string =
+            (this :> IColumn).GetValue(summary, benchmarkCase)
+        member this.Id: string = sprintf "%s.%s" "MatrixShapeColumn" columnName
+        member this.IsAvailable(summary: Summary): bool = true
+        member this.IsDefault(summary: Summary, benchmarkCase: BenchmarkCase): bool = false
+        member this.IsNumeric: bool = true
+        member this.Legend: string = sprintf "%s of input matrix" columnName
+        member this.PriorityInCategory: int = 1
+        member this.UnitType: UnitType = UnitType.Size
 
 type TEPSColumn() =
     interface IColumn with
         member this.AlwaysShow: bool = true
         member this.Category: ColumnCategory = ColumnCategory.Statistics
         member this.ColumnName: string = "TEPS"
         member this.GetValue(summary: Summary, benchmarkCase: BenchmarkCase): string =
+            let inputMatrix = benchmarkCase.Parameters.["InputMatrix"] :?> InputMatrixFormat
+            let (nrows, ncols, nnz) =
+                inputMatrix.MatrixStructure.RowCount,
+                inputMatrix.MatrixStructure.ColumnCount,
+                inputMatrix.MatrixStructure.Values.Length
+            let (vertices, edges) = if nrows = ncols then (nrows, nnz) else (ncols, nrows)
             let meanTime = summary.[benchmarkCase].ResultStatistics.Mean
-            let pathToFirstGraph = benchmarkCase.Parameters.["PathToGraphPair"] :?> (string * string) |> fst
-            let getFullPathToGraph filename =
-                Path.Join [| __SOURCE_DIRECTORY__
-                             "Datasets"
-                             "EWiseAddDatasets"
-                             filename |]
-            match Path.GetExtension pathToFirstGraph with
-            | ".mtx" ->
-                use streamReader = new StreamReader(pathToFirstGraph |> getFullPathToGraph)
-                while streamReader.Peek() = int '%' do
-                    streamReader.ReadLine() |> ignore
-                let matrixInfo = streamReader.ReadLine().Split(' ') |> Array.map int
-                let (nrows, ncols, nnz) = matrixInfo.[0], matrixInfo.[1], matrixInfo.[2]
-                let (vertices, edges) = if nrows = ncols then (nrows, nnz) else (ncols, nrows)
-                sprintf "%f" <| float edges / (meanTime * 1e-6)
-            | another -> sprintf "%s files not supported" another
+            sprintf "%f" <| float edges / (meanTime * 1e-6)
         member this.GetValue(summary: Summary, benchmarkCase: BenchmarkCase, style: SummaryStyle): string =
             (this :> IColumn).GetValue(summary, benchmarkCase)
         member this.Id: string = "TEPSColumn"
@@ -46,5 +61,18 @@ type Config() =
     inherit ManualConfig()
 
     do
-        // base.AddColumn [| TEPSColumn() :> IColumn |] |> ignore
-        base.AddFilter [| NameFilter(fun name -> name.Contains "MathNet" || name.Contains "COO") :> IFilter |] |> ignore
+        base.AddColumn(
+            MatrixShapeColumn("RowCount", fun matrix -> matrix.MatrixStructure.RowCount) :> IColumn,
+            MatrixShapeColumn("ColumnCount", fun matrix -> matrix.MatrixStructure.ColumnCount) :> IColumn,
+            MatrixShapeColumn("NNZ", fun matrix -> matrix.MatrixStructure.Values.Length) :> IColumn,
+            TEPSColumn() :> IColumn
+        )
+        |> ignore
+
+        base.AddFilter(
+            DisjunctionFilter(
+                NameFilter(fun name -> name.Contains "MathNet") :> IFilter,
+                NameFilter(fun name -> name.Contains "COO") :> IFilter
+            )
+        )
+        |> ignore