refactor: CSR.expandRowsPointers

Author: IgorErin

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

@@ -13,17 +13,54 @@ open GraphBLAS.FSharp.Backend.Objects.ArraysExtensions
 
 
 module Matrix =
+    let expandRowPointers (clContext: ClContext) workGroupSize =
+
+        let kernel =
+            <@ fun (ndRange: Range1D) columnsLength pointersLength (pointers: ClArray<int>) (results: ClArray<int>) ->
+
+                let gid = ndRange.GlobalID0
+
+                if gid < columnsLength then
+                    let result =
+                        (%Search.Bin.lowerBound 0) pointersLength gid pointers
+
+                    results.[gid] <- result - 1  @>
+
+        let program = clContext.Compile kernel
+
+        fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
+
+            let rows =
+                clContext.CreateClArrayWithSpecificAllocationMode(allocationMode, matrix.Columns.Length)
+
+            let kernel = program.GetKernel()
+
+            let ndRange =
+                Range1D.CreateValid(matrix.Columns.Length, workGroupSize)
+
+            processor.Post(Msg.MsgSetArguments(
+                fun () ->
+                    kernel.KernelFunc
+                        ndRange
+                        matrix.Columns.Length
+                        matrix.RowPointers.Length
+                        matrix.RowPointers
+                        rows))
+
+            processor.Post(Msg.CreateRunMsg<_, _> kernel)
+
+            rows
+
     let toCOO (clContext: ClContext) workGroupSize =
-        let prepare =
-            Common.expandRowPointers clContext workGroupSize
+        let prepare = expandRowPointers clContext workGroupSize
 
         let copy = ClArray.copy clContext workGroupSize
 
         let copyData = ClArray.copy clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
             let rows =
-                prepare processor allocationMode matrix.RowPointers matrix.Columns.Length matrix.RowCount
+                prepare processor allocationMode matrix
 
             let cols =
                 copy processor allocationMode matrix.Columns
@@ -39,12 +76,11 @@ module Matrix =
               Values = values }
 
     let toCOOInPlace (clContext: ClContext) workGroupSize =
-        let prepare =
-            Common.expandRowPointers clContext workGroupSize
+        let prepare = expandRowPointers clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
             let rows =
-                prepare processor allocationMode matrix.RowPointers matrix.Columns.Length matrix.RowCount
+                prepare processor allocationMode matrix
 
             processor.Post(Msg.CreateFreeMsg(matrix.RowPointers))
 
@@ -92,7 +128,6 @@ module Matrix =
         let toCSRInPlace =
             COO.Matrix.toCSRInPlace clContext workGroupSize
 
-
         fun (queue: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
             toCOO queue allocationMode matrix
             |> transposeInPlace queue

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

@@ -4,8 +4,10 @@ open Brahma.FSharp
 open GraphBLAS.FSharp.Backend.Common
 open GraphBLAS.FSharp.Backend.Objects.ClContext
 open GraphBLAS.FSharp.Backend.Objects.ClCell
+open GraphBLAS.FSharp.Backend.Objects
+open GraphBLAS.FSharp.Backend.Quotes
 
-module Common =
+module internal Common =
     ///<param name="clContext">.</param>
     ///<param name="workGroupSize">Should be a power of 2 and greater than 1.</param>
     let setPositions<'a when 'a: struct> (clContext: ClContext) workGroupSize =
@@ -40,40 +42,3 @@ module Common =
             valuesScatter processor positions allValues resultValues
 
             resultRows, resultColumns, resultValues, resultLength
-
-    let expandRowPointers (clContext: ClContext) workGroupSize =
-
-        let expandRowPointers =
-            <@ fun (ndRange: Range1D) (rowPointers: ClArray<int>) (rowCount: int) (rows: ClArray<int>) ->
-
-                let i = ndRange.GlobalID0
-
-                if i < rowCount then
-                    let rowPointer = rowPointers.[i]
-
-                    if rowPointer <> rowPointers.[i + 1] then
-                        rows.[rowPointer] <- i @>
-
-        let program = clContext.Compile expandRowPointers
-
-        let create =
-            ClArray.zeroCreate clContext workGroupSize
-
-        let scan =
-            PrefixSum.runIncludeInPlace <@ max @> clContext workGroupSize
-
-        fun (processor: MailboxProcessor<_>) allocationMode (rowPointers: ClArray<int>) nnz rowCount ->
-
-            let rows = create processor allocationMode nnz
-
-            let kernel = program.GetKernel()
-
-            let ndRange =
-                Range1D.CreateValid(rowCount, workGroupSize)
-
-            processor.Post(Msg.MsgSetArguments(fun () -> kernel.KernelFunc ndRange rowPointers rowCount rows))
-            processor.Post(Msg.CreateRunMsg<_, _> kernel)
-
-            (scan processor rows 0).Free processor
-
-            rows

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

@@ -405,19 +405,19 @@ module Matrix =
                 | ClMatrix.CSR m1, ClMatrix.CSC m2, ClMatrix.COO mask -> runCSRnCSC queue m1 m2 mask |> ClMatrix.COO
                 | _ -> failwith "Matrix formats are not matching"
 
-        let expand
-            (opAdd: Expr<'c -> 'c -> 'c option>)
-            (opMul: Expr<'a -> 'b -> 'c option>)
-            (clContext: ClContext)
-            workGroupSize
-            =
-
-            let run =
-                SpGeMM.Expand.run clContext workGroupSize opAdd opMul
-
-            fun (processor: MailboxProcessor<_>) allocationMode (leftMatrix: ClMatrix<'a>) (rightMatrix: ClMatrix<'b>) ->
-                match leftMatrix, rightMatrix with
-                | ClMatrix.CSR leftMatrix, ClMatrix.CSR rightMatrix ->
-                    ClMatrix.LIL
-                    <| run processor allocationMode leftMatrix rightMatrix
-                | _ -> failwith "Matrix formats are not matching"
+        // let expand
+        //     (opAdd: Expr<'c -> 'c -> 'c option>)
+        //     (opMul: Expr<'a -> 'b -> 'c option>)
+        //     (clContext: ClContext)
+        //     workGroupSize
+        //     =
+        //
+        //     let run =
+        //         SpGeMM.Expand.run clContext workGroupSize opAdd opMul
+        //
+        //     fun (processor: MailboxProcessor<_>) allocationMode (leftMatrix: ClMatrix<'a>) (rightMatrix: ClMatrix<'b>) ->
+        //         match leftMatrix, rightMatrix with
+        //         | ClMatrix.CSR leftMatrix, ClMatrix.CSR rightMatrix ->
+        //             ClMatrix.LIL
+        //             <| run processor allocationMode leftMatrix rightMatrix
+        //         | _ -> failwith "Matrix formats are not matching"