Reduced code duplication in tests, new helpers modules

Author: kirillgarbar

tests/GraphBLAS-sharp.Tests/BackendCommonTests/BitonicSortTests.fs

@@ -6,6 +6,7 @@ open Expecto.Logging.Message
 open GraphBLAS.FSharp.Backend.Common
 open Brahma.FSharp
 open GraphBLAS.FSharp.Tests.Utils
+open GraphBLAS.FSharp.Tests.Context
 
 let logger = Log.create "BitonicSort.Tests"
 

tests/GraphBLAS-sharp.Tests/BackendCommonTests/ConvertTests.fs

@@ -4,7 +4,7 @@ open Expecto
 open Expecto.Logging
 open Expecto.Logging.Message
 open GraphBLAS.FSharp.Tests.Utils
-
+open GraphBLAS.FSharp.Tests.Context
 open GraphBLAS.FSharp.Backend
 open GraphBLAS.FSharp
 

tests/GraphBLAS-sharp.Tests/BackendCommonTests/CopyTests.fs

@@ -9,10 +9,10 @@ open GraphBLAS.FSharp.Tests
 
 let logger = Log.create "Copy.Tests"
 
-let context = Utils.defaultContext.ClContext
+let context = Context.defaultContext.ClContext
 
 let testCases =
-    let q = Utils.defaultContext.Queue
+    let q = Context.defaultContext.Queue
     q.Error.Add(fun e -> failwithf "%A" e)
 
     let getCopyFun copy =

tests/GraphBLAS-sharp.Tests/BackendCommonTests/MatrixElementwiseTests.fs

@@ -8,7 +8,7 @@ open Expecto.Logging.Message
 open Brahma.FSharp
 open GraphBLAS.FSharp.Backend
 open GraphBLAS.FSharp
-open GraphBLAS.FSharp.Tests
+open GraphBLAS.FSharp.Tests.TestCases
 open GraphBLAS.FSharp.Tests.Utils
 open Microsoft.FSharp.Collections
 open OpenCL.Net
@@ -52,7 +52,7 @@ let correctnessGenericTest
     toCOOFun
     (isEqual: 'a -> 'a -> bool)
     q
-    (case: OperationCase)
+    (case: MatrixOperationCase)
     (leftMatrix: 'a [,], rightMatrix: 'a [,])
     =
 
@@ -135,21 +135,7 @@ let testFixturesEWiseAdd case =
       |> testPropertyWithConfig config (getCorrectnessTestName "byte") ]
 
 let elementwiseAddTests =
-    testCases
-    |> List.filter
-        (fun case ->
-            let mutable e = ErrorCode.Unknown
-            let device = case.ClContext.ClContext.ClDevice.Device
-
-            let deviceType =
-                Cl
-                    .GetDeviceInfo(device, DeviceInfo.Type, &e)
-                    .CastTo<DeviceType>()
-
-            deviceType = DeviceType.Gpu)
-    |> List.distinctBy (fun case -> case.ClContext.ClContext.ClDevice.DeviceType, case.MatrixCase)
-    |> List.collect testFixturesEWiseAdd
-    |> testList "Backend.Matrix.EWiseAdd tests"
+    matrixOperationGPUTests "Backend.Matrix.EWiseAdd tests" testFixturesEWiseAdd
 
 let testFixturesEWiseAddAtLeastOne case =
     [ let config = defaultConfig
@@ -199,21 +185,7 @@ let testFixturesEWiseAddAtLeastOne case =
       |> testPropertyWithConfig config (getCorrectnessTestName "byte") ]
 
 let elementwiseAddAtLeastOneTests =
