refactor: Utils.defaultWorkGroupSize

IgorErin · IgorErin · commit 29a93c4bc647 · 2023-02-26T11:37:32.000+03:00
diff --git a/tests/GraphBLAS-sharp.Tests/Algorithms/BFS.fs b/tests/GraphBLAS-sharp.Tests/Algorithms/BFS.fs
@@ -16,7 +16,7 @@ let testFixtures (testContext: TestContext) =
     [ let config = Utils.undirectedAlgoConfig
       let context = testContext.ClContext
       let queue = testContext.Queue
-      let workGroupSize = 32
+      let workGroupSize = Utils.defaultWorkGroupSize
 
       let testName =
           sprintf "Test on %A" testContext.ClContext
diff --git a/tests/GraphBLAS-sharp.Tests/Common/BitonicSort.fs b/tests/GraphBLAS-sharp.Tests/Common/BitonicSort.fs
@@ -16,7 +16,7 @@ let config =
     { Utils.defaultConfig with
           endSize = 1000000 }
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let q = defaultContext.Queue
 
diff --git a/tests/GraphBLAS-sharp.Tests/Common/Copy.fs b/tests/GraphBLAS-sharp.Tests/Common/Copy.fs
@@ -12,7 +12,7 @@ let logger = Log.create "ClArray.Copy.Tests"
 
 let context = Context.defaultContext.ClContext
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let q = Context.defaultContext.Queue
 
diff --git a/tests/GraphBLAS-sharp.Tests/Common/Exists.fs b/tests/GraphBLAS-sharp.Tests/Common/Exists.fs
@@ -18,7 +18,7 @@ let q = defaultContext.Queue
 
 let config = Utils.defaultConfig
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let correctnessGenericTest<'a when 'a: struct and 'a: equality> isZero exists (array: 'a []) =
 
@@ -66,4 +66,4 @@ let testFixtures =
       createTest<bool> (=) false ]
 
 let tests =
-    testList "Backend.Vector.containsNonZero tests" testFixtures
+    testList "Common.ClArray.exists tests" testFixtures
diff --git a/tests/GraphBLAS-sharp.Tests/Common/Reduce.fs b/tests/GraphBLAS-sharp.Tests/Common/Reduce.fs
@@ -13,7 +13,7 @@ let context = Context.defaultContext.ClContext
 
 let config = Utils.defaultConfig
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let q = Context.defaultContext.Queue
 
diff --git a/tests/GraphBLAS-sharp.Tests/Common/Replicate.fs b/tests/GraphBLAS-sharp.Tests/Common/Replicate.fs
@@ -14,7 +14,7 @@ let context = Context.defaultContext.ClContext
 
 let q = Context.defaultContext.Queue
 
-let workGroupSize = 32
+let workGroupSize = Utils.defaultWorkGroupSize
 
 let config = Utils.defaultConfig
 
diff --git a/tests/GraphBLAS-sharp.Tests/Common/Scatter.fs b/tests/GraphBLAS-sharp.Tests/Common/Scatter.fs
@@ -15,7 +15,7 @@ let config =
     { Tests.Utils.defaultConfig with
           endSize = 1000000 }
 
-let wgSize = 32
+let wgSize = Tests.Utils.defaultWorkGroupSize
 
 let q = defaultContext.Queue
 
diff --git a/tests/GraphBLAS-sharp.Tests/Helpers.fs b/tests/GraphBLAS-sharp.Tests/Helpers.fs
@@ -13,6 +13,7 @@ open GraphBLAS.FSharp.Backend.Objects
 
 [<RequireQualifiedAccess>]
 module Utils =
