Merge pull request #34 from kirillgarbar/net5

Backend matrix generalization

Author: kirillgarbar

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

@@ -9,16 +9,17 @@
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Common/Utils.fs" />
-    <Compile Include="Common/ClArray.fs" />    
+    <Compile Include="Common/ClArray.fs" />
     <Compile Include="Common/Sum.fs" />
     <Compile Include="Common/BitonicSort.fs" />
     <Compile Include="Matrices.fs" />
-    <Compile Include="COOMatrix/COOMatrix.fs" />
-    <Compile Include="CSRMatrix/CSRMatrix.fs" />
+    <Compile Include="Matrix/COOMatrix/COOMatrix.fs" />
+    <Compile Include="Matrix/CSRMatrix/CSRMatrix.fs" />
+    <Compile Include="Matrix/CSRMatrix/SpGEMM.fs" />
+    <Compile Include="Matrix/CSRMatrix/SpMV.fs" />
+    <Compile Include="Matrix/Matrix.fs" />
     <!--Compile Include="Backend/CSRMatrix/GetTuples.fs" /-->
-    <Compile Include="CSRMatrix/SpGEMM.fs" />
     <!--Compile Include="Backend/CSRMatrix/SpMSpV.fs" /-->
-    <Compile Include="CSRMatrix/SpMV.fs" />
     <!--Compile Include="Backend/CSRMatrix/Transpose.fs" /-->
     <!--Compile Include="Backend/COOVector/Utilities/SetPositions.fs" />
     <Compile Include="Backend/COOVector/Utilities/AssignSubVector/Intersect.fs" />

src/GraphBLAS-sharp.Backend/Matrices.fs

@@ -5,7 +5,25 @@ open Brahma.FSharp.OpenCL
 type IDeviceMemObject =
     abstract Dispose : unit -> unit
 
