refactor: Map.tests, float32 generator shift

Author: artemiipatov

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

@@ -66,6 +66,12 @@ module ArithmeticOperations =
 
             if res then Some true else None @>
 
+    let inline addLeftConst zero constant =
+        mkUnaryOp zero <@ fun x -> constant + x @>
+
+    let inline addRightConst zero constant =
+        mkUnaryOp zero <@ fun x -> x + constant @>
+
     let intSum = mkNumericSum 0
     let byteSum = mkNumericSum 0uy
     let floatSum = mkNumericSum 0.0
@@ -89,6 +95,12 @@ module ArithmeticOperations =
 
             if res then Some true else None @>
 
+    let inline mulLeftConst zero constant =
+        mkUnaryOp zero <@ fun x -> constant * x @>
+
+    let inline mulRightConst zero constant =
+        mkUnaryOp zero <@ fun x -> x * constant @>
+
     let intMul = mkNumericMul 0
     let byteMul = mkNumericMul 0uy
     let floatMul = mkNumericMul 0.0

tests/GraphBLAS-sharp.Tests/Generators.fs

@@ -47,12 +47,15 @@ module Generators =
 
     let rec normalFloat32Generator (random: System.Random) =
         gen {
-            let result = random.NextSingle()
+            let rawValue = random.NextSingle()
 
-            if System.Single.IsNormal result then
-                return result
+            if System.Single.IsNormal rawValue then
+                let sign = float32 <| sign rawValue
+                let processedValue = ((+) 1.0f) <| (abs <| rawValue)
+
+                return processedValue * sign
             else
-                return! normalFloat32Generator random
+                return 0.0f
         }
 
     let genericSparseGenerator zero valuesGen handler =

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

@@ -115,20 +115,12 @@ let testFixturesMapAdd case =
       let q = case.TestContext.Queue
       q.Error.Add(fun e -> failwithf "%A" e)
 
-      let addFloat64Q =
-          ArithmeticOperations.mkUnaryOp 0.0 <@ fun x -> x + 10.0 @>
-
-      let addFloat32Q =
-          ArithmeticOperations.mkUnaryOp 0.0f <@ fun x -> x + 10.0f @>
-
-      let addByte =
-          ArithmeticOperations.mkUnaryOp 0uy <@ fun x -> x + 10uy @>
-
       if Utils.isFloat64Available context.ClDevice then
-          createTestMap case 0.0 ((+) 10.0) Utils.floatIsEqual addFloat64Q Matrix.map
+          createTestMap case 0.0 ((+) 10.0) Utils.floatIsEqual (ArithmeticOperations.addLeftConst 0.0 10.0) Matrix.map
+
+      createTestMap case 0.0f ((+) 10.0f) Utils.float32IsEqual (ArithmeticOperations.addLeftConst 0.0f 10.0f) Matrix.map
 
-      createTestMap case 0.0f ((+) 10.0f) Utils.float32IsEqual addFloat32Q Matrix.map
-      createTestMap case 0uy ((+) 10uy) (=) addByte Matrix.map ]
+      createTestMap case 0uy ((+) 10uy) (=) (ArithmeticOperations.addLeftConst 0uy 10uy) Matrix.map ]
 
 let addTests =
     operationGPUTests "Backend.Matrix.map add tests" testFixturesMapAdd
@@ -138,20 +130,12 @@ let testFixturesMapMul case =
       let q = case.TestContext.Queue
       q.Error.Add(fun e -> failwithf "%A" e)
 
-      let mulFloat64Q =
-          ArithmeticOperations.mkUnaryOp 0.0 <@ fun x -> x * 10.0 @>
-
-      let mulFloat32Q =
-          ArithmeticOperations.mkUnaryOp 0.0f <@ fun x -> x * 10.0f @>
-
-      let mulByte =
-          ArithmeticOperations.mkUnaryOp 0uy <@ fun x -> x * 10uy @>
-
       if Utils.isFloat64Available context.ClDevice then
-          createTestMap case 0.0 ((*) 10.0) Utils.floatIsEqual mulFloat64Q Matrix.map
+          createTestMap case 0.0 ((*) 10.0) Utils.floatIsEqual (ArithmeticOperations.mulLeftConst 0.0 10.0) Matrix.map
+
+      createTestMap case 0.0f ((*) 10.0f) Utils.float32IsEqual (ArithmeticOperations.mulLeftConst 0.0f 10.0f) Matrix.map
 
-      createTestMap case 0.0f ((*) 10.0f) Utils.float32IsEqual mulFloat32Q Matrix.map
-      createTestMap case 0uy ((*) 10uy) (=) mulByte Matrix.map ]
+      createTestMap case 0uy ((*) 10uy) (=) (ArithmeticOperations.mulLeftConst 0uy 10uy) Matrix.map ]
 
 let mulTests =
     operationGPUTests "Backend.Matrix.map mul tests" testFixturesMapMul