add: Matrix.Rows.Convert

Author: IgorErin

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksMxm.fs

@@ -75,7 +75,7 @@ type MxmBenchmarks<'elem when 'elem : struct>(
     member this.FunCSR2CSC =
         match funCSR2CSC with
         | None ->
-            let x = Matrix.toCSCInplace this.OclContext this.WorkGroupSize
+            let x = Matrix.toCSCInPlace this.OclContext this.WorkGroupSize
             funCSR2CSC <- Some x
             x
         | Some x -> x

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

@@ -635,10 +635,10 @@ module ClArray =
             if count = 0 then ()
             else
                 if firstPosition + count > targetArray.Length then
-                    failwith ""
+                    failwith "The array should fit completely"
 
-                if firstPosition < 0 then failwith ""
-                if count < 0 then failwith "" // TODO()
+                if firstPosition < 0 then failwith "The starting position cannot be less than zero"
+                if count < 0 then failwith "The count cannot be less than zero"
 
                 let ndRange =
                     Range1D.CreateValid(count, workGroupSize)

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

@@ -107,7 +107,7 @@ module Matrix =
               Columns = cols
               Values = values }
 
-    let toCSRInplace (clContext: ClContext) workGroupSize =
+    let toCSRInPlace (clContext: ClContext) workGroupSize =
         let prepare = compressRows clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.COO<'a>) ->
@@ -123,7 +123,7 @@ module Matrix =
               Columns = matrix.Columns
               Values = matrix.Values }
 
-    let transposeInplace (clContext: ClContext) workGroupSize =
+    let transposeInPlace (clContext: ClContext) workGroupSize =
 
         let sort =
             Sort.Bitonic.sortKeyValuesInplace clContext workGroupSize
@@ -140,7 +140,7 @@ module Matrix =
 
     let transpose (clContext: ClContext) workGroupSize =
 
-        let transposeInplace = transposeInplace clContext workGroupSize
+        let transposeInPlace = transposeInPlace clContext workGroupSize
 
         let copy = ClArray.copy clContext workGroupSize
 
@@ -154,34 +154,4 @@ module Matrix =
               Rows = copy queue allocationMode matrix.Rows
               Columns = copy queue allocationMode matrix.Columns
               Values = copyData queue allocationMode matrix.Values }
