add: Expand test

Author: IgorErin

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

@@ -17,12 +17,15 @@ module internal Gather =
     let run (clContext: ClContext) workGroupSize =
 
         let gather =
-            <@ fun (ndRange: Range1D) (positions: ClArray<int>) (inputArray: ClArray<'a>) (outputArray: ClArray<'a>) (size: int) ->
+            <@ fun (ndRange: Range1D) (positions: ClArray<int>) (values: ClArray<'a>) (outputArray: ClArray<'a>) (size: int) ->
 
                 let i = ndRange.GlobalID0
 
                 if i < size then
-                    outputArray.[i] <- inputArray.[positions.[i]] @>
+                    let position = positions.[i]
+                    let value = values.[position]
+
+                    outputArray.[i] <- value @>
 
         let program = clContext.Compile(gather)
 

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

@@ -27,17 +27,17 @@ module internal Scatter =
         let run =
             <@ fun (ndRange: Range1D) (positions: ClArray<int>) (positionsLength: int) (values: ClArray<'a>) (result: ClArray<'a>) (resultLength: int) ->
 
-                let i = ndRange.GlobalID0
+                let gid = ndRange.GlobalID0
 
-                if i < positionsLength then
-                    let index = positions.[i]
+                if gid < positionsLength then
+                    let index = positions.[gid]
 
                     if 0 <= index && index < resultLength then
-                        if i < positionsLength - 1 then
-                            if index <> positions.[i + 1] then
-                                result.[index] <- values.[i]
+                        if gid < positionsLength - 1 then
+                            if index <> positions.[gid + 1] then
+                                result.[index] <- values.[gid]
                         else
-                            result.[index] <- values.[i] @>
+                            result.[index] <- values.[gid] @>
 
         let program = clContext.Compile(run)
 

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

@@ -230,6 +230,8 @@ module Expand =
                 removeDuplications processor globalRightMatrixRowsStartPositions
 
             // RESULT row pointers into result expanded (obtained by multiplication) array
+            // printfn "GLOBAL LENGTH: %A" globalLength
+
             let resultRowPointers =
                 getRowPointers processor globalLength leftMatrix.RowPointers globalRightMatrixRowsStartPositions
 
@@ -239,6 +241,8 @@ module Expand =
             let globalMap =
                 getGlobalPositions processor globalLength globalRightMatrixRawsPointersWithoutDuplicates
 
+            // printfn "global clmap: %A" <| globalMap.ToHost processor
+
             globalMap, globalRightMatrixRawsPointersWithoutDuplicates, requiredLeftMatrixValues, requiredRightMatrixRawPointers, resultRowPointers
 
     let expandRightMatrixValuesIndices (clContext: ClContext) workGroupSize =
@@ -250,7 +254,7 @@ module Expand =
 
                 if gid < length then
                     // index corresponding to the position of pointers
-                    let positionIndex = globalPositions.[gid] - 1
+                    let positionIndex = globalPositions.[gid] - 1 // TODO()
 
                     // the position of the beginning of a new line of pointers
                     let sourcePosition = globalRightMatrixValuesPositions.[positionIndex]
@@ -303,7 +307,7 @@ module Expand =
 
                 // globalBitmap.Length == resultValues.Length
                 if gid < resultLength then
-                    let valueIndex = globalBitmap.[gid] - 1
+                    let valueIndex = globalBitmap.[gid] - 1 //TODO()
 
                     resultValues.[gid] <- leftMatrixValues.[valueIndex] @>
 

src/GraphBLAS-sharp/Objects/Matrix.fs

@@ -19,6 +19,8 @@ module Matrix =
               sprintf "Values:        %A \n" this.Values ]
             |> String.concat ""
 