-    testCases
-    |> List.filter
-        (fun case ->
-            let mutable e = ErrorCode.Unknown
-            let device = case.ClContext.ClContext.ClDevice.Device
-
-            let deviceType =
-                Cl
-                    .GetDeviceInfo(device, DeviceInfo.Type, &e)
-                    .CastTo<DeviceType>()
-
-            deviceType = DeviceType.Gpu)
-    |> List.distinctBy (fun case -> case.ClContext.ClContext.ClDevice.DeviceType, case.MatrixCase)
-    |> List.collect testFixturesEWiseAddAtLeastOne
-    |> testList "Backend.Matrix.EWiseAddAtLeastOne tests"
+    matrixOperationGPUTests "Backend.Matrix.EWiseAddAtLeastOne tests" testFixturesEWiseAddAtLeastOne
 
 let testFixturesEWiseAddAtLeastOneToCOO case =
     [ let config = defaultConfig
@@ -263,21 +235,7 @@ let testFixturesEWiseAddAtLeastOneToCOO case =
       |> testPropertyWithConfig config (getCorrectnessTestName "byte") ]
 
 let elementwiseAddAtLeastOneToCOOTests =
-    testCases
-    |> List.filter
-        (fun case ->
-            let mutable e = ErrorCode.Unknown
-            let device = case.ClContext.ClContext.ClDevice.Device
-
-            let deviceType =
-                Cl
-                    .GetDeviceInfo(device, DeviceInfo.Type, &e)
-                    .CastTo<DeviceType>()
-
-            deviceType = DeviceType.Gpu)
-    |> List.distinctBy (fun case -> case.ClContext.ClContext.ClDevice.DeviceType, case.MatrixCase)
-    |> List.collect testFixturesEWiseAddAtLeastOneToCOO
-    |> testList "Backend.Matrix.EWiseAddAtLeastOneToCOO tests"
+    matrixOperationGPUTests "Backend.Matrix.EWiseAddAtLeastOneToCOO tests" testFixturesEWiseAddAtLeastOneToCOO
 
 let testFixturesEWiseMulAtLeastOne case =
     [ let config = defaultConfig
@@ -327,18 +285,4 @@ let testFixturesEWiseMulAtLeastOne case =
       |> testPropertyWithConfig config (getCorrectnessTestName "byte") ]
 
 let elementwiseMulAtLeastOneTests =
-    testCases
-    |> List.filter
-        (fun case ->
-            let mutable e = ErrorCode.Unknown
-            let device = case.ClContext.ClContext.ClDevice.Device
-
-            let deviceType =
-                Cl
-                    .GetDeviceInfo(device, DeviceInfo.Type, &e)
-                    .CastTo<DeviceType>()
-
-            deviceType = DeviceType.Gpu)
-    |> List.distinctBy (fun case -> case.ClContext.ClContext.ClDevice.DeviceType, case.MatrixCase)
-    |> List.collect testFixturesEWiseMulAtLeastOne
-    |> testList "Backend.Matrix.eWiseMulAtLeastOne tests"
+    matrixOperationGPUTests "Backend.Matrix.eWiseMulAtLeastOne tests" testFixturesEWiseMulAtLeastOne

tests/GraphBLAS-sharp.Tests/BackendCommonTests/MxmTests.fs

@@ -5,6 +5,7 @@ open Expecto.Logging
 open Expecto.Logging.Message
 
 open GraphBLAS.FSharp.Tests.Utils
+open GraphBLAS.FSharp.Tests.Context
 open GraphBLAS.FSharp.Tests
 open GraphBLAS.FSharp.Backend
 open GraphBLAS.FSharp

tests/GraphBLAS-sharp.Tests/BackendCommonTests/PrefixSumTests.fs

@@ -5,6 +5,7 @@ open Expecto.Logging
 open Expecto.Logging.Message
 open Brahma.FSharp
 open GraphBLAS.FSharp.Backend.Common
+open GraphBLAS.FSharp.Tests.Context
 open GraphBLAS.FSharp.Tests.Utils
 
 let logger = Log.create "PrefixSum.Tests"

tests/GraphBLAS-sharp.Tests/BackendCommonTests/RemoveDuplicatesTests.fs

