wip: expand tests passed

Author: IgorErin

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

@@ -77,8 +77,6 @@ module Expand =
 
             length, segmentsLengths
 
-    let
-
     let expand (clContext: ClContext) workGroupSize opMul =
 
         let init = ClArray.init clContext workGroupSize Map.id

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

@@ -19,20 +19,20 @@ let processor = Context.defaultContext.Queue
 
 let config = { Utils.defaultConfig with arbitrary = [ typeof<Generators.PairOfMatricesOfCompatibleSize> ] }
 
+let createCSRMatrix array isZero =
+    Utils.createMatrixFromArray2D CSR array isZero
+    |> Utils.castMatrixToCSR
+
 let getSegmentsPointers (leftMatrix: Matrix.CSR<'a>) (rightMatrix: Matrix.CSR<'b>) =
     Array.map (fun item ->
         rightMatrix.RowPointers.[item + 1] - rightMatrix.RowPointers.[item]) leftMatrix.ColumnIndices
     |> HostPrimitives.prefixSumExclude
 
 let makeTest isZero testFun (leftArray: 'a [,], rightArray: 'a [,]) =
 
-    let leftMatrix =
-        Utils.createMatrixFromArray2D CSR leftArray isZero
-        |> Utils.castMatrixToCSR
+    let leftMatrix = createCSRMatrix leftArray isZero
 
-    let rightMatrix =
-        Utils.createMatrixFromArray2D CSR rightArray isZero
-        |> Utils.castMatrixToCSR
+    let rightMatrix = createCSRMatrix rightArray isZero
 
     if leftMatrix.NNZ > 0 && rightMatrix.NNZ > 0 then
 
@@ -44,6 +44,7 @@ let makeTest isZero testFun (leftArray: 'a [,], rightArray: 'a [,]) =
             testFun processor clLeftMatrix clRightMatrix
 
         clLeftMatrix.Dispose processor
+        clRightMatrix.Dispose processor
 
         let actualPointers = clActual.ToHostAndFree processor
 
@@ -61,7 +62,7 @@ let createTest<'a when 'a : struct> (isZero: 'a -> bool) testFun =
     let testFun = testFun context Utils.defaultWorkGroupSize
 
     makeTest isZero testFun
-    |> testPropertyWithConfig  { config with endSize = 10 } $"test on {typeof<'a>}"
+    |> testPropertyWithConfig config $"test on {typeof<'a>}"
 
 let getSegmentsTests =
     [ createTest ((=) 0) Expand.getSegmentPointers
@@ -71,18 +72,48 @@ let getSegmentsTests =
 
       createTest ((=) 0f) Expand.getSegmentPointers
       createTest ((=) false) Expand.getSegmentPointers
-      createTest ((=) 0u) Expand.getSegmentPointers ]
+      createTest ((=) 0uy) Expand.getSegmentPointers ]
     |> testList "get segment pointers"
 
-let makeExpandTest isZero testFun (leftArray: 'a [,], rightArray: 'a [,]) =
+let expand length segmentPointers mulOp (leftMatrix: Matrix.CSR<'a>) (rightMatrix: Matrix.CSR<'b>) =
+    let extendPointers pointers =
+        Array.pairwise pointers
+        |> Array.map (fun (fst, snd) -> snd - fst)
+        |> Array.mapi (fun index length -> Array.create length index)
+        |> Array.concat
+
+    let segmentsLengths =
+        Array.append segmentPointers [| length |]
+        |> Array.pairwise
+        |> Array.map (fun (fst, snd) -> snd - fst)
+
+    let leftMatrixValues, expectedRows =
+        let tripleFst (fst, _, _) = fst
+
+        Array.zip3 segmentsLengths leftMatrix.Values <| extendPointers leftMatrix.RowPointers // TODO(expand row pointers)
+        // select items each segment length not zero
+        |> Array.filter (tripleFst >> ((=) 0) >> not)
+        |> Array.collect (fun (length, value, rowIndex) -> Array.create length (value, rowIndex))
+        |> Array.unzip
+
+    let rightMatrixValues, expectedColumns =
+        let valuesAndColumns = Array.zip rightMatrix.Values rightMatrix.ColumnIndices
 
