refactor: tests

Author: IgorErin

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

@@ -30,7 +30,7 @@ type Benchmarks<'elem when 'elem : struct>(
     let mutable firstMatrixHost = Unchecked.defaultof<_>
     let mutable secondMatrixHost = Unchecked.defaultof<_>
 
-    member val ResultMatrix = Unchecked.defaultof<ClMatrix<'elem>> with get, set
+    member val ResultMatrix = Unchecked.defaultof<ClMatrix.COO<'elem> option> with get, set
 
     [<ParamsSource("AvailableContexts")>]
     member val OclContextInfo = Unchecked.defaultof<Utils.BenchmarkContext * int> with get, set
@@ -85,7 +85,9 @@ type Benchmarks<'elem when 'elem : struct>(
         secondMatrix.Dispose this.Processor
 
     member this.ClearResult() =
-        this.ResultMatrix.Dispose this.Processor
+        match this.ResultMatrix with
+        | Some matrix -> matrix.Dispose this.Processor
+        | None -> ()
 
     member this.ReadMatrices() =
         firstMatrixHost <- this.ReadMatrix this.InputMatrixReader
@@ -134,14 +136,14 @@ module WithoutTransfer =
         override this.GlobalCleanup () =
             this.ClearInputMatrices()
 
-    // type Float32() =
-    //
-    //     inherit Benchmark<float32>(
-    //         Matrix.SpGeMM.expand (fst ArithmeticOperations.float32Add) (fst ArithmeticOperations.float32Mul),
-    //         float32,
-    //         (fun _ -> Utils.nextSingle (System.Random())),
-    //         (fun context matrix -> ClMatrix.CSR <| matrix.ToCSR.ToDevice context)
-    //         )
-    //
-    //     static member InputMatrixProvider =
-    //         Benchmarks<_>.InputMatrixProviderBuilder "SpGeMM.txt"
+    type Float32() =
+
+        inherit Benchmark<float32>(
+            Matrix.SpGeMM.expand (fst ArithmeticOperations.float32Add) (fst ArithmeticOperations.float32Mul),
+            float32,
+            (fun _ -> Utils.nextSingle (System.Random())),
+            (fun context matrix -> ClMatrix.CSR <| matrix.ToCSR.ToDevice context)
+            )
+
+        static member InputMatrixProvider =
+            Benchmarks<_>.InputMatrixProviderBuilder "SpGeMM.txt"

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -2,9 +2,112 @@ open Expecto
 open GraphBLAS.FSharp.Tests.Backend
 open GraphBLAS.FSharp.Tests
 
+let matrixTests =
+    testList
+        "Matrix"
+        [ Matrix.Convert.tests
+          Matrix.Map2.allTests
+          Matrix.Map.allTests
+          Matrix.Merge.allTests
+          Matrix.Transpose.tests
+          Matrix.RowsLengths.tests
+          Matrix.ByRows.tests
+          Matrix.ExpandRows.tests
+          Matrix.SubRows.tests
 
-[<EntryPoint>]
-let main argv =
-    Matrix.SpGeMM.Expand.generalTests
+          Matrix.SpGeMM.Expand.generalTests
+          Matrix.SpGeMM.Masked.tests ]
+    |> testSequenced
+
+let commonTests =
+    let scanTests =
+        testList
+            "Scan"
+            [ Common.Scan.ByKey.sequentialSegmentsTests
+              Common.Scan.PrefixSum.tests ]
+
+    let reduceTests =
+        testList
+            "Reduce"
+            [ Common.Reduce.ByKey.allTests
+              Common.Reduce.Reduce.tests
+              Common.Reduce.Sum.tests ]
+
+    let clArrayTests =
+        testList
+            "ClArray"
+            [ Common.ClArray.RemoveDuplicates.tests
+              Common.ClArray.Copy.tests
+              Common.ClArray.Replicate.tests
+              Common.ClArray.Exists.tests
+              Common.ClArray.Map.tests
+              Common.ClArray.Map2.addTests
+              Common.ClArray.Map2.mulTests
+              Common.ClArray.Choose.allTests
+              Common.ClArray.ChunkBySize.allTests
+              Common.ClArray.Blit.tests
+              Common.ClArray.Concat.tests
+              Common.ClArray.Fill.tests
+              Common.ClArray.Pairwise.tests
+              Common.ClArray.UpperBound.tests ]
+
+    let sortTests =
+        testList
+            "Sort"
+            [ Common.Sort.Bitonic.tests
+              Common.Sort.Radix.allTests ]
+
+    testList
+        "Common"
+        [ Common.Scatter.allTests
+          Common.Gather.allTests
+          Common.Merge.tests
+          clArrayTests
+          sortTests
+          reduceTests
+          scanTests ]
     |> testSequenced
-    |> runTestsWithCLIArgs [] argv
+
+let vectorTests =
+    testList
+        "Vector"
+        [ Vector.SpMV.tests
+          Vector.ZeroCreate.tests
+          Vector.OfList.tests
+          Vector.Copy.tests
+          Vector.Convert.tests
+          Vector.Map2.allTests
+          Vector.AssignByMask.tests
+          Vector.AssignByMask.complementedTests
+          Vector.Reduce.tests
+          Vector.Merge.tests ]
+    |> testSequenced
+
+let algorithmsTests =
+    testList "Algorithms tests" [ Algorithms.BFS.tests ]
+    |> testSequenced
+
+let deviceTests =
+    testList
+        "Device"
+        [ matrixTests
+          commonTests
+          vectorTests
+          algorithmsTests ]
+    |> testSequenced
+
+let hostTests =
+    testList
+        "Host"
+        [ Host.Matrix.FromArray2D.tests
+          Host.Matrix.Convert.tests
+          Host.IO.MtxReader.test ]
+    |> testSequenced
+
+[<Tests>]
+let allTests =
+    testList "All" [ deviceTests; hostTests ]
+    |> testSequenced
+
+[<EntryPoint>]
+let main argv = allTests |> runTestsWithCLIArgs [] argv