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

@@ -2,21 +2,39 @@ namespace GraphBLAS.FSharp.Backend
 
 open Brahma.FSharp.OpenCL
 
-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> =
     { RowCount: int
       ColumnCount: int
       RowPointers: ClArray<int>
       Columns: ClArray<int>
       Values: ClArray<'elem> }
 
-type TupleMatrix<'elem when 'elem: struct> =
-    { RowIndices: ClArray<int>
-      ColumnIndices: ClArray<int>
-      Values: ClArray<'elem> }
-
-type COOMatrix<'elem when 'elem: struct> =
+and COOMatrix<'elem when 'elem: struct> =
     { RowCount: int
       ColumnCount: int
       Rows: ClArray<int>
       Columns: ClArray<int>
       Values: ClArray<'elem> }
+
+and TupleMatrix<'elem when 'elem: struct> =
+    { RowIndices: ClArray<int>
+      ColumnIndices: ClArray<int>
+      Values: ClArray<'elem> }

…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

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