add: float32 tests in Matrix

Author: IgorErin

tests/GraphBLAS-sharp.Tests/Helpers.fs

@@ -778,6 +778,8 @@ module Utils =
         abs (x - y) < Accuracy.medium.absolute
         || x.Equals y
 
+    let float32IsEqual x y = abs (x - y) < 0.01f || x.Equals y
+
     let vectorToDenseVector =
         function
         | Vector.Dense vector -> vector

tests/GraphBLAS-sharp.Tests/Matrix/Map2.fs

@@ -126,9 +126,18 @@ let testFixturesEWiseAdd case =
           let floatToCOO = Matrix.toCOO context wgSize
 
           case
-          |> correctnessGenericTest 0.0 (+) floatAdd floatToCOO (fun x y -> abs (x - y) < Accuracy.medium.absolute) q
+          |> correctnessGenericTest 0.0 (+) floatAdd floatToCOO Utils.floatIsEqual q
           |> testPropertyWithConfig config (getCorrectnessTestName "float")
 
+      let float32Add =
+          Matrix.map2 context ArithmeticOperations.float32Sum wgSize
+
+      let float32ToCOO = Matrix.toCOO context wgSize
+
+      case
+      |> correctnessGenericTest 0.0f (+) float32Add float32ToCOO Utils.float32IsEqual q
+      |> testPropertyWithConfig config (getCorrectnessTestName "float32")
+
       let byteAdd =
           Matrix.map2 context ArithmeticOperations.byteSum wgSize
 
@@ -174,9 +183,18 @@ let testFixturesEWiseAddAtLeastOne case =
           let floatToCOO = Matrix.toCOO context wgSize
 
           case
-          |> correctnessGenericTest 0.0 (+) floatAdd floatToCOO (fun x y -> abs (x - y) < Accuracy.medium.absolute) q
+          |> correctnessGenericTest 0.0 (+) floatAdd floatToCOO Utils.floatIsEqual q
           |> testPropertyWithConfig config (getCorrectnessTestName "float")
 
+      let float32Add =
+          Matrix.map2AtLeastOne context ArithmeticOperations.float32SumAtLeastOne wgSize
+
+      let float32ToCOO = Matrix.toCOO context wgSize
+
+      case
+      |> correctnessGenericTest 0.0f (+) float32Add float32ToCOO Utils.float32IsEqual q
+      |> testPropertyWithConfig config (getCorrectnessTestName "float32")
+
       let byteAdd =
           Matrix.map2AtLeastOne context ArithmeticOperations.byteSumAtLeastOne wgSize
 
@@ -222,9 +240,27 @@ let testFixturesEWiseAddAtLeastOneToCOO case =
           let floatToCOO = Matrix.toCOO context wgSize
 
           case
-          |> correctnessGenericTest 0.0 (+) floatAdd floatToCOO (fun x y -> abs (x - y) < Accuracy.medium.absolute) q
+          |> correctnessGenericTest 0.0 (+) floatAdd floatToCOO Utils.floatIsEqual q
           |> testPropertyWithConfig config (getCorrectnessTestName "float")
 
+      let float32Add =
+          Matrix.map2AtLeastOneToCOO context ArithmeticOperations.float32SumAtLeastOne wgSize
+
+      let floatToCOO = Matrix.toCOO context wgSize
+
+      case
+      |> correctnessGenericTest 0.0f (+) float32Add floatToCOO Utils.float32IsEqual q
+      |> testPropertyWithConfig config (getCorrectnessTestName "float32")
+
+      let float32Add =
+          Matrix.map2AtLeastOneToCOO context ArithmeticOperations.float32SumAtLeastOne wgSize
+
+      let floatToCOO = Matrix.toCOO context wgSize
+
+      case
+      |> correctnessGenericTest 0.0f (+) float32Add floatToCOO Utils.float32IsEqual q
+      |> testPropertyWithConfig config (getCorrectnessTestName "float32")
+
       let byteAdd =
           Matrix.map2AtLeastOneToCOO context ArithmeticOperations.byteSumAtLeastOne wgSize
 
@@ -270,9 +306,18 @@ let testFixturesEWiseMulAtLeastOne case =
           let floatToCOO = Matrix.toCOO context wgSize
 
           case
-          |> correctnessGenericTest 0.0 (*) floatAdd floatToCOO (fun x y -> abs (x - y) < Accuracy.medium.absolute) q
+          |> correctnessGenericTest 0.0 (*) floatAdd floatToCOO Utils.floatIsEqual q
           |> testPropertyWithConfig config (getCorrectnessTestName "float")
 
+      let float32Add =
+          Matrix.map2AtLeastOne context ArithmeticOperations.float32MulAtLeastOne wgSize
+
+      let floatToCOO = Matrix.toCOO context wgSize
+
+      case
+      |> correctnessGenericTest 0.0f (*) float32Add floatToCOO Utils.float32IsEqual q
+      |> testPropertyWithConfig config (getCorrectnessTestName "float32")
+
       let byteAdd =
           Matrix.map2AtLeastOne context ArithmeticOperations.byteMulAtLeastOne wgSize
 

tests/GraphBLAS-sharp.Tests/Matrix/Transpose.fs

@@ -127,10 +127,6 @@ let testFixtures case =
     let getCorrectnessTestName datatype =
         sprintf "Correctness on %s, %A, %A" datatype case.Format case.TestContext
 
-    let areEqualFloat x y =
-        System.Double.IsNaN x && System.Double.IsNaN y
-        || x = y
-
     let context = case.TestContext.ClContext
     let q = case.TestContext.Queue
     q.Error.Add(fun e -> failwithf "%A" e)
@@ -149,15 +145,25 @@ let testFixtures case =
           let transposeFun = Matrix.transpose context wgSize
 
           case
-          |> makeTestRegular context q transposeFun areEqualFloat 0.0
+          |> makeTestRegular context q transposeFun Utils.floatIsEqual 0.0
           |> testPropertyWithConfig config (getCorrectnessTestName "float")
 
           case
-          |> makeTestTwiceTranspose context q transposeFun areEqualFloat 0.0
+          |> makeTestTwiceTranspose context q transposeFun Utils.floatIsEqual 0.0
           |> testPropertyWithConfig config (getCorrectnessTestName "float (twice transpose)")
 
       let transposeFun = Matrix.transpose context wgSize
 
+      case
+      |> makeTestRegular context q transposeFun Utils.float32IsEqual 0.0f
+      |> testPropertyWithConfig config (getCorrectnessTestName "float32")
+
+      case
+      |> makeTestTwiceTranspose context q transposeFun Utils.float32IsEqual 0.0f
+      |> testPropertyWithConfig config (getCorrectnessTestName "float32 (twice transpose)")
+
+      let transposeFun = Matrix.transpose context wgSize
+
       case
       |> makeTestRegular context q transposeFun (=) 0uy
       |> testPropertyWithConfig config (getCorrectnessTestName "byte")