@@ -9,13 +9,13 @@ open GraphBLAS.FSharp.Tests
 
 let logger = Log.create "RemoveDuplicates.Tests"
 
-let context = Utils.defaultContext.ClContext
+let context = Context.defaultContext.ClContext
 
 let testCases =
     let removeDuplicates_wg_1 = ClArray.removeDuplications context 1
     let removeDuplicates_wg_2 = ClArray.removeDuplications context 2
     let removeDuplicates_wg_32 = ClArray.removeDuplications context 32
-    let q = Utils.defaultContext.Queue
+    let q = Context.defaultContext.Queue
     q.Error.Add(fun e -> failwithf "%A" e)
 
     [ testCase "Simple correctness test"

tests/GraphBLAS-sharp.Tests/BackendCommonTests/ReplicateTests.fs

@@ -9,10 +9,10 @@ open GraphBLAS.FSharp.Tests
 
 let logger = Log.create "Replicate.Tests"
 
-let context = Utils.defaultContext.ClContext
+let context = Context.defaultContext.ClContext
 
 let testCases =
-    let q = Utils.defaultContext.Queue
+    let q = Context.defaultContext.Queue
     q.Error.Add(fun e -> failwithf "%A" e)
 
     let getReplicateFun replicate =

tests/GraphBLAS-sharp.Tests/BackendCommonTests/ScatterTests.fs

@@ -5,6 +5,7 @@ open Expecto.Logging
 open Expecto.Logging.Message
 open Brahma.FSharp
 open GraphBLAS.FSharp.Backend.Common
+open GraphBLAS.FSharp.Tests.Context
 open GraphBLAS.FSharp.Tests.Utils
 
 let logger = Log.create "Scatter.Tests"

tests/GraphBLAS-sharp.Tests/BackendCommonTests/SpMVTests.fs

@@ -6,6 +6,8 @@ open GraphBLAS.FSharp.Backend
 open GraphBLAS.FSharp.Backend.ArraysExtensions
 open GraphBLAS.FSharp
 open GraphBLAS.FSharp.Tests.Utils
+open GraphBLAS.FSharp.Tests.Context
+open GraphBLAS.FSharp.Tests.TestCases
 open Microsoft.FSharp.Collections
 open Microsoft.FSharp.Core
 open OpenCL.Net
@@ -83,7 +85,8 @@ let testFixturesSpMV (testContext: TestContext) =
     [ let config = defaultConfig
       let wgSize = 32
 
-      let getCorrectnessTestName datatype = sprintf "Correctness on %s" datatype
+      let getCorrectnessTestName datatype =
+          sprintf "Correctness on %s, %A" datatype testContext.ClContext
 
       let context = testContext.ClContext
       let q = testContext.Queue
@@ -112,26 +115,9 @@ let testFixturesSpMV (testContext: TestContext) =
       let byteAdd =
           Vector.spMV context byteSum byteMul wgSize
 
-      let byteToCOO = Matrix.toCOO context wgSize
-
       testContext
       |> correctnessGenericTest 0uy (+) (*) byteAdd (=) q
       |> testPropertyWithConfig config (getCorrectnessTestName "byte") ]
 
 let tests =
-    availableContexts ""
-    |> List.ofSeq
-    |> List.filter
-        (fun testContext ->
-            let mutable e = ErrorCode.Unknown
-            let device = testContext.ClContext.ClDevice.Device
-
-            let deviceType =
-                Cl
-                    .GetDeviceInfo(device, DeviceInfo.Type, &e)
-                    .CastTo<DeviceType>()
-
-            deviceType = DeviceType.Gpu)
-    |> List.distinctBy (fun testContext -> testContext.ClContext.ClDevice.DeviceType)
-    |> List.collect testFixturesSpMV
-    |> testList "Backend.Common.SpMV tests"
+    gpuTests "Backend.Vector.SpMV tests" testFixturesSpMV