add test float64 check, refacotr: Utils qualified

Author: IgorErin

src/GraphBLAS-sharp.Backend/Common/Utils.fs

@@ -1,7 +1,5 @@
 namespace GraphBLAS.FSharp.Backend.Common
 
-open Brahma.FSharp
-
 module internal Utils =
     let defaultWorkGroupSize = 32
 

src/GraphBLAS-sharp.Backend/Matrix/Common.fs

@@ -51,5 +51,3 @@ module Common =
             valuesScatter processor positions allValues resultValues
 
             resultRows, resultColumns, resultValues, resultLength
-
-

src/GraphBLAS-sharp.Backend/Predefined/PrefixSum.fs

@@ -2,6 +2,7 @@ namespace GraphBLAS.FSharp.Backend.Predefined
 
 open Brahma.FSharp
 open GraphBLAS.FSharp.Backend.Common
+
 module internal PrefixSum =
     let standardExcludeInplace (clContext: ClContext) workGroupSize =
 

src/GraphBLAS-sharp.Backend/Quotes/Convert.fs

@@ -23,4 +23,3 @@ module Convert =
             match rightItem with
             | Some _ -> (%op) leftItem None
             | None -> (%op) leftItem (Some value) @>
-

src/GraphBLAS-sharp.Backend/Quotes/SubSum.fs

@@ -35,4 +35,3 @@ module SubSum =
         sumGeneral<'a> <| sequentialAccess<'a> opAdd
 
     let treeSum<'a> opAdd = sumGeneral<'a> <| treeAccess<'a> opAdd
-

src/GraphBLAS-sharp/Objects/VectorExtensions.fs

@@ -22,4 +22,3 @@ module ClVectorExtensions =
                      Values = values
                      Size = this.Size }
             | ClVector.Dense vector -> Vector.Dense <| vector.ToHost q
-

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

@@ -5,13 +5,16 @@ open Expecto.Logging
 open Expecto.Logging.Message
 open GraphBLAS.FSharp.Backend.Common
 open Brahma.FSharp
-open GraphBLAS.FSharp.Tests.Utils
+open GraphBLAS.FSharp.Tests
 open GraphBLAS.FSharp.Tests.Context
 
 let logger = Log.create "BitonicSort.Tests"
 
 let context = defaultContext.ClContext
-let config = { defaultConfig with endSize = 1000000 }
+
+let config =
+    { Utils.defaultConfig with
+          endSize = 1000000 }
 
 let wgSize = 32
 let q = defaultContext.Queue
@@ -53,21 +56,21 @@ let makeTest sort (array: ('n * 'n * 'a) []) =
             |> Array.unzip3
 
         (sprintf "Row arrays should be equal. Actual is \n%A, expected \n%A, input is \n%A" actualRows expectedRows rows)
-        |> compareArrays (=) actualRows expectedRows
+        |> Utils.compareArrays (=) actualRows expectedRows
 
         (sprintf
             "Column arrays should be equal. Actual is \n%A, expected \n%A, input is \n%A"
             actualCols
             expectedCols
             cols)
-        |> compareArrays (=) actualCols expectedCols
+        |> Utils.compareArrays (=) actualCols expectedCols
 
         (sprintf
             "Value arrays should be equal. Actual is \n%A, expected \n%A, input is \n%A"
             actualVals
             expectedVals
             vals)
-        |> compareArrays (=) actualVals expectedVals
+        |> Utils.compareArrays (=) actualVals expectedVals
 
 let testFixtures<'a when 'a: equality> =
     let sort =
@@ -80,7 +83,8 @@ let tests =
     q.Error.Add(fun e -> failwithf "%A" e)
 
     [ testFixtures<int>
-      testFixtures<float>
+      if Utils.isFloat64Available context.ClDevice then
+          testFixtures<float>
       testFixtures<byte>
       testFixtures<bool> ]
     |> testList "Backend.Common.BitonicSort tests"

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

@@ -59,18 +59,17 @@ let testCases =
 
           fun (array: array<bool>) -> makeTest getCopyFun array id)
 
-      testProperty "Correctness test on random float arrays"
-      <| (let copy = ClArray.copy context
-          let getCopyFun = getCopyFun copy
+      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.IsNaN >> not)))
+              fun (array: array<float>) -> makeTest getCopyFun array (Array.filter (System.Double.IsNaN >> not)))
 
       testProperty "Correctness test on random byte arrays"
       <| (let copy = ClArray.copy context
           let getCopyFun = getCopyFun copy
 
-          fun (array: array<byte>) -> makeTest getCopyFun array id)
-
-      ]
+          fun (array: array<byte>) -> makeTest getCopyFun array id) ]
 
 let tests = testCases |> testList "Array.copy tests"

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

