add: ClArray.map2Inplace, *.map2, refacor: DenseVector.map2

Author: IgorErin

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

@@ -328,7 +328,7 @@ module ClArray =
 
             result
 
-    let map2<'a, 'b, 'c> (clContext: ClContext) workGroupSize (map: Expr<'a -> 'b -> 'c>) =
+    let map2Inplace<'a, 'b, 'c> (clContext: ClContext) workGroupSize (map: Expr<'a -> 'b -> 'c>) =
 
         let kernel =
             <@ fun (ndRange: Range1D) length (leftArray: ClArray<'a>) (rightArray: ClArray<'b>) (resultArray: ClArray<'c>) ->
@@ -341,10 +341,7 @@ module ClArray =
 
         let kernel = clContext.Compile kernel
 
-        fun (processor: MailboxProcessor<_>) flag (leftArray: ClArray<'a>) (rightArray: ClArray<'b>) ->
-
-            let resultArray =
-                clContext.CreateClArrayWithSpecificAllocationMode(flag, leftArray.Length)
+        fun (processor: MailboxProcessor<_>) (leftArray: ClArray<'a>) (rightArray: ClArray<'b>) (resultArray: ClArray<'c>) ->
 
             let ndRange = Range1D.CreateValid(resultArray.Length, workGroupSize)
 
@@ -354,4 +351,12 @@ module ClArray =
 
             processor.Post(Msg.CreateRunMsg<_, _>(kernel))
 
-            resultArray
+    let map2<'a, 'b, 'c> (clContext: ClContext) workGroupSize map =
+        let map2 = map2Inplace<'a, 'b, 'c> clContext workGroupSize map
+
+        fun (processor: MailboxProcessor<_>) allocationMode (leftArray: ClArray<'a>) (rightArray: ClArray<'b>) ->
+
+            let resultArray =
+                clContext.CreateClArrayWithSpecificAllocationMode(allocationMode, leftArray.Length)
+
+            map2 processor leftArray rightArray resultArray

src/GraphBLAS-sharp.Backend/Vector/DenseVector/DenseVector.fs

@@ -15,46 +15,26 @@ module DenseVector =
         workGroupSize
         =
 
-        let map2 =
-            <@ fun (ndRange: Range1D) resultLength (leftVector: ClArray<'a option>) (rightVector: ClArray<'b option>) (resultVector: ClArray<'c option>) ->
-
-                let gid = ndRange.GlobalID0
-
-                if gid < resultLength then
-                    resultVector.[gid] <- (%opAdd) leftVector.[gid] rightVector.[gid] @>
-
-        let kernel = clContext.Compile(map2)
+        let map2InPlace = ClArray.map2Inplace clContext workGroupSize opAdd
 
         fun (processor: MailboxProcessor<_>) (leftVector: ClArray<'a option>) (rightVector: ClArray<'b option>) (resultVector: ClArray<'c option>) ->
 
-            let ndRange =
-                Range1D.CreateValid(leftVector.Length, workGroupSize)
+            map2InPlace processor leftVector rightVector resultVector
 
-            let kernel = kernel.GetKernel()
-
-            processor.Post(
-                Msg.MsgSetArguments
-                    (fun () -> kernel.KernelFunc ndRange leftVector.Length leftVector rightVector resultVector)
-            )
-
-            processor.Post(Msg.CreateRunMsg<_, _>(kernel))
 
     let map2<'a, 'b, 'c when 'a: struct and 'b: struct and 'c: struct>
         (clContext: ClContext)
         (opAdd: Expr<'a option -> 'b option -> 'c option>)
         workGroupSize
         =
 
-        let elementWiseTo =
-            map2Inplace clContext opAdd workGroupSize
+        let map2 =
+            ClArray.map2 clContext workGroupSize opAdd
 
         fun (processor: MailboxProcessor<_>) allocationMode (leftVector: ClArray<'a option>) (rightVector: ClArray<'b option>) ->
-            let resultVector =
-                clContext.CreateClArrayWithSpecificAllocationMode(allocationMode, leftVector.Length)
 
-            elementWiseTo processor leftVector rightVector resultVector
+            map2 processor allocationMode leftVector rightVector
 
-            resultVector
 
     let map2AtLeastOne clContext op workGroupSize =
         map2 clContext (Convert.atLeastOneToOption op) workGroupSize