+    let defaultWorkGroupSize = 32
 
     let defaultConfig =
         { FsCheckConfig.defaultConfig with
diff --git a/tests/GraphBLAS-sharp.Tests/Matrix/Convert.fs b/tests/GraphBLAS-sharp.Tests/Matrix/Convert.fs
@@ -15,7 +15,8 @@ open GraphBLAS.FSharp.Backend.Objects.ClContext
 let logger = Log.create "Convert.Tests"
 
 let config = Utils.defaultConfig
-let wgSize = 32
+
+let workGroupSize = Utils.defaultWorkGroupSize
 
 let makeTest context q formatFrom formatTo convertFun isZero (array: 'a [,]) =
     let mtx =
@@ -51,15 +52,15 @@ let testFixtures formatTo =
 
     match formatTo with
     | COO ->
-        [ let convertFun = Matrix.toCOO context wgSize
+        [ let convertFun = Matrix.toCOO context workGroupSize
 
           Utils.listOfUnionCases<MatrixFormat>
           |> List.map
               (fun formatFrom ->
                   makeTest context q formatFrom formatTo convertFun ((=) 0)
                   |> testPropertyWithConfig config (getCorrectnessTestName "int" formatFrom))
 
-          let convertFun = Matrix.toCOO context wgSize
+          let convertFun = Matrix.toCOO context workGroupSize
 
           Utils.listOfUnionCases<MatrixFormat>
           |> List.map
@@ -68,15 +69,15 @@ let testFixtures formatTo =
                   |> testPropertyWithConfig config (getCorrectnessTestName "bool" formatFrom)) ]
         |> List.concat
     | CSR ->
-        [ let convertFun = Matrix.toCSR context wgSize
+        [ let convertFun = Matrix.toCSR context workGroupSize
 
           Utils.listOfUnionCases<MatrixFormat>
           |> List.map
               (fun formatFrom ->
                   makeTest context q formatFrom formatTo convertFun ((=) 0)
                   |> testPropertyWithConfig config (getCorrectnessTestName "int" formatFrom))
 
-          let convertFun = Matrix.toCSR context wgSize
+          let convertFun = Matrix.toCSR context workGroupSize
 
           Utils.listOfUnionCases<MatrixFormat>
           |> List.map
@@ -85,15 +86,15 @@ let testFixtures formatTo =
                   |> testPropertyWithConfig config (getCorrectnessTestName "bool" formatFrom)) ]
         |> List.concat
     | CSC ->
-        [ let convertFun = Matrix.toCSC context wgSize
+        [ let convertFun = Matrix.toCSC context workGroupSize
 
           Utils.listOfUnionCases<MatrixFormat>
           |> List.map
               (fun formatFrom ->
                   makeTest context q formatFrom formatTo convertFun ((=) 0)
                   |> testPropertyWithConfig config (getCorrectnessTestName "int" formatFrom))
 
-          let convertFun = Matrix.toCSC context wgSize
+          let convertFun = Matrix.toCSC context workGroupSize
 
           Utils.listOfUnionCases<MatrixFormat>
           |> List.map
diff --git a/tests/GraphBLAS-sharp.Tests/Matrix/Map2.fs b/tests/GraphBLAS-sharp.Tests/Matrix/Map2.fs
@@ -18,7 +18,7 @@ open GraphBLAS.FSharp.Backend.Objects.ClContext
 let logger = Log.create "Map2.Tests"
 
 let config = Utils.defaultConfig
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let getCorrectnessTestName case datatype =
     $"Correctness on %s{datatype}, %A{case}"
diff --git a/tests/GraphBLAS-sharp.Tests/Matrix/Mxm.fs b/tests/GraphBLAS-sharp.Tests/Matrix/Mxm.fs
@@ -14,7 +14,7 @@ open GraphBLAS.FSharp.Test
 let logger = Log.create "Mxm.Tests"
 
 let context = defaultContext.ClContext
-let workGroupSize = 32
+let workGroupSize = Utils.defaultWorkGroupSize
 
 let makeTest context q zero isEqual plus mul mxmFun (leftMatrix: 'a [,], rightMatrix: 'a [,], mask: bool [,]) =
 
diff --git a/tests/GraphBLAS-sharp.Tests/Matrix/Transpose.fs b/tests/GraphBLAS-sharp.Tests/Matrix/Transpose.fs
@@ -16,7 +16,7 @@ let logger = Log.create "Transpose.Tests"
 
 let config = Utils.defaultConfig
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let getCorrectnessTestName case datatype =
     $"Correctness on %s{datatype}, %A{case.Format}, %A{case.TestContext}"
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/AssignByMask.fs b/tests/GraphBLAS-sharp.Tests/Vector/AssignByMask.fs
@@ -17,7 +17,7 @@ let logger = Log.create "Vector.assignByMask.Tests"
 
 let config = Utils.defaultConfig
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let getCorrectnessTestName case datatype =
     $"Correctness on %s{datatype}, vector: %A{case.Format}"
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/Convert.fs b/tests/GraphBLAS-sharp.Tests/Vector/Convert.fs
@@ -17,7 +17,7 @@ let logger =
 
 let config = Utils.defaultConfig
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let makeTest
     formatFrom
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/Copy.fs b/tests/GraphBLAS-sharp.Tests/Vector/Copy.fs
@@ -15,7 +15,7 @@ let logger = Log.create "Vector.copy.Tests"
 
 let config = Utils.defaultConfig
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let checkResult (isEqual: 'a -> 'a -> bool) (actual: Vector<'a>) (expected: Vector<'a>) =
     Expect.equal actual.Size expected.Size "The size should be the same"
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/Map2.fs b/tests/GraphBLAS-sharp.Tests/Vector/Map2.fs
@@ -16,7 +16,7 @@ let logger = Log.create "Vector.ElementWise.Tests"
 
 let config = Utils.defaultConfig
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let getCorrectnessTestName<'a> (case: OperationCase<'a>) dataType =
     $"Correctness on '{dataType} option -> '{dataType} option -> '{dataType} option, {case.Format}"
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/OfList.fs b/tests/GraphBLAS-sharp.Tests/Vector/OfList.fs
@@ -16,7 +16,7 @@ let logger = Log.create "Vector.ofList.Tests"
 
 let config = Utils.defaultConfig
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let checkResult
     (isEqual: 'a -> 'a -> bool)
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/Reduce.fs b/tests/GraphBLAS-sharp.Tests/Vector/Reduce.fs
@@ -12,7 +12,7 @@ open GraphBLAS.FSharp.Backend.Vector
 
 let logger = Log.create "Vector.reduce.Tests"
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let config = Utils.defaultConfig
 
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/SpMV.fs b/tests/GraphBLAS-sharp.Tests/Vector/SpMV.fs
@@ -16,7 +16,7 @@ open GraphBLAS.FSharp.Backend.Objects.ClContext
 
 let config = Utils.defaultConfig
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let checkResult isEqual sumOp mulOp zero (baseMtx: 'a [,]) (baseVtr: 'a []) (actual: 'a option []) =
     let rows = Array2D.length1 baseMtx
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/ZeroCreate.fs b/tests/GraphBLAS-sharp.Tests/Vector/ZeroCreate.fs
@@ -16,7 +16,7 @@ let logger = Log.create "Vector.zeroCreate.Tests"
 
 let config = Utils.defaultConfig
 
-let wgSize = 32
+let wgSize = Utils.defaultWorkGroupSize
 
 let checkResult size (actual: Vector<'a>) =
     Expect.equal actual.Size size "The size should be the same"