@@ -4,7 +4,6 @@ open Expecto
 open Expecto.Logging
 open GraphBLAS.FSharp.Backend.Common
 open GraphBLAS.FSharp.Tests
-open GraphBLAS.FSharp.Tests.Utils
 open Context
 open Brahma.FSharp
 open GraphBLAS.FSharp.Backend.Objects
@@ -20,7 +19,8 @@ let q = defaultContext.Queue
 let correctnessGenericTest<'a when 'a: struct and 'a: equality> isZero exists (array: 'a []) =
 
     if array.Length > 0 then
-        let vector = createVectorFromArray Dense array isZero
+        let vector =
+            Utils.createVectorFromArray Dense array isZero
 
         let result =
             match vector.ToDevice context with
@@ -41,7 +41,7 @@ let correctnessGenericTest<'a when 'a: struct and 'a: equality> isZero exists (a
         |> Expect.equal result (Array.exists (not << isZero) array)
 
 let testFixtures =
-    let config = defaultConfig
+    let config = Utils.defaultConfig
 
     let wgSize = 32
 
@@ -66,14 +66,15 @@ let testFixtures =
       correctnessGenericTest<byte> ((=) 0uy) exists (Array.create 1000 0uy)
       |> testPropertyWithConfig config (getCorrectnessTestName "byte zeros")
 
-      let exists =
-          ClArray.exists context wgSize Predicates.isSome
+      if Utils.isFloat64Available context.ClDevice then
+          let exists =
+              ClArray.exists context wgSize Predicates.isSome
 
-      correctnessGenericTest<float> ((=) 0.0) exists
-      |> testPropertyWithConfig config (getCorrectnessTestName "float")
+          correctnessGenericTest<float> ((=) 0.0) exists
+          |> testPropertyWithConfig config (getCorrectnessTestName "float")
 
-      correctnessGenericTest<float> ((=) 0.0) exists (Array.create 1000 0.0)
-      |> testPropertyWithConfig config (getCorrectnessTestName "float zeros")
+          correctnessGenericTest<float> ((=) 0.0) exists (Array.create 1000 0.0)
+          |> testPropertyWithConfig config (getCorrectnessTestName "float zeros")
 
       let exists =
           ClArray.exists context wgSize Predicates.isSome

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

@@ -6,13 +6,13 @@ open Expecto.Logging.Message
 open Brahma.FSharp
 open GraphBLAS.FSharp.Backend.Common
 open GraphBLAS.FSharp.Tests.Context
-open GraphBLAS.FSharp.Tests.Utils
+open GraphBLAS.FSharp
 
 let logger = Log.create "ClArray.PrefixSum.Tests"
 
 let context = defaultContext.ClContext
 
-let config = defaultConfig
+let config = Tests.Utils.defaultConfig
 
 let wgSize = 128
 
@@ -58,7 +58,7 @@ let makeTest scan plus zero isEqual (array: 'a []) =
         |> Expect.equal actualSum expectedSum
 
         "Arrays should be the same"
-        |> compareArrays isEqual actual expected
+        |> Tests.Utils.compareArrays isEqual actual expected
 
 let testFixtures plus plusQ zero isEqual name =
     let scan =
@@ -76,7 +76,10 @@ let tests =
       testFixtures max <@ max @> 0.0 (=) "float max"
       testFixtures max <@ max @> 0uy (=) "byte max"
       testFixtures min <@ min @> System.Int32.MaxValue (=) "int min"
-      testFixtures min <@ min @> System.Double.MaxValue (=) "float min"
+
+      if Tests.Utils.isFloat64Available context.ClDevice then
+          testFixtures min <@ min @> System.Double.MaxValue (=) "float min"
+
       testFixtures min <@ min @> System.Byte.MaxValue (=) "byte min"
       testFixtures (||) <@ (||) @> false (=) "bool logic-or"
       testFixtures (&&) <@ (&&) @> true (=) "bool logic-and" ]