+        member this.NNZ = this.Values.Length
+
         static member FromTuples(rowCount: int, columnCount: int, rows: int [], columns: int [], values: 'a []) =
             { RowCount = rowCount
               ColumnCount = columnCount
@@ -79,6 +81,8 @@ module Matrix =
               RowCount = rowsCount
               ColumnCount = columnsCount }
 
+        member this.NNZ = this.Values.Length
+
         member this.ToDevice(context: ClContext) =
             { Context = context
               RowCount = this.RowCount
@@ -121,6 +125,8 @@ module Matrix =
               RowCount = rowsCount
               ColumnCount = columnsCount }
 
+        member this.NNZ = this.Values.Length
+
         member this.ToDevice(context: ClContext) =
             { Context = context
               RowCount = this.RowCount
@@ -154,9 +160,9 @@ type Matrix<'a when 'a: struct> =
 
     member this.NNZ =
         match this with
-        | COO m -> m.Values.Length
-        | CSR m -> m.Values.Length
-        | CSC m -> m.Values.Length
+        | COO m -> m.NNZ
+        | CSR m -> m.NNZ
+        | CSC m -> m.NNZ
 
     member this.ToDevice(context: ClContext) =
         match this with

tests/GraphBLAS-sharp.Tests/Generators.fs

@@ -38,12 +38,14 @@ module Generators =
     /// Generates empty matrices as well.
     /// </remarks>
     let dimension2DGenerator =
-        Gen.sized
-        <| fun size -> Gen.choose (1, size) |> Gen.two
+        fun size -> Gen.choose (1, size)
+        |> Gen.sized
+        |> Gen.two
 
     let dimension3DGenerator =
-        Gen.sized
-        <| fun size -> Gen.choose (1, size) |> Gen.three
+        fun size -> Gen.choose (1, size)
+        |> Gen.sized
+        |> Gen.three
 
     let rec normalFloat32Generator (random: System.Random) =
         gen {
@@ -384,6 +386,9 @@ module Generators =
                     valuesGenerator
                     |> Gen.array2DOfDim (nColsA, nColsB)
 
+                printf $"left matrix column count: %A{Array2D.length1 matrixA}"
+                printf $"right matrix row count: %A{Array2D.length2 matrixA}"
+
                 return (matrixA, matrixB)
             }
 

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

@@ -45,6 +45,7 @@
         <Compile Include="Matrix/Map2.fs" />
         <Compile Include="Matrix/Mxm.fs" />
         <Compile Include="Matrix/Transpose.fs" />
+        <Compile Include="Matrix\SpGEMM\Example.fs" />
         <Compile Include="Matrix\SpGEMM\Expand.fs" />
         <Compile Include="Program.fs" />
     </ItemGroup>

tests/GraphBLAS-sharp.Tests/Helpers.fs

@@ -129,6 +129,63 @@ module Utils =
 
         result
 
+    let prefixSumExclude (array: 'a []) zero plus =
+        let mutable sum = zero
+
+        for i in 0 .. array.Length - 1 do
+            let currentItem = array.[i]
+            array.[i] <- sum
+
+            sum <- plus currentItem sum
+
+        sum
+
+    let prefixSumInclude (array: 'a []) zero plus =
+        let mutable sum = zero
+
+        for i in 0 .. array.Length - 1 do
+            sum <- plus array.[i] sum
+
+            array.[i] <- sum
+
+        sum
+
+    let getUniqueBitmap<'a when 'a: equality> (array: 'a []) =
+        let bitmap = Array.zeroCreate array.Length
+
+        for i in 0 .. array.Length - 2 do
+            if array.[i] <> array.[i + 1] then bitmap.[i] <- 1
+
+        // set last 1
+        bitmap.[bitmap.Length - 1] <- 1
+
+        bitmap
+
+    let scatter (positions: int array) (values: 'a array) (resultValues: 'a array) =
+        for i in 0 .. positions.Length - 2 do
+            if positions.[i] <> positions.[i + 1] then
+                let valuePosition = positions.[i]
+                let value = values.[i]
+
+                resultValues.[valuePosition] <- value
+
+        // set last value
+        let lastPosition = positions.[positions.Length - 1]
+        let lastValue = values.[values.Length - 1]
+
+        resultValues.[lastPosition] <- lastValue
+
+    let gather (positions: int []) (values: 'a []) (result: 'a []) =
+        for i in 0 .. positions.Length do
+            let position = positions.[i]
+            let value = values.[position]
+
+            result.[position] <- value
+
+    let castMatrixToCSR = function
+        | Matrix.CSR matrix -> matrix
+        | _ -> failwith "matrix format must be CSR"
+
 module Context =
     type TestContext =
         { ClContext: ClContext