add: Sum test

Author: IgorErin

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

@@ -39,7 +39,6 @@ module internal PrefixSum =
             processor.Post(Msg.CreateRunMsg<_, _> kernel)
             processor.Post(Msg.CreateFreeMsg(mirror))
 
-
     let private scanGeneral
         beforeLocalSumClear
         writeData

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

@@ -5,7 +5,6 @@ open GraphBLAS.FSharp.Backend
 open Microsoft.FSharp.Quotations
 
 module internal Sum =
-
     let private scan
         (clContext: ClContext)
         (workGroupSize: int)

src/GraphBLAS-sharp.Backend/GraphBLAS-sharp.Backend.fsproj

@@ -13,9 +13,9 @@
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Common/CommonQuotes.fs" />
     <Compile Include="Common/Utils.fs" />
-    <Compile Include="Common/ClArray.fs" />
     <Compile Include="Common/Sum.fs" />
-    <Compile Include="Common/PrefixSum.fs" />
+    <Compile Include="Common\ClArray.fs" />
+    <Compile Include="Common\PrefixSum.fs" />
     <Compile Include="Common/BitonicSort.fs" />
     <Compile Include="Common/Scatter.fs" />
     <Compile Include="Common/StandardOperations.fs" />

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

@@ -407,7 +407,6 @@ module COOMatrix =
 
             let resultValues = copyData processor matrix.Values
 
-
             { Context = clContext
               RowIndices = resultRows
               ColumnIndices = resultColumns
@@ -500,13 +499,6 @@ module COOMatrix =
                 if (i < length - 1
                     && allRowsBuffer.[i] = allRowsBuffer.[i + 1]
                     && allColumnsBuffer.[i] = allColumnsBuffer.[i + 1]) then
-                    rawPositionsBuffer.[i] <- 0
-
-                    match (%opAdd) (Both(leftValuesBuffer.[i + 1], rightValuesBuffer.[i])) with
-                    | Some v ->
-                        allValuesBuffer.[i + 1] <- v
-                        rawPositionsBuffer.[i + 1] <- 1
-                    | None -> rawPositionsBuffer.[i + 1] <- 0
 
                     let result = (%opAdd) (Both(leftValuesBuffer.[i + 1], rightValuesBuffer.[i]))
 

tests/GraphBLAS-sharp.Tests/BackendCommonTests/SumTest.fs

@@ -0,0 +1,76 @@
+module Backend.Sum
+
+open Expecto
+open Expecto.Logging
+open Expecto.Logging.Message
+open Brahma.FSharp
+open GraphBLAS.FSharp.Backend.Common
+open GraphBLAS.FSharp.Tests.Utils
+open FSharp.Quotations
+
+let logger = Log.create "Sum.Test"
+
+let context = defaultContext.ClContext
+
+let makeTest (q: MailboxProcessor<_>) sum plus zero isEqual (filter: 'a [] -> 'a []) (array: 'a []) =
+    if array.Length > 0 then
+        let array = filter array
+
+        logger.debug (
+            eventX "Filtered array is {array}\n"
+            >> setField "array" (sprintf "%A" array)
+        )
+
+        let actualSum =
+            use clArray = context.CreateClArray array
+            use total = sum q clArray
+
+            let actualSum = [| zero |]
+            q.PostAndReply(fun ch -> Msg.CreateToHostMsg(total, actualSum, ch)).[0]
+
+        logger.debug (
+            eventX "Actual is {actual}\n"
+            >> setField "actual" (sprintf "%A" actualSum)
+        )
+
+        let expectedSum =
+            array
+            |> Array.fold plus zero
+
+        logger.debug (
+            eventX "Expected is {expected}\n"
+            >> setField "expected" (sprintf "%A" expectedSum)
+        )
+
+        "Total sums should be equal"
+        |> Expect.equal actualSum expectedSum
+
+let testFixtures config wgSize q plus (plusQ: Expr<'a -> 'a -> 'a>) zero isEqual filter name =
+    let sum =
+        Sum.run context wgSize plusQ zero
+
+    makeTest q sum plus zero isEqual filter
+    |> testPropertyWithConfig config (sprintf "Correctness on %s" name)
+
+let tests =
+    let config = defaultConfig
+
+    let wgSize = 128
+    let q = defaultContext.Queue
+    q.Error.Add(fun e -> failwithf "%A" e)
+
+    let filterFloats =
+        Array.filter (System.Double.IsNaN >> not)
+
+    [ testFixtures config wgSize q (+) <@ (+) @> 0 (=) id "int add"
+      testFixtures config wgSize q (+) <@ (+) @> 0uy (=) id "byte add"
+      testFixtures config wgSize q max <@ max @> 0 (=) id "int max"
+      testFixtures config wgSize q max <@ max @> 0.0 (=) filterFloats "float max"
+      testFixtures config wgSize q max <@ max @> 0uy (=) id "byte max"
+      testFixtures config wgSize q min <@ min @> System.Int32.MaxValue (=) id "int min"
+      testFixtures config wgSize q min <@ min @> System.Double.MaxValue (=) filterFloats "float min"
+      testFixtures config wgSize q min <@ min @> System.Byte.MaxValue (=) id "byte min"
+      testFixtures config wgSize q (||) <@ (||) @> false (=) id "bool logic-or"
+      testFixtures config wgSize q (&&) <@ (&&) @> true (=) id "bool logic-and" ]
+    |> testList "Backend.Common.Sum tests"
+

tests/GraphBLAS-sharp.Tests/GraphBLAS-sharp.Tests.fsproj

@@ -22,6 +22,7 @@
     <Compile Include="BackendCommonTests/ConvertTests.fs" />
     <Compile Include="BackendCommonTests/TransposeTests.fs" />
     <Compile Include="BackendCommonTests/MxmTests.fs" />
+    <Compile Include="BackendCommonTests\SumTest.fs" />
     <!--Compile Include="MatrixOperationsTests/GetTuplesTests.fs" /-->
     <!--Compile Include="MatrixOperationsTests/MxvTests.fs" /-->
     <!--Compile Include="MatrixOperationsTests/VxmTests.fs" /-->

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -27,7 +27,7 @@ let allTests =
           //Matrix.GetTuples.tests
           //Matrix.Mxv.tests
           //Algo.Bfs.tests
-          ]
+          Backend.Sum.tests ]
     |> testSequenced
 
 [<EntryPoint>]