-        let leftMatrix =
-            Utils.createMatrixFromArray2D CSR leftArray isZero
-            |> Utils.castMatrixToCSR
+        Array.map2 (fun column length ->
+            let rowStart = rightMatrix.RowPointers.[column]
+            Array.take length valuesAndColumns.[rowStart..]) leftMatrix.ColumnIndices segmentsLengths
+        |> Array.concat
+        |> Array.unzip
 
-        let rightMatrix =
-            Utils.createMatrixFromArray2D CSR rightArray isZero
-            |> Utils.castMatrixToCSR
+    let expectedValues = Array.map2 mulOp leftMatrixValues rightMatrixValues
+
+    expectedValues, expectedColumns, expectedRows
+
+let makeExpandTest isEqual zero opMul testFun (leftArray: 'a [,], rightArray: 'a [,]) =
+
+        let leftMatrix = createCSRMatrix leftArray <| isEqual zero
+
+        let rightMatrix = createCSRMatrix rightArray <| isEqual zero
 
         if leftMatrix.NNZ > 0
            && rightMatrix.NNZ > 0 then
@@ -94,10 +125,43 @@ let makeExpandTest isZero testFun (leftArray: 'a [,], rightArray: 'a [,]) =
             let clRightMatrix = rightMatrix.ToDevice context
             let clSegmentPointers = context.CreateClArray segmentPointers
 
-            let (actualValues: ClArray<'a>), (actualColumns: ClArray<int>), (actualRows: ClArray<int>) =
+            let (clActualValues: ClArray<'a>), (clActualColumns: ClArray<int>), (clActualRows: ClArray<int>) =
                 testFun processor length clSegmentPointers clLeftMatrix clRightMatrix
 
-            clLeftMatrix.Free processor
-            clRightMatrix. processor
-            clSegmentPointers
+            clLeftMatrix.Dispose processor
+            clRightMatrix.Dispose processor
+            clSegmentPointers.Free processor
+
+            let actualValues = clActualValues.ToHostAndFree processor
+            let actualColumns = clActualColumns.ToHostAndFree processor
+            let actualRows = clActualRows.ToHostAndFree processor
+
+            let expectedValues, expectedColumns, expectedRows =
+                expand length segmentPointers opMul leftMatrix rightMatrix
+
+            "Values must be the same"
+            |> Utils.compareArrays isEqual actualValues expectedValues
+
+            "Columns must be the same"
+            |> Utils.compareArrays (=) actualColumns expectedColumns
+
+            "Rows must be the same"
+            |> Utils.compareArrays (=) actualRows expectedRows
+
+let createExpandTest isEqual (zero: 'a) opMul opMulQ testFun =
+
+    let testFun = testFun context Utils.defaultWorkGroupSize opMulQ
+
+    makeExpandTest isEqual zero opMul testFun
+    |> testPropertyWithConfig config $"test on %A{typeof<'a>}"
+
+let expandTests =
+    [ createExpandTest (=) 0 (*) <@ (*) @> Expand.expand
+
+      if Utils.isFloat64Available context.ClDevice then
+        createExpandTest Utils.floatIsEqual 0.0 (*) <@ (*) @> Expand.expand
 
+      createExpandTest Utils.float32IsEqual 0f (*) <@ (*) @> Expand.expand
+      createExpandTest (=) false (&&) <@ (&&) @> Expand.expand
+      createExpandTest (=) 0uy (*) <@ (*) @> Expand.expand ]
+    |> testList "Expand.expand"

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -94,7 +94,7 @@ open GraphBLAS.FSharp.Tests.Matrix
 let allTests =
     testList
         "All tests"
-        [ SpGeMM.getSegmentsTests ]
+        [ SpGeMM.expandTests ]
 
     |> testSequenced