-            |> transposeInplace queue
-
-    let concat (clContext: ClContext) workGroupSize =
-
-        let concatValues = ClArray.concat clContext workGroupSize
-
-        let concatIndices = ClArray.concat clContext workGroupSize
-
-        fun (processor: MailboxProcessor<_>) allocationMode columnCount rowCount (matrices: ClMatrix.COO<'a> seq) ->
-
-            let resultValues =
-                matrices
-                |> Seq.map (fun matrix -> matrix.Values)
-                |> concatValues processor allocationMode
-
-            let resultColumns =
-                matrices
-                |> Seq.map (fun matrix -> matrix.Columns)
-                |> concatIndices processor allocationMode
-
-            let resultRows =
-                matrices
-                |> Seq.map (fun matrix -> matrix.Rows)
-                |> concatIndices processor allocationMode
-
-            { Context = clContext
-              RowCount = rowCount
-              ColumnCount = columnCount
-              Rows = resultRows
-              Columns = resultColumns
-              Values = resultValues }
+            |> transposeInPlace queue

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

@@ -122,7 +122,7 @@ module internal Map =
         let mapToCOO = runToCOO clContext opAdd workGroupSize
 
         let toCSRInplace =
-            Matrix.toCSRInplace clContext workGroupSize
+            Matrix.toCSRInPlace clContext workGroupSize
 
         fun (queue: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
             mapToCOO queue allocationMode matrix

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

@@ -144,7 +144,7 @@ module internal Map2 =
         let map2ToCOO = runToCOO clContext opAdd workGroupSize
 
         let toCSRInplace =
-            Matrix.toCSRInplace clContext workGroupSize
+            Matrix.toCSRInPlace clContext workGroupSize
 
         fun (queue: MailboxProcessor<_>) allocationMode (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSR<'b>) ->
             map2ToCOO queue allocationMode matrixLeft matrixRight

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

@@ -339,7 +339,7 @@ module internal Map2AtLeastOne =
         let elementwiseToCOO = runToCOO clContext opAdd workGroupSize
 
         let toCSRInplace =
-            Matrix.toCSRInplace clContext workGroupSize
+            Matrix.toCSRInPlace clContext workGroupSize
 
         fun (queue: MailboxProcessor<_>) allocationMode (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSR<'b>) ->
             elementwiseToCOO queue allocationMode matrixLeft matrixRight

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

@@ -82,10 +82,10 @@ module Matrix =
         let toCOOInPlace = toCOOInPlace clContext workGroupSize
 
         let transposeInPlace =
-            COO.Matrix.transposeInplace clContext workGroupSize
+            COO.Matrix.transposeInPlace clContext workGroupSize
 
         let toCSRInPlace =
-            COO.Matrix.toCSRInplace clContext workGroupSize
+            COO.Matrix.toCSRInPlace clContext workGroupSize
 
         fun (queue: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
             toCOOInPlace queue allocationMode matrix
@@ -97,10 +97,10 @@ module Matrix =
         let toCOO = toCOO clContext workGroupSize
 
         let transposeInPlace =
-            COO.Matrix.transposeInplace clContext workGroupSize
+            COO.Matrix.transposeInPlace clContext workGroupSize
 
         let toCSRInPlace =
-            COO.Matrix.toCSRInplace clContext workGroupSize
+            COO.Matrix.toCSRInPlace clContext workGroupSize
 
         fun (queue: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
             toCOO queue allocationMode matrix
@@ -148,3 +148,36 @@ module Matrix =
             runLazy processor allocationMode matrix
             |> Seq.map (fun lazyValue -> lazyValue.Value)
             |> Seq.toArray
+
+    let toRows (clContext: ClContext) workGroupSize =
+
+        let byRows = byRows clContext workGroupSize
+
+        fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
+            let rows = byRows processor allocationMode matrix
+
+            { Context = clContext
+              RowCount = matrix.RowCount
+              ColumnCount = matrix.ColumnCount
+              Rows = rows
+              NNZ = matrix.NNZ }
+
+    let getRowsLength (clContext: ClContext) workGroupSize =
+
+        let pairwise = ClArray.pairwise clContext workGroupSize
+
+        let subtract =
+            ClArray.map clContext workGroupSize Map.pairSubtraction
+
+        fun (processor: MailboxProcessor<_>) (matrix: ClMatrix.CSR<'b>) ->
+            let pointerPairs =
+                pairwise processor DeviceOnly matrix.RowPointers
+                // since row pointers length in matrix always >= 2
+                |> Option.defaultWith (fun () ->
+                    failwith "The state of the matrix is broken. The length of the rowPointers must be >= 2")
+
+            let rowsLength = subtract processor DeviceOnly pointerPairs
+
+            pointerPairs.Free processor
+
+            rowsLength

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

@@ -94,7 +94,7 @@ module Matrix =
     ///<param name="workGroupSize">Should be a power of 2 and greater than 1.</param>
     let toCSRInPlace (clContext: ClContext) workGroupSize =
         let toCSRInPlace =
-            COO.Matrix.toCSRInplace clContext workGroupSize
+            COO.Matrix.toCSRInPlace clContext workGroupSize
 
         let transposeInPlace =
             CSR.Matrix.transposeInPlace clContext workGroupSize
@@ -121,11 +121,11 @@ module Matrix =
 
         let copy = copy clContext workGroupSize
 
-        let transposeInplace =
-            COO.Matrix.transposeInplace clContext workGroupSize
+        let transposeInPlace =
+            COO.Matrix.transposeInPlace clContext workGroupSize
 
-        let rowsToCOO =
-            Rows.Matrix.toCOO clContext workGroupSize
+        let rowsToCSR =
+            Rows.Matrix.toCSR clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix<'a>) ->
             match matrix with
@@ -134,10 +134,11 @@ module Matrix =
             | ClMatrix.CSC m ->
                 m.ToCSR
                 |> toCOO processor allocationMode
-                |> transposeInplace processor
+                |> transposeInPlace processor
                 |> ClMatrix.COO
             | ClMatrix.Rows m ->
-                rowsToCOO processor allocationMode m
+                rowsToCSR processor allocationMode m
+                |> toCOO processor allocationMode
                 |> ClMatrix.COO
 
     /// <summary>
@@ -151,7 +152,7 @@ module Matrix =
             CSR.Matrix.toCOOInPlace clContext workGroupSize
 
         let transposeInPlace =
-            COO.Matrix.transposeInplace clContext workGroupSize
+            COO.Matrix.transposeInPlace clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix<'a>) ->
             match matrix with
@@ -182,6 +183,8 @@ module Matrix =
         let transposeCOO =
             COO.Matrix.transpose clContext workGroupSize
 
+        let rowsToCSR = Rows.Matrix.toCSR clContext workGroupSize
+
         fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix<'a>) ->
             match matrix with
             | ClMatrix.CSC _ -> copy processor allocationMode matrix
@@ -193,37 +196,68 @@ module Matrix =
                  |> COOtoCSR processor allocationMode)
                     .ToCSC
                 |> ClMatrix.CSC
-            | _ -> failwith "Not yet implemented"
+            | ClMatrix.Rows m ->
+                rowsToCSR processor allocationMode m
+                |> transposeCSR processor allocationMode
+                |> fun m -> m.ToCSC
+                |> ClMatrix.CSC
 
     /// <summary>
     /// Returns the matrix, represented in CSC format, that is equal to the given one.
     /// The given matrix should neither be used afterwards nor be disposed.
     /// </summary>
     ///<param name="clContext">OpenCL context.</param>
     ///<param name="workGroupSize">Should be a power of 2 and greater than 1.</param>
-    let toCSCInplace (clContext: ClContext) workGroupSize =
-        let toCSRInplace =
-            COO.Matrix.toCSRInplace clContext workGroupSize
+    let toCSCInPlace (clContext: ClContext) workGroupSize =
+        let toCSRInPlace =
+            COO.Matrix.toCSRInPlace clContext workGroupSize
 
-        let transposeCSRInplace =
+        let transposeCSRInPlace =
             CSR.Matrix.transposeInPlace clContext workGroupSize
 
-        let transposeCOOInplace =
-            COO.Matrix.transposeInplace clContext workGroupSize
+        let transposeCOOInPlace =
+            COO.Matrix.transposeInPlace clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix<'a>) ->
             match matrix with
             | ClMatrix.CSC _ -> matrix
             | ClMatrix.CSR m ->
-                (transposeCSRInplace processor allocationMode m)
+                (transposeCSRInPlace processor allocationMode m)
                     .ToCSC
                 |> ClMatrix.CSC
             | ClMatrix.COO m ->
-                (transposeCOOInplace processor m
-                 |> toCSRInplace processor allocationMode)
+                (transposeCOOInPlace processor m
+                 |> toCSRInPlace processor allocationMode)
                     .ToCSC
                 |> ClMatrix.CSC
-            | _ -> failwith "not yet supported"
+            | _ -> failwith "Not yet implemented"
+
+    let toRows (clContext: ClContext) workGroupSize =
+
+        let copy = copy clContext workGroupSize
+
+        let COOToCSR = COO.Matrix.toCSR clContext workGroupSize
+
+        let transposeCSR =
+            CSR.Matrix.transposeInPlace clContext workGroupSize
+
+        let CSRToRows = CSR.Matrix.toRows clContext workGroupSize
+
+        fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix<'a>) ->
+            match matrix with
+            | ClMatrix.CSC m ->
+                m.ToCSR
+                |> transposeCSR processor allocationMode
+                |> CSRToRows processor allocationMode
+                |> ClMatrix.Rows
+            | ClMatrix.CSR m ->
+                CSRToRows processor allocationMode m
+                |> ClMatrix.Rows
+            | ClMatrix.COO m ->
+                COOToCSR processor allocationMode m
+                |> CSRToRows processor allocationMode
+                |> ClMatrix.Rows
+            | ClMatrix.Rows _ -> copy processor allocationMode matrix
 
     let map (clContext: ClContext) (opAdd: Expr<'a option -> 'b option>) workGroupSize =
         let mapCOO =
@@ -241,7 +275,7 @@ module Matrix =
                 |> ClMatrix.CSC
             | _ -> failwith "Not yet implemented"
 
-    let map2 (clContext: ClContext) (opAdd: Expr<'a option -> 'b option -> 'c option>) workGroupSize = // TODO()
+    let map2 (clContext: ClContext) (opAdd: Expr<'a option -> 'b option -> 'c option>) workGroupSize =
         let map2COO =
             COO.Matrix.map2 clContext opAdd workGroupSize
 
@@ -291,7 +325,7 @@ module Matrix =
             CSR.Matrix.map2AtLeastOneToCOO clContext opAdd workGroupSize
 
         let transposeCOOInPlace =
-            COO.Matrix.transposeInplace clContext workGroupSize
+            COO.Matrix.transposeInPlace clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) allocationMode matrix1 matrix2 ->
             match matrix1, matrix2 with
@@ -322,14 +356,14 @@ module Matrix =
     ///<param name="workGroupSize">Should be a power of 2 and greater than 1.</param>
     let transposeInPlace (clContext: ClContext) workGroupSize =
         let COOTransposeInPlace =
-            COO.Matrix.transposeInplace clContext workGroupSize
+            COO.Matrix.transposeInPlace clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) matrix ->
             match matrix with
             | ClMatrix.COO m -> COOTransposeInPlace processor m |> ClMatrix.COO
             | ClMatrix.CSR m -> ClMatrix.CSC m.ToCSC
             | ClMatrix.CSC m -> ClMatrix.CSR m.ToCSR
-            | ClMatrix.Rows _ -> failwith "not yet supported"
+            | ClMatrix.Rows _ -> failwith "Not yet implemented"
 
     /// <summary>
     /// Transposes the given matrix and returns result as a new matrix.
@@ -344,7 +378,7 @@ module Matrix =
     ///<param name="clContext">OpenCL context.</param>
     ///<param name="workGroupSize">Should be a power of 2 and greater than 1.</param>
     let transpose (clContext: ClContext) workGroupSize =
-        let COOtranspose =
+        let COOTranspose =
             COO.Matrix.transpose clContext workGroupSize
 
         let copy = ClArray.copy clContext workGroupSize
@@ -354,7 +388,7 @@ module Matrix =
         fun (processor: MailboxProcessor<_>) allocationMode matrix ->
             match matrix with
             | ClMatrix.COO m ->
-                COOtranspose processor allocationMode m
+                COOTranspose processor allocationMode m
                 |> ClMatrix.COO
             | ClMatrix.CSR m ->
                 { Context = m.Context
@@ -372,7 +406,7 @@ module Matrix =
                   Columns = copy processor allocationMode m.Rows
                   Values = copyData processor allocationMode m.Values }
                 |> ClMatrix.CSR
-            | ClMatrix.Rows _ -> failwith "not yet supported"
+            | ClMatrix.Rows _ -> failwith "Not yet implemented"
 
     module SpGeMM =
         let masked