refactor: ClArray.copy tests

Author: IgorErin

tests/GraphBLAS-sharp.Tests/Common/BitonicSort.fs

@@ -78,6 +78,8 @@ let tests =
       if Utils.isFloat64Available context.ClDevice then
           testFixtures<float>
 
+      testFixtures<float32>
+
       testFixtures<byte>
       testFixtures<bool> ]
     |> testList "Backend.Common.BitonicSort tests"

tests/GraphBLAS-sharp.Tests/Common/Copy.fs

@@ -8,74 +8,51 @@ open GraphBLAS.FSharp.Tests
 open GraphBLAS.FSharp.Backend.Common
 open GraphBLAS.FSharp.Backend.Objects.ClContext
 
-let logger = Log.create "Copy.Tests"
+let logger = Log.create "ClArray.Copy.Tests"
 
 let context = Context.defaultContext.ClContext
 
-let testCases =
-    let q = Context.defaultContext.Queue
-    q.Error.Add(fun e -> failwithf "%A" e)
-
-    let getCopyFun copy =
-        fun (array: array<_>) ->
-            let wgSize =
-                [| for i in 0 .. 5 -> pown 2 i |]
-                |> Array.filter (fun i -> array.Length % i = 0)
-                |> Array.max
+let wgSize = 32
 
-            copy wgSize q HostInterop
+let q = Context.defaultContext.Queue
 
-    let makeTest getCopyFun (array: array<'a>) filterFun =
-        if array.Length > 0 then
-            use clArray = context.CreateClArray array
+let makeTest<'a when 'a: equality> copyFun (array: array<'a>) = // TODO()
+    if array.Length > 0 then
+        use clArray = context.CreateClArray array
 
-            let copy = getCopyFun array
+        let actual =
+            use clActual: ClArray<'a> = copyFun q HostInterop clArray
 
-            let actual =
-                use clActual: ClArray<'a> = copy clArray
+            let actual = Array.zeroCreate clActual.Length
+            q.PostAndReply(fun ch -> Msg.CreateToHostMsg(clActual, actual, ch))
 
-                let actual = Array.zeroCreate clActual.Length
-                q.PostAndReply(fun ch -> Msg.CreateToHostMsg(clActual, actual, ch))
+        logger.debug (
+            eventX "Actual is {actual}"
+            >> setField "actual" $"%A{actual}"
+        )
 
-            logger.debug (
-                eventX "Actual is {actual}"
-                >> setField "actual" (sprintf "%A" actual)
-            )
+        let expected = array
+        let actual = actual
 
-            let expected = filterFun array
-            let actual = filterFun actual
+        "Array should be equals to original"
+        |> Expect.sequenceEqual actual expected
 
-            "Array should be equals to original"
-            |> Expect.sequenceEqual actual expected
+let creatTest<'a when 'a: equality> =
+    ClArray.copy context wgSize
+    |> makeTest<'a>
+    |> testProperty $"Correctness test on random %A{typeof<'a>} arrays"
 
-    [ testProperty "Correctness test on random int arrays"
-      <| (let copy = ClArray.copy context
-          let getCopyFun = getCopyFun copy
-          fun (array: array<int>) -> makeTest getCopyFun array id)
-
-      testProperty "Correctness test on random bool arrays"
-      <| (let copy = ClArray.copy context
-          let getCopyFun = getCopyFun copy
+let testCases =
+    q.Error.Add(fun e -> failwithf "%A" e)
 
-          fun (array: array<bool>) -> makeTest getCopyFun array id)
+    [ creatTest<int>
+      creatTest<bool>
 
       if Utils.isFloat64Available context.ClDevice then
-          testProperty "Correctness test on random float arrays"
-          <| (let copy = ClArray.copy context
-              let getCopyFun = getCopyFun copy
-
-              fun (array: array<float>) -> makeTest getCopyFun array (Array.filter System.Double.IsNormal))
-
-      testProperty "Correctness test on random float32 arrays"
-      <| (let copy = ClArray.copy context
-          let getCopyFun = getCopyFun copy
-
-          fun (array: array<float32>) -> makeTest getCopyFun array (Array.filter System.Single.IsNormal))
-
-      testProperty "Correctness test on random byte arrays"
-      <| (let copy = ClArray.copy context
-          let getCopyFun = getCopyFun copy
+          creatTest<float>
 
-          fun (array: array<byte>) -> makeTest getCopyFun array id) ]
+      creatTest<float32>
+      creatTest<byte> ]
 
-let tests = testCases |> testList "Array.copy tests"
+let tests =
+    testCases |> testList "ClArray.copy tests"

tests/GraphBLAS-sharp.Tests/Helpers.fs

@@ -252,7 +252,7 @@ module Generators =
             |> genericSparseGenerator false Arb.generate<bool>
             |> Arb.fromGen
 
-    type PairOfSparseMatrixOAndVectorfCompatibleSize() =
+    type PairOfSparseMatrixOAndVectorsCompatibleSize() =
         static let pairOfMatrixAndVectorOfCompatibleSizeGenerator (valuesGenerator: Gen<'a>) =
             gen {
                 let! nrows, ncols = dimension2DGenerator
@@ -645,7 +645,7 @@ module Generators =
             <| Arb.generate<bool>
             |> Arb.fromGen
 
-    type BufferCompatibleVector() =
+    type BufferCompatibleArray() =
         static let compatibleVector (valuesGenerator: Gen<'a>) =
             gen {
                 let! length = Gen.sized <| fun size -> Gen.choose (1, size)
@@ -767,11 +767,11 @@ module Utils =
                   [ typeof<Generators.SingleMatrix>
                     typeof<Generators.PairOfSparseMatricesOfEqualSize>
                     typeof<Generators.PairOfMatricesOfCompatibleSize>
-                    typeof<Generators.PairOfSparseMatrixOAndVectorfCompatibleSize>
+                    typeof<Generators.PairOfSparseMatrixOAndVectorsCompatibleSize>
                     typeof<Generators.PairOfSparseVectorAndMatrixOfCompatibleSize>
                     typeof<Generators.ArrayOfDistinctKeys>
                     typeof<Generators.ArrayOfAscendingKeys>
-                    typeof<Generators.BufferCompatibleVector>
+                    typeof<Generators.BufferCompatibleArray>
                     typeof<Generators.PairOfVectorsOfEqualSize> ] }
 
     let floatIsEqual x y =