Ewiseadd fix

Author: artemgl

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

@@ -81,8 +81,7 @@ module CSRMatrix =
 
     let eWiseAdd (clContext: ClContext) (opAdd: Expr<'a option -> 'b option -> 'c option>) workGroupSize =
 
-        let toCOOInplaceLeft = toCOOInplace clContext workGroupSize
-        let toCOOInplaceRight = toCOOInplace clContext workGroupSize
+        let prepareRows = prepareRows clContext workGroupSize
 
         let eWiseCOO =
             COOMatrix.eWiseAdd clContext opAdd workGroupSize
@@ -91,24 +90,32 @@ module CSRMatrix =
             COOMatrix.toCSRInplace clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) (m1: CSRMatrix<'a>) (m2: CSRMatrix<'b>) ->
-
-            let m1COO = toCOOInplaceLeft processor m1
-            let m2COO = toCOOInplaceRight processor m2
+            let m1COO =
+                { Context = clContext
+                  RowCount = m1.RowCount
+                  ColumnCount = m1.ColumnCount
+                  Rows = prepareRows processor m1.RowPointers m1.Values.Length m1.RowCount
+                  Columns = m1.Columns
+                  Values = m1.Values }
+
+            let m2COO =
+                { Context = clContext
+                  RowCount = m2.RowCount
+                  ColumnCount = m2.ColumnCount
+                  Rows = prepareRows processor m2.RowPointers m2.Values.Length m2.RowCount
+                  Columns = m2.Columns
+                  Values = m2.Values }
 
             let m3COO = eWiseCOO processor m1COO m2COO
 
             processor.Post(Msg.CreateFreeMsg(m1COO.Rows))
             processor.Post(Msg.CreateFreeMsg(m2COO.Rows))
 
-            let m3 = toCSRInplace processor m3COO
-            processor.Post(Msg.CreateFreeMsg(m3COO.Rows))
-
-            m3
+            toCSRInplace processor m3COO
 
     let eWiseAddAtLeastOne (clContext: ClContext) (opAdd: Expr<AtLeastOne<'a, 'b> -> 'c option>) workGroupSize =
 
-        let toCOOInplaceLeft = toCOOInplace clContext workGroupSize
-        let toCOOInplaceRight = toCOOInplace clContext workGroupSize
+        let prepareRows = prepareRows clContext workGroupSize
 
         let eWiseCOO =
             COOMatrix.eWiseAddAtLeastOne clContext opAdd workGroupSize
@@ -117,19 +124,28 @@ module CSRMatrix =
             COOMatrix.toCSRInplace clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) (m1: CSRMatrix<'a>) (m2: CSRMatrix<'b>) ->
-
-            let m1COO = toCOOInplaceLeft processor m1
-            let m2COO = toCOOInplaceRight processor m2
+            let m1COO =
+                { Context = clContext
+                  RowCount = m1.RowCount
+                  ColumnCount = m1.ColumnCount
+                  Rows = prepareRows processor m1.RowPointers m1.Values.Length m1.RowCount
+                  Columns = m1.Columns
+                  Values = m1.Values }
+
+            let m2COO =
+                { Context = clContext
+                  RowCount = m2.RowCount
+                  ColumnCount = m2.ColumnCount
+                  Rows = prepareRows processor m2.RowPointers m2.Values.Length m2.RowCount
+                  Columns = m2.Columns
+                  Values = m2.Values }
 
             let m3COO = eWiseCOO processor m1COO m2COO
 
             processor.Post(Msg.CreateFreeMsg(m1COO.Rows))
             processor.Post(Msg.CreateFreeMsg(m2COO.Rows))
 
-            let m3 = toCSRInplace processor m3COO
-            processor.Post(Msg.CreateFreeMsg(m3COO.Rows))
-
-            m3
+            toCSRInplace processor m3COO
 
     let transposeInplace (clContext: ClContext) workGroupSize =
 

tests/GraphBLAS-sharp.Tests/BackendCommonTests/MatrixEwiseAddTests.fs

@@ -86,7 +86,7 @@ let correctnessGenericTest
 
 let testFixturesEWiseAdd case =
     [ let config = defaultConfig
-      let wgSize = 256
+      let wgSize = 32
 
       let getCorrectnessTestName datatype =
           sprintf "Correctness on %s, %A" datatype case
@@ -140,12 +140,13 @@ let tests =
                     .CastTo<DeviceType>()
 
             deviceType = DeviceType.Gpu)
+    |> List.distinctBy (fun case -> case.ClContext.ClContext.ClDevice.DeviceType, case.MatrixCase)
     |> List.collect testFixturesEWiseAdd
     |> testList "Backend.Matrix.eWiseAdd tests"
 
 let testFixturesEWiseAddAtLeastOne case =
     [ let config = defaultConfig
-      let wgSize = 256
+      let wgSize = 32
 
       let getCorrectnessTestName datatype =
           sprintf "Correctness on %s, %A" datatype case
@@ -203,13 +204,14 @@ let tests2 =
                     .CastTo<DeviceType>()
 
             deviceType = DeviceType.Gpu)
+    |> List.distinctBy (fun case -> case.ClContext.ClContext.ClDevice.DeviceType, case.MatrixCase)
     |> List.collect testFixturesEWiseAddAtLeastOne
     |> testList "Backend.Matrix.eWiseAddAtLeastOne tests"
 
 
 let testFixturesEWiseMulAtLeastOne case =
     [ let config = defaultConfig
-      let wgSize = 256
+      let wgSize = 32
 
       let getCorrectnessTestName datatype =
           sprintf "Correctness on %s, %A" datatype case
@@ -267,5 +269,6 @@ let tests3 =
                     .CastTo<DeviceType>()
 
             deviceType = DeviceType.Gpu)
+    |> List.distinctBy (fun case -> case.ClContext.ClContext.ClDevice.DeviceType, case.MatrixCase)
     |> List.collect testFixturesEWiseMulAtLeastOne
     |> testList "Backend.Matrix.eWiseMulAtLeastOne tests"

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -17,7 +17,9 @@ let allTests =
           Backend.RemoveDuplicates.tests
           Backend.Copy.tests
           Backend.Replicate.tests
-          //   Backend.EwiseAdd.tests
+          Backend.EwiseAdd.tests
+          Backend.EwiseAdd.tests2
+          //Backend.EwiseAdd.tests3
           Backend.Transpose.tests
           //Matrix.GetTuples.tests
           //Matrix.Mxv.tests