refactor: Matrix.{MatrixFomat}

Author: IgorErin

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksMathNET.fs

@@ -18,7 +18,7 @@ type MathNETBenchmark<'elem when 'elem: struct and 'elem :> System.IEquatable<'e
 
     static member COOMatrixToMathNETSparse matrix =
         match matrix with
-        | MatrixCOO matrix ->
+        | Matrix.COO matrix ->
             Matrix.Build.SparseFromCoordinateFormat(
                 matrix.RowCount,
                 matrix.ColumnCount,

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksMxm.fs

@@ -107,7 +107,7 @@ type MxmBenchmarks<'elem when 'elem : struct>(
 
     member this.ReadMask(maskReader) =
         match this.ReadMatrix maskReader with
-        | MatrixCOO m ->
+        | Matrix.COO m ->
             maskHost <-
                 { IsComplemented = false
                   RowCount = m.RowCount

src/GraphBLAS-sharp/IO/MtxReader.fs

@@ -119,7 +119,7 @@ type MtxReader(pathToFile: string) =
                     values.[i] <- value)
                 sortedData
 
-            MatrixCOO
+            Matrix.COO
                 { Rows = rows
                   Columns = cols
                   Values = values

src/GraphBLAS-sharp/Objects/Matrix.fs

@@ -8,32 +8,33 @@ type MatrixFormat =
     | COO
     | CSC
 
+[<RequireQualifiedAccess>]
 type Matrix<'a when 'a: struct> =
-    | MatrixCSR of CSRMatrix<'a>
-    | MatrixCOO of COOMatrix<'a>
-    | MatrixCSC of CSCMatrix<'a>
+    | CSR of CSRMatrix<'a>
+    | COO of COOMatrix<'a>
+    | CSC of CSCMatrix<'a>
 
     member this.RowCount =
         match this with
-        | MatrixCSR matrix -> matrix.RowCount
-        | MatrixCOO matrix -> matrix.RowCount
-        | MatrixCSC matrix -> matrix.RowCount
+        | CSR matrix -> matrix.RowCount
+        | COO matrix -> matrix.RowCount
+        | CSC matrix -> matrix.RowCount
 
     member this.ColumnCount =
         match this with
-        | MatrixCSR matrix -> matrix.ColumnCount
-        | MatrixCOO matrix -> matrix.ColumnCount
-        | MatrixCSC matrix -> matrix.ColumnCount
+        | CSR matrix -> matrix.ColumnCount
+        | COO matrix -> matrix.ColumnCount
+        | CSC matrix -> matrix.ColumnCount
 
     member this.NNZCount =
         match this with
-        | MatrixCOO m -> m.Values.Length
-        | MatrixCSR m -> m.Values.Length
-        | MatrixCSC m -> m.Values.Length
+        | COO m -> m.Values.Length
+        | CSR m -> m.Values.Length
+        | CSC m -> m.Values.Length
 
     member this.ToBackend(context: ClContext) =
         match this with
-        | MatrixCOO m ->
+        | COO m ->
             let rows = context.CreateClArray m.Rows
             let columns = context.CreateClArray m.Columns
             let values = context.CreateClArray m.Values
@@ -47,7 +48,7 @@ type Matrix<'a when 'a: struct> =
                   Values = values }
 
             ClMatrix.COO result
-        | MatrixCSR m ->
+        | CSR m ->
             let rows = context.CreateClArray m.RowPointers
             let columns = context.CreateClArray m.ColumnIndices
             let values = context.CreateClArray m.Values
@@ -61,7 +62,7 @@ type Matrix<'a when 'a: struct> =
                   Values = values }
 
             ClMatrix.CSR result
-        | MatrixCSC m ->
+        | CSC m ->
             let rows = context.CreateClArray m.RowIndices
             let columnPtrs = context.CreateClArray m.ColumnPointers
             let values = context.CreateClArray m.Values
@@ -99,7 +100,7 @@ type Matrix<'a when 'a: struct> =
                   Columns = columns
                   Values = values }
 