-type CSRMatrix<'elem when 'elem: struct> =
+type MatrixFromat =
+    | CSR
+    | COO
+
+type Matrix<'a when 'a: struct> =
+    | MatrixCSR of CSRMatrix<'a>
+    | MatrixCOO of COOMatrix<'a>
+
+    member this.RowCount =
+        match this with
+        | MatrixCSR matrix -> matrix.RowCount
+        | MatrixCOO matrix -> matrix.RowCount
+
+    member this.ColumnCount =
+        match this with
+        | MatrixCSR matrix -> matrix.ColumnCount
+        | MatrixCOO matrix -> matrix.ColumnCount
+
+and CSRMatrix<'elem when 'elem: struct> =
     { Context: ClContext
       RowCount: int
       ColumnCount: int
@@ -21,32 +39,32 @@ type CSRMatrix<'elem when 'elem: struct> =
             q.Post(Msg.CreateFreeMsg<_>(this.RowPointers))
             q.PostAndReply(Msg.MsgNotifyMe)
 
-type TupleMatrix<'elem when 'elem: struct> =
+and COOMatrix<'elem when 'elem: struct> =
     { Context: ClContext
-      RowIndices: ClArray<int>
-      ColumnIndices: ClArray<int>
+      RowCount: int
+      ColumnCount: int
+      Rows: ClArray<int>
+      Columns: ClArray<int>
       Values: ClArray<'elem> }
 
     interface IDeviceMemObject with
         member this.Dispose() =
             let q = this.Context.Provider.CommandQueue
-            q.Post(Msg.CreateFreeMsg<_>(this.RowIndices))
-            q.Post(Msg.CreateFreeMsg<_>(this.ColumnIndices))
             q.Post(Msg.CreateFreeMsg<_>(this.Values))
+            q.Post(Msg.CreateFreeMsg<_>(this.Columns))
+            q.Post(Msg.CreateFreeMsg<_>(this.Rows))
             q.PostAndReply(Msg.MsgNotifyMe)
 
-type COOMatrix<'elem when 'elem: struct> =
+and TupleMatrix<'elem when 'elem: struct> =
     { Context: ClContext
-      RowCount: int
-      ColumnCount: int
-      Rows: ClArray<int>
-      Columns: ClArray<int>
+      RowIndices: ClArray<int>
+      ColumnIndices: ClArray<int>
       Values: ClArray<'elem> }
 
     interface IDeviceMemObject with
         member this.Dispose() =
             let q = this.Context.Provider.CommandQueue
+            q.Post(Msg.CreateFreeMsg<_>(this.RowIndices))
+            q.Post(Msg.CreateFreeMsg<_>(this.ColumnIndices))
             q.Post(Msg.CreateFreeMsg<_>(this.Values))
-            q.Post(Msg.CreateFreeMsg<_>(this.Columns))
-            q.Post(Msg.CreateFreeMsg<_>(this.Rows))
             q.PostAndReply(Msg.MsgNotifyMe)

…LAS-sharp.Backend/COOMatrix/COOMatrix.fs …rp.Backend/Matrix/COOMatrix/COOMatrix.fssrc/GraphBLAS-sharp.Backend/COOMatrix/COOMatrix.fs renamed to src/GraphBLAS-sharp.Backend/Matrix/COOMatrix/COOMatrix.fs src/GraphBLAS-sharp.Backend/COOMatrix/COOMatrix.fs renamed to src/GraphBLAS-sharp.Backend/Matrix/COOMatrix/COOMatrix.fs

@@ -355,8 +355,8 @@ module COOMatrix =
             queue.Post(Msg.CreateFreeMsg<_>(allValues))
 
             { Context = clContext
-              RowCount = resultRows.Length
-              ColumnCount = resultColumns.Length
+              RowCount = matrixLeft.RowCount
+              ColumnCount = matrixLeft.ColumnCount
               Rows = resultRows
               Columns = resultColumns
               Values = resultValues }

…LAS-sharp.Backend/CSRMatrix/CSRMatrix.fs …rp.Backend/Matrix/CSRMatrix/CSRMatrix.fssrc/GraphBLAS-sharp.Backend/CSRMatrix/CSRMatrix.fs renamed to src/GraphBLAS-sharp.Backend/Matrix/CSRMatrix/CSRMatrix.fs src/GraphBLAS-sharp.Backend/CSRMatrix/CSRMatrix.fs renamed to src/GraphBLAS-sharp.Backend/Matrix/CSRMatrix/CSRMatrix.fs

@@ -0,0 +1,34 @@
+namespace GraphBLAS.FSharp.Backend
+
+open Brahma.FSharp.OpenCL
+open Microsoft.FSharp.Quotations
+
+module Matrix =
+    let toCSR (clContext: ClContext) workGroupSize =
+        let toCSR = COOMatrix.toCSR clContext workGroupSize
+
+        fun (processor: MailboxProcessor<_>) (matrix: Matrix<'a>) ->
+            match matrix with
+            | MatrixCOO m -> toCSR processor m |> MatrixCSR
+            | MatrixCSR _ -> matrix
+
+    let toCOO (clContext: ClContext) workGroupSize =
+        let toCOO = CSRMatrix.toCOO clContext
+
+        fun (processor: MailboxProcessor<_>) (matrix: Matrix<'a>) ->
+            match matrix with
+            | MatrixCOO _ -> matrix
+            | MatrixCSR m -> toCOO workGroupSize processor m |> MatrixCOO
+
+    let eWiseAdd (clContext: ClContext) (opAdd: Expr<'a -> 'a -> 'a>) workGroupSize =
+        let COOeWiseAdd =
+            COOMatrix.eWiseAdd clContext opAdd workGroupSize
+
+        let CSReWiseAdd =
+            CSRMatrix.eWiseAdd clContext opAdd workGroupSize
+
+        fun (processor: MailboxProcessor<_>) matrix1 matrix2 ->
+            match matrix1, matrix2 with
+            | MatrixCOO m1, MatrixCOO m2 -> COOeWiseAdd processor m1 m2 |> MatrixCOO
+            | MatrixCSR m1, MatrixCSR m2 -> CSReWiseAdd processor m1 m2 |> MatrixCSR
+            | _ -> failwith "Matrix formats are not matching"