add: requiredRawsLengths test

Author: IgorErin

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

@@ -38,7 +38,7 @@
     <Compile Include="Matrix/Common.fs" />
     <Compile Include="Matrix/COOMatrix/COOMatrix.fs" />
     <Compile Include="Matrix/CSRMatrix/Map2.fs" />
-    <Compile Include="Matrix/CSRMatrix/SpGEMM.fs" />
+    <Compile Include="Matrix\CSRMatrix\SpGEMMMasked.fs" />
     <Compile Include="Matrix/CSRMatrix/CSRMatrix.fs" />
     <Compile Include="Matrix\CSRMatrix\SpGEMM\Expand.fs" />
     <Compile Include="Matrix/Matrix.fs" />

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

@@ -250,7 +250,7 @@ module CSRMatrix =
         =
 
         let run =
-            SpGEMM.run clContext workGroupSize opAdd opMul
+            SpGEMMMasked.run clContext workGroupSize opAdd opMul
 
         fun (queue: MailboxProcessor<_>) (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSC<'b>) (mask: ClMatrix.COO<_>) ->
 

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

@@ -1,11 +1,12 @@
-namespace GraphBLAS.FSharp.Backend.Matrix.CSRMatrix.SpGEMM
+namespace GraphBLAS.FSharp.Backend.Matrix.CSR.SpGEMM
 
 open Brahma.FSharp
 open GraphBLAS.FSharp.Backend.Common
 open GraphBLAS.FSharp.Backend.Predefined
 open GraphBLAS.FSharp.Backend.Objects.ClContext
 open GraphBLAS.FSharp.Backend.Objects
 open GraphBLAS.FSharp.Backend.Objects.ClCell
+open FSharp.Quotations
 
 type Indices = ClArray<int>
 
@@ -143,7 +144,6 @@ module Expand =
             )
 
             processor.Post <| Msg.CreateRunMsg<_, _> kernel
-            processor.Post <| Msg.CreateFreeMsg globalPositions
 
             globalRightMatrixValuesPointers
 
@@ -157,7 +157,7 @@ module Expand =
                  if gid < globalLength then
                      let valuePosition = globalPositions.[gid] - 1
 
-                     result.[gid] <- rightMatrixValues.[valuePosition]@>
+                     result.[gid] <- rightMatrixValues.[valuePosition] @>
 
         let kernel = clContext.Compile kernel
 
@@ -184,11 +184,51 @@ module Expand =
             )
 
             processor.Post <| Msg.CreateRunMsg<_, _> kernel
-            processor.Post <| Msg.CreateFreeMsg globalPositions
 
             resultLeftMatrixValues
 