-            MatrixCOO result
+            COO result
         | ClMatrix.CSR m ->
             let rows = Array.zeroCreate m.RowPointers.Length
             let columns = Array.zeroCreate m.Columns.Length
@@ -121,7 +122,7 @@ type Matrix<'a when 'a: struct> =
                   ColumnIndices = columns
                   Values = values }
 
-            MatrixCSR result
+            CSR result
         | ClMatrix.CSC m ->
             let rows = Array.zeroCreate m.Rows.Length
             let columns = Array.zeroCreate m.ColumnPointers.Length
@@ -143,7 +144,7 @@ type Matrix<'a when 'a: struct> =
                   ColumnPointers = columns
                   Values = values }
 
-            MatrixCSC result
+            CSC result
 
 and CSRMatrix<'a> =
     { RowCount: int
@@ -221,7 +222,7 @@ and CSRMatrix<'a> =
             rowPointers
 
         match matrix with
-        | MatrixCOO m ->
+        | Matrix.COO m ->
             let rowPointers =
                 context.CreateClArray(
                     rowIndices2rowPointers m.Rows m.RowCount,
@@ -289,7 +290,7 @@ and COOMatrix<'a> =
 
     static member ToBackend (context: ClContext) matrix =
         match matrix with
-        | MatrixCOO m ->
+        | Matrix.COO m ->
             let rows =
                 context.CreateClArray(
                     m.Rows,

tests/GraphBLAS-sharp.Tests/Helpers.fs

@@ -661,9 +661,9 @@ module Utils =
 
     let createMatrixFromArray2D matrixCase array isZero =
         match matrixCase with
-        | CSR -> MatrixCSR <| CSRMatrix.FromArray2D(array, isZero)
-        | COO -> MatrixCOO <| COOMatrix.FromArray2D(array, isZero)
-        | CSC -> MatrixCSC <| CSCMatrix.FromArray2D(array, isZero)
+        | CSR -> Matrix.CSR <| CSRMatrix.FromArray2D(array, isZero)
+        | COO -> Matrix.COO <| COOMatrix.FromArray2D(array, isZero)
+        | CSC -> Matrix.CSC <| CSCMatrix.FromArray2D(array, isZero)
 
     let createVectorFromArray vectorCase array isZero =
         match vectorCase with

tests/GraphBLAS-sharp.Tests/Matrix/Elementwise.fs

@@ -32,7 +32,7 @@ let checkResult isEqual op zero (baseMtx1: 'a [,]) (baseMtx2: 'a [,]) (actual: M
     let actual2D = Array2D.create rows columns zero
 
     match actual with
-    | MatrixCOO actual ->
+    | Matrix.COO actual ->
         for i in 0 .. actual.Rows.Length - 1 do
             if isEqual zero actual.Values.[i] then
                 failwith "Resulting zeroes should be filtered."

tests/GraphBLAS-sharp.Tests/Matrix/Transpose.fs

@@ -16,7 +16,7 @@ let wgSize = 32
 
 let checkResult areEqual zero actual (expected2D: 'a [,]) =
     match actual with
-    | MatrixCOO actual ->
+    | Matrix.COO actual ->
         let expected =
             COOMatrix.FromArray2D(expected2D, areEqual zero)
 
@@ -34,7 +34,7 @@ let checkResult areEqual zero actual (expected2D: 'a [,]) =
 
         "Value arrays should be equal"
         |> compareArrays areEqual actual.Values expected.Values
-    | MatrixCSR actual ->
+    | Matrix.CSR actual ->
         let expected =
             CSRMatrix.FromArray2D(expected2D, areEqual zero)
 
@@ -52,7 +52,7 @@ let checkResult areEqual zero actual (expected2D: 'a [,]) =
 
         "Value arrays should be equal"
         |> compareArrays areEqual actual.Values expected.Values
-    | MatrixCSC actual ->
+    | Matrix.CSC actual ->
         let expected =
             CSCMatrix.FromArray2D(expected2D, areEqual zero)