Multiply operations

Author: kirillgarbar

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksEWiseAdd.fs

@@ -364,7 +364,7 @@ type EWiseAddAtLeastOneBenchmarks4BoolCSRWithoutDataTransfer() =
 type EWiseAddAtLeastOneBenchmarks4Float32COOWithoutDataTransfer() =
 
     inherit EWiseAddBenchmarksWithoutDataTransfer<Backend.COOMatrix<float32>,float32>(
-        (fun context wgSize -> Backend.COOMatrix.eWiseAdd2 context Backend.Common.StandardOperations.float32Sum2 wgSize),
+        (fun context wgSize -> Backend.COOMatrix.eWiseAddAtLeastOne context Backend.Common.StandardOperations.float32SumAtLeastOne wgSize),
         float32,
         (fun _ -> Utils.nextSingle (System.Random())),
         M.buildCooMatrix
@@ -376,7 +376,7 @@ type EWiseAddAtLeastOneBenchmarks4Float32COOWithoutDataTransfer() =
 type EWiseAddAtLeastOneBenchmarks4Float32CSRWithoutDataTransfer() =
 
     inherit EWiseAddBenchmarksWithoutDataTransfer<Backend.CSRMatrix<float32>,float32>(
-        (fun context wgSize -> Backend.CSRMatrix.eWiseAdd2 context Backend.Common.StandardOperations.float32Sum2 wgSize),
+        (fun context wgSize -> Backend.CSRMatrix.eWiseAddAtLeastOne context Backend.Common.StandardOperations.float32SumAtLeastOne wgSize),
         float32,
         (fun _ -> Utils.nextSingle (System.Random())),
         M.buildCsrMatrix

src/GraphBLAS-sharp.Backend/Common/StandardOperations.fs

@@ -59,10 +59,10 @@ module StandardOperations =
 
             if res = 0f then None else (Some res) @>
 
-    let boolSum2 =
+    let boolSumAtLeastOne =
         <@ fun (_: AtLeastOne<bool, bool>) -> Some true @>
 
-    let intSum2 =
+    let intSumAtLeastOne =
         <@ fun (values: AtLeastOne<int, int>) ->
             let mutable res = 0
 
@@ -73,7 +73,7 @@ module StandardOperations =
 
             if res = 0 then None else (Some res) @>
 
-    let byteSum2 =
+    let byteSumAtLeastOne =
         <@ fun (values: AtLeastOne<byte, byte>) ->
             let mutable res = 0uy
 
@@ -84,7 +84,7 @@ module StandardOperations =
 
             if res = 0uy then None else (Some res) @>
 
-    let floatSum2 =
+    let floatSumAtLeastOne =
         <@ fun (values: AtLeastOne<float, float>) ->
             let mutable res = 0.0
 
@@ -95,7 +95,7 @@ module StandardOperations =
 
             if res = 0.0 then None else (Some res) @>
 
-    let float32Sum2 =
+    let float32SumAtLeastOne =
         <@ fun (values: AtLeastOne<float32, float32>) ->
             let mutable res = 0f
 
@@ -105,3 +105,23 @@ module StandardOperations =
             | Right s -> res <- s
 
             if res = 0f then None else (Some res) @>
+
+    let float32Mul =
+        <@ fun (values: AtLeastOne<float32, float32>) ->
+            let mutable res = 0f
+
+            match values with
+            | Both (f, s) -> res <- f * s
+            | _ -> res <- 0f
+
+            if res = 0f then None else (Some res) @>
+
+    let boolMul =
+        <@ fun (values: AtLeastOne<bool, bool>) ->
+            let mutable res = false
+
+            match values with
+            | Both _ -> res <- true
+            | _ -> res <- false
+
+            if res then None else (Some true) @>

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

@@ -662,7 +662,7 @@ module COOMatrix =
               Columns = matrix.Columns
               Values = matrix.Values }
 
-    let private preparePositions2<'a, 'b, 'c when 'a: struct and 'b: struct and 'c: struct and 'c: equality>
+    let private preparePositionsAtLeastOne<'a, 'b, 'c when 'a: struct and 'b: struct and 'c: struct and 'c: equality>
         (clContext: ClContext)
         (opAdd: Expr<AtLeastOne<'a, 'b> -> 'c option>)
         workGroupSize
@@ -747,7 +747,7 @@ module COOMatrix =
     ///<param name="clContext">.</param>
     ///<param name="opAdd">.</param>
     ///<param name="workGroupSize">Should be a power of 2 and greater than 1.</param>
-    let eWiseAdd2<'a, 'b, 'c when 'a: struct and 'b: struct and 'c: struct and 'c: equality>
+    let eWiseAddAtLeastOne<'a, 'b, 'c when 'a: struct and 'b: struct and 'c: struct and 'c: equality>
         (clContext: ClContext)
         (opAdd: Expr<AtLeastOne<'a, 'b> -> 'c option>)
         workGroupSize
@@ -756,7 +756,7 @@ module COOMatrix =
         let merge = merge clContext workGroupSize
 
         let preparePositions =
-            preparePositions2 clContext opAdd workGroupSize
+            preparePositionsAtLeastOne clContext opAdd workGroupSize
 
         let setPositions = setPositions<'c> clContext workGroupSize
 

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

@@ -119,13 +119,13 @@ module CSRMatrix =
 
             m3
 
-    let eWiseAdd2 (clContext: ClContext) (opAdd: Expr<AtLeastOne<'a, 'b> -> 'c option>) workGroupSize =
+    let eWiseAddAtLeastOne (clContext: ClContext) (opAdd: Expr<AtLeastOne<'a, 'b> -> 'c option>) workGroupSize =
 
         let toCOOInplaceLeft = toCOOInplace clContext workGroupSize
         let toCOOInplaceRight = toCOOInplace clContext workGroupSize
 
         let eWiseCOO =
-            COOMatrix.eWiseAdd2 clContext opAdd workGroupSize
+            COOMatrix.eWiseAddAtLeastOne clContext opAdd workGroupSize
 
         let toCSRInplace =
             COOMatrix.toCSRInplace clContext workGroupSize

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

@@ -67,9 +67,9 @@ module Matrix =
             | MatrixCSR m1, MatrixCSR m2 -> CSReWiseAdd processor m1 m2 |> MatrixCSR
             | _ -> failwith "Matrix formats are not matching"
 
-    let eWiseAdd2 (clContext: ClContext) (opAdd: Expr<AtLeastOne<'a, 'b> -> 'c option>) workGroupSize =
+    let eWiseAddAtLeastOne (clContext: ClContext) (opAdd: Expr<AtLeastOne<'a, 'b> -> 'c option>) workGroupSize =
         let COOeWiseAdd =
-            COOMatrix.eWiseAdd2 clContext opAdd workGroupSize
+            COOMatrix.eWiseAddAtLeastOne clContext opAdd workGroupSize
 
         let CSReWiseAdd =
             CSRMatrix.eWiseAdd2 clContext opAdd workGroupSize