refactor: matrix as mask in Matrix.SpGeMM

Author: IgorErin

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

@@ -253,6 +253,6 @@ module CSRMatrix =
         let run =
             SpGEMM.run clContext workGroupSize opAdd opMul
 
-        fun (queue: MailboxProcessor<_>) (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSC<'b>) (mask: ClMask2D) ->
+        fun (queue: MailboxProcessor<_>) (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSC<'b>) (mask: ClMatrix.COO<_>) ->
 
             run queue matrixLeft matrixRight mask

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

@@ -107,7 +107,7 @@ module internal SpGEMM =
 
         let program = context.Compile(run)
 
-        fun (queue: MailboxProcessor<_>) (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSC<'b>) (mask: ClMask2D) ->
+        fun (queue: MailboxProcessor<_>) (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSC<'b>) (mask: ClMatrix.COO<_>) ->
 
             let values =
                 context.CreateClArrayWithSpecificAllocationMode<'c>(DeviceOnly, mask.NNZ)
@@ -157,7 +157,7 @@ module internal SpGEMM =
         let scanInplace =
             PrefixSum.standardExcludeInplace context workGroupSize
 
-        fun (queue: MailboxProcessor<_>) (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSC<'b>) (mask: ClMask2D) ->
+        fun (queue: MailboxProcessor<_>) (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSC<'b>) (mask: ClMatrix.COO<_>) ->
 
             let values, bitmap =
                 calculate queue matrixLeft matrixRight mask

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

@@ -504,7 +504,7 @@ module Matrix =
         let runCSRnCSC =
             CSRMatrix.spgemmCSC clContext workGroupSize opAdd opMul
 
-        fun (queue: MailboxProcessor<_>) (matrix1: ClMatrix<'a>) (matrix2: ClMatrix<'b>) (mask: ClMask2D) ->
-            match matrix1, matrix2, mask.IsComplemented with
-            | ClMatrix.CSR m1, ClMatrix.CSC m2, false -> runCSRnCSC queue m1 m2 mask |> ClMatrix.COO
+        fun (queue: MailboxProcessor<_>) (matrix1: ClMatrix<'a>) (matrix2: ClMatrix<'b>) (mask: ClMatrix<_>) ->
+            match matrix1, matrix2, mask with
+            | ClMatrix.CSR m1, ClMatrix.CSC m2, ClMatrix.COO mask -> runCSRnCSC queue m1 m2 mask |> ClMatrix.COO
             | _ -> failwith "Matrix formats are not matching"

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

@@ -23,6 +23,8 @@ module ClMatrix =
                 q.Post(Msg.CreateFreeMsg<_>(this.RowPointers))
                 q.PostAndReply(Msg.MsgNotifyMe)
 
+        member this.NNZ = this.Values.Length
+
     type COO<'elem when 'elem: struct> =
         { Context: ClContext
           RowCount: int
@@ -38,6 +40,8 @@ module ClMatrix =
                 q.Post(Msg.CreateFreeMsg<_>(this.Rows))
                 q.PostAndReply(Msg.MsgNotifyMe)
 
+        member this.NNZ = this.Values.Length
+
     type CSC<'elem when 'elem: struct> =
         { Context: ClContext
           RowCount: int
@@ -53,6 +57,8 @@ module ClMatrix =
                 q.Post(Msg.CreateFreeMsg<_>(this.ColumnPointers))
                 q.PostAndReply(Msg.MsgNotifyMe)
 
+        member this.NNZ = this.Values.Length
+
     type Tuple<'elem when 'elem: struct> =
         { Context: ClContext
           RowIndices: ClArray<int>
@@ -66,6 +72,8 @@ module ClMatrix =
                 q.Post(Msg.CreateFreeMsg<_>(this.Values))
                 q.PostAndReply(Msg.MsgNotifyMe)
 
+        member this.NNZ = this.Values.Length
+
 [<RequireQualifiedAccess>]
 type ClMatrix<'a when 'a: struct> =
     | CSR of ClMatrix.CSR<'a>
@@ -89,3 +97,9 @@ type ClMatrix<'a when 'a: struct> =
         | ClMatrix.CSR matrix -> (matrix :> IDeviceMemObject).Dispose q
         | ClMatrix.COO matrix -> (matrix :> IDeviceMemObject).Dispose q
         | ClMatrix.CSC matrix -> (matrix :> IDeviceMemObject).Dispose q
+
+    member this.NNZ =
+        match this with
+        | ClMatrix.CSR matrix -> matrix.NNZ
+        | ClMatrix.COO matrix -> matrix.NNZ
+        | ClMatrix.CSC matrix -> matrix.NNZ

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

@@ -24,6 +24,9 @@ let makeTest context q zero isEqual plus mul mxmFun (leftMatrix: 'a [,], rightMa
     let m2 =
         createMatrixFromArray2D CSC rightMatrix (isEqual zero)
 
+    let matrixMask =
+        createMatrixFromArray2D COO mask ((=) false)
+
     if m1.NNZ > 0 && m2.NNZ > 0 then
         let expected =
             Array2D.init
@@ -43,16 +46,14 @@ let makeTest context q zero isEqual plus mul mxmFun (leftMatrix: 'a [,], rightMa
         if expected.NNZ > 0 then
             let m1 = m1.ToDevice context
             let m2 = m2.ToDevice context
+            let matrixMask = matrixMask.ToDevice context
 
-            let mask =
-                Mask2D.FromArray2D(mask, not).ToBackend context
-
-            let (result: ClMatrix<'a>) = mxmFun q m1 m2 mask
+            let (result: ClMatrix<'a>) = mxmFun q m1 m2 matrixMask
             let actual = result.ToHost q
 
             m1.Dispose q
             m2.Dispose q
-            mask.Dispose q
+            matrixMask.Dispose q
             result.Dispose q
 
             // Check result