add: spgemm

Author: IgorErin

src/GraphBLAS-sharp.Backend/Matrix/CSRMatrix/SpGEMM/Expand.fs

@@ -216,7 +216,7 @@ module Expand =
 
     let reduce (clContext: ClContext) workGroupSize opAdd  =
 
-        let reduce = Reduce.ByKey2D.segmentSequential clContext workGroupSize opAdd
+        let reduce = Reduce.ByKey2D.segmentSequentialOption clContext workGroupSize opAdd
 
         let getUniqueBitmap =
             ClArray.getUniqueBitmap2LastOccurrence clContext workGroupSize

tests/GraphBLAS-sharp.Tests/Helpers.fs

@@ -233,15 +233,26 @@ module HostPrimitives =
         if Array2D.length2 leftArray <> Array2D.length1 rightArray then
             failwith "Incompatible matrices"
 
+        let add left right =
+            match left, right with
+            | Some left, Some right ->
+                add left right
+            | Some value, None
+            | None, Some value -> Some value
+            | _ -> None
+
         Array2D.init
         <| Array2D.length1 leftArray
         <| Array2D.length2 rightArray
         <| fun i j ->
                 (leftArray.[i, *], rightArray.[*, j])
+                // multiply and filter
                 ||> Array.map2 mul
                 |> Array.choose id
-                |> Array.fold add zero
-
+                // add and filter
+                |> Array.map Some
+                |> Array.fold add None
+                |> function | Some value -> value | None -> zero
 module Context =
     type TestContext =
         { ClContext: ClContext

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

@@ -222,13 +222,13 @@ let makeGeneralTest zero isEqual opMul opAdd testFun (leftArray: 'a [,], rightAr
            | ex when ex.Message = "InvalidBufferSize" -> ()
            | _ -> reraise ()
 
-let createGeneralTest (zero: 'a) isEqual opAddQ opAdd (opMulQ, opMul) testFun =
+let createGeneralTest (zero: 'a) isEqual (opAddQ, opAdd) (opMulQ, opMul) testFun =
 
     let testFun = testFun context Utils.defaultWorkGroupSize opAddQ opMulQ
 
     makeGeneralTest zero isEqual opMul opAdd testFun
-    |> testPropertyWithConfig { config with endSize = 10; maxTest = 1000 } $"test on %A{typeof<'a>}"
+    |> testPropertyWithConfig config  $"test on %A{typeof<'a>}"
 
 let generalTests =
-    [ createGeneralTest 0 (=) <@ (+) @> (+) ArithmeticOperations.intMul Expand.run ]
+    [ createGeneralTest 0 (=) ArithmeticOperations.intAdd ArithmeticOperations.intMul Expand.run ]
     |> testList "general"

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -95,10 +95,11 @@ let allTests =
     testList
         "All tests"
         [ // SpGeMM.expandTests
-          // SpGeMM.generalTests
+           SpGeMM.generalTests
           // Common.Gather.initTests
           // Common.ClArray.Choose.tests2 ]
-          Common.Reduce.ByKey.testsByKey2DSegmentsSequential ]
+          // Common.Reduce.ByKey.testsByKey2DSegmentsSequential ]
+            ]
     |> testSequenced
 
 [<EntryPoint>]