-    let run (clContext: ClContext) workGroupSize multiplication =
+    let getResultRowPointers (clContext: ClContext) workGroupSize =
+
+        let kernel =
+            <@ fun (ndRange: Range1D) length (leftMatrixRowPointers: Indices) (globalArrayRightMatrixRawPointers: Indices) (result: Indices) ->
+
+                let gid = ndRange.GlobalID0
+
+                if gid < length then
+                    let rowPointer = leftMatrixRowPointers.[gid]
+                    let globalPointer = globalArrayRightMatrixRawPointers.[rowPointer]
+
+                    result.[gid] <- globalPointer
+                    @>
+
+        let kernel = clContext.Compile kernel
+
+        fun (processor: MailboxProcessor<_>) (leftMatrixRowPointers: Indices) (globalArrayRightMatrixRawPointers: Indices) ->
+
+            let result =
+                clContext.CreateClArrayWithSpecificAllocationMode(DeviceOnly, leftMatrixRowPointers.Length)
+
+            let kernel = kernel.GetKernel()
+
+            let ndRange =
+                Range1D.CreateValid( leftMatrixRowPointers.Length, workGroupSize)
+
+            processor.Post(
+                Msg.MsgSetArguments
+                    (fun () ->
+                        kernel.KernelFunc
+                            ndRange
+                            leftMatrixRowPointers.Length
+                            leftMatrixRowPointers
+                            globalArrayRightMatrixRawPointers
+                            result)
+            )
+
+            processor.Post <| Msg.CreateRunMsg<_, _> kernel
+
+            result
+
+    let run (clContext: ClContext) workGroupSize (multiplication: Expr<'a -> 'b -> 'c>) =
 
         let getRequiredRawsLengths =
             processLeftMatrixColumnsAndRightMatrixRawPointers clContext workGroupSize requiredRawsLengths
@@ -199,11 +239,11 @@ module Expand =
         let getRequiredRightMatrixValuesPointers =
             processLeftMatrixColumnsAndRightMatrixRawPointers clContext workGroupSize requiredRawPointers
 
+        let getGlobalPositions = getGlobalPositions clContext workGroupSize
+
         let getRightMatrixValuesPointers =
             getRightMatrixPointers clContext workGroupSize
 
-        let getGlobalPositions = getGlobalPositions clContext workGroupSize
-
         let gatherRightMatrixData = Gather.run clContext workGroupSize
 
         let gatherIndices = Gather.run clContext workGroupSize
@@ -213,6 +253,8 @@ module Expand =
 
         let map2 = ClArray.map2 clContext workGroupSize multiplication
 
+        let getRawPointers = getResultRowPointers clContext workGroupSize
+
         fun (processor: MailboxProcessor<_>) (leftMatrix: ClMatrix.CSR<'a>) (rightMatrix: ClMatrix.CSR<'b>) ->
 
             let requiredRawsLengths =
@@ -252,9 +294,12 @@ module Expand =
 
             // left matrix values correspondingly to right matrix values
             let extendedLeftMatrixValues =
-                getLeftMatrixValues processor globalLength globalPositions rightMatrix.Values
+                getLeftMatrixValues processor globalLength globalPositions leftMatrix.Values
 
             let multiplicationResult  =
                 map2 processor DeviceOnly extendedLeftMatrixValues extendedRightMatrixValues
 
-            multiplicationResult, extendedRightMatrixColumns
+            let rowPointers =
+                getRawPointers processor leftMatrix.RowPointers globalRightMatrixValuesRawsStartPositions
+
+            multiplicationResult, extendedRightMatrixColumns, rowPointers

…sharp.Backend/Matrix/CSRMatrix/SpGEMM.fs …Backend/Matrix/CSRMatrix/SpGEMMMasked.fssrc/GraphBLAS-sharp.Backend/Matrix/CSRMatrix/SpGEMM.fs renamed to src/GraphBLAS-sharp.Backend/Matrix/CSRMatrix/SpGEMMMasked.fs src/GraphBLAS-sharp.Backend/Matrix/CSRMatrix/SpGEMM.fs renamed to src/GraphBLAS-sharp.Backend/Matrix/CSRMatrix/SpGEMMMasked.fs

@@ -9,7 +9,7 @@ open GraphBLAS.FSharp.Backend.Objects.ClMatrix
 open GraphBLAS.FSharp.Backend.Objects.ClContext
 open GraphBLAS.FSharp.Backend.Objects.ClCell
 
-module internal SpGEMM =
+module internal SpGEMMMasked =
     let private calculate
         (context: ClContext)
         workGroupSize

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\Expand.fs" />
         <Compile Include="Program.fs" />
     </ItemGroup>
     <Import Project="..\..\.paket\Paket.Restore.targets" />

tests/GraphBLAS-sharp.Tests/Matrix/SpGEMM/Expand.fs

@@ -0,0 +1,66 @@
+module GraphBLAS.FSharp.Tests.Backend.Matrix.SpGEMM.Expand
+
+open GraphBLAS.FSharp.Objects.Matrix
+open GraphBLAS.FSharp.Backend.Matrix.CSR.SpGEMM
+open GraphBLAS.FSharp.Tests
+open GraphBLAS.FSharp.Backend.Objects.ArraysExtensions
+open Expecto
+
+let context = Context.defaultContext
+
+/// <remarks>
+/// Left matrix
+/// </remarks>
+/// <code>
+/// [ 0 0 2 3 0
+///   0 0 0 0 0
+///   0 8 0 5 4
+///   0 0 2 0 0
+///   1 7 0 0 0 ]
+/// </code>
+let leftMatrix =
+    { RowCount = 5
+      ColumnCount = 5
+      RowPointers = [| 0; 2; 2; 5; 6; 8 |]
+      ColumnIndices = [| 2; 3; 1; 3; 4; 2; 0; 1|]
+      Values = [| 2; 3; 8; 5; 4; 2; 1; 7 |] }
+
+/// <remarks>
+/// Right matrix
+/// </remarks>
+/// <code>
+/// [ 0 0 0 0 0 0 0
+///   0 3 0 0 4 0 4
+///   0 0 2 0 0 2 0
+///   0 5 0 0 0 9 1
+///   0 0 0 0 1 0 8 ]
+/// </code>
+let rightMatrix =
+    { RowCount = 5
+      ColumnCount = 7
+      RowPointers = [| 0; 0; 3; 5; 8; 10 |]
+      ColumnIndices = [| 1; 4; 6; 2; 5; 1; 5; 6; 4; 6 |]
+      Values = [| 3; 4; 4; 2; 2; 5; 9; 1; 1; 8 |] }
+
+let requiredRowLength =
+    testCase "requiredRowLength"
+    <| fun () ->
+        let clContext = context.ClContext
+        let processor = context.Queue
+
+        let deviceLeftMatrix = leftMatrix.ToDevice clContext
+        let deviceRightMatrix = rightMatrix.ToDevice clContext
+
+        let getRequiredRawsLengths =
+            Expand.processLeftMatrixColumnsAndRightMatrixRawPointers clContext Utils.defaultWorkGroupSize Expand.requiredRawsLengths
+
+        let requiredRawsLengths =
+            getRequiredRawsLengths processor deviceLeftMatrix.Columns deviceRightMatrix.RowPointers
+
+        let requiredRawsLengthsHost = requiredRawsLengths.ToHost processor
+
+        "Results must be the same"
+        |> Expect.equal requiredRawsLengthsHost [| 2; 3; 3; 3; 2; 2; 0; 3 |]
+
+
+

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -1,73 +1,70 @@
 open Expecto
 open GraphBLAS.FSharp.Tests.Backend
 
-let matrixTests =
-    testList
-        "Matrix tests"
-        [ Matrix.Convert.tests
-          Matrix.Map2.addTests
-          Matrix.Map2.addAtLeastOneTests
-          Matrix.Map2.mulAtLeastOneTests
-          Matrix.Map2.addAtLeastOneToCOOTests
-          Matrix.Mxm.tests
-          Matrix.Transpose.tests ]
-    |> testSequenced
-
-let commonTests =
-    let clArrayTests =
-        testList
-            "ClArray"
-            [ Common.ClArray.PrefixSum.tests
-              Common.ClArray.RemoveDuplicates.tests
-              Common.ClArray.Copy.tests
-              Common.ClArray.Replicate.tests
-              Common.ClArray.Exists.tests
-              Common.ClArray.Map.tests
-              Common.ClArray.Map2.addTests
-              Common.ClArray.Map2.mulTests
-              Common.ClArray.Choose.tests ]
-
-    testList
-        "Common tests"
-        [ clArrayTests
-          Common.BitonicSort.tests
-          Common.Scatter.tests
-          Common.Reduce.tests
-          Common.Sum.tests ]
-    |> testSequenced
-
-let vectorTests =
-    testList
-        "Vector tests"
-        [ Vector.SpMV.tests
-          Vector.ZeroCreate.tests
-          Vector.OfList.tests
-          Vector.Copy.tests
-          Vector.Convert.tests
-          Vector.Map2.addTests
-          Vector.Map2.mulTests
-          Vector.Map2.addAtLeastOneTests
-          Vector.Map2.mulAtLeastOneTests
-          Vector.Map2.addGeneralTests
-          Vector.Map2.mulGeneralTests
-          Vector.Map2.complementedGeneralTests
-          Vector.AssignByMask.tests
-          Vector.AssignByMask.complementedTests
-          Vector.Reduce.tests ]
-    |> testSequenced
-
-let algorithmsTests =
-    testList "Algorithms tests" [ Algorithms.BFS.tests ]
-    |> testSequenced
+// let matrixTests =
+//     testList
+//         "Matrix tests"
+//         [ Matrix.Convert.tests
+//           Matrix.Map2.addTests
+//           Matrix.Map2.addAtLeastOneTests
+//           Matrix.Map2.mulAtLeastOneTests
+//           Matrix.Map2.addAtLeastOneToCOOTests
+//           Matrix.Mxm.tests
+//           Matrix.Transpose.tests ]
+//     |> testSequenced
+//
+// let commonTests =
+//     let clArrayTests =
+//         testList
+//             "ClArray"
+//             [ Common.ClArray.PrefixSum.tests
+//               Common.ClArray.RemoveDuplicates.tests
+//               Common.ClArray.Copy.tests
+//               Common.ClArray.Replicate.tests
+//               Common.ClArray.Exists.tests
+//               Common.ClArray.Map.tests
+//               Common.ClArray.Map2.addTests
+//               Common.ClArray.Map2.mulTests
+//               Common.ClArray.Choose.tests ]
+//
+//     testList
+//         "Common tests"
+//         [ clArrayTests
+//           Common.BitonicSort.tests
+//           Common.Scatter.tests
+//           Common.Reduce.tests
+//           Common.Sum.tests ]
+//     |> testSequenced
+//
+// let vectorTests =
+//     testList
+//         "Vector tests"
+//         [ Vector.SpMV.tests
+//           Vector.ZeroCreate.tests
+//           Vector.OfList.tests
+//           Vector.Copy.tests
+//           Vector.Convert.tests
+//           Vector.Map2.addTests
+//           Vector.Map2.mulTests
+//           Vector.Map2.addAtLeastOneTests
+//           Vector.Map2.mulAtLeastOneTests
+//           Vector.Map2.addGeneralTests
+//           Vector.Map2.mulGeneralTests
+//           Vector.Map2.complementedGeneralTests
+//           Vector.AssignByMask.tests
+//           Vector.AssignByMask.complementedTests
+//           Vector.Reduce.tests ]
+//     |> testSequenced
+//
+// let algorithmsTests =
+//     testList "Algorithms tests" [ Algorithms.BFS.tests ]
+//     |> testSequenced
 
 [<Tests>]
 let allTests =
     testList
         "All tests"
-        [ commonTests
-          matrixTests
-          vectorTests
-          algorithmsTests ]
+        [ Matrix.SpGEMM.Expand.requiredRowLength ]
     |> testSequenced
 
 [<EntryPoint>]