ClArray.count uses map

Author: kirillgarbar

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

@@ -820,43 +820,21 @@ module ClArray =
             processor.Post(Msg.MsgSetArguments(fun () -> kernel.KernelFunc ndRange index array value))
             processor.Post(Msg.CreateRunMsg<_, _> kernel)
 
-    let count (predicate: Expr<'a -> bool>) (clContext: ClContext) workGroupSize =
+    let count<'a> (predicate: Expr<'a -> bool>) (clContext: ClContext) workGroupSize =
 
         let sum =
             PrefixSum.standardExcludeInPlace clContext workGroupSize
 
         let getBitmap =
-            <@ fun (ndRange: Range1D) length (vector: ClArray<'a>) (bitmap: ClArray<int>) ->
-
-                let gid = ndRange.GlobalID0
-
-                if gid < length then
-                    let isTrue = (%predicate) vector.[gid]
-
-                    if isTrue then
-                        bitmap.[gid] <- 1
-                    else
-                        bitmap.[gid] <- 0 @>
-
-        let kernel = clContext.Compile getBitmap
+            map<'a, int> (Map.predicateBitmap predicate) clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) (array: ClArray<'a>) ->
 
-            let bitmap =
-                clContext.CreateClArrayWithSpecificAllocationMode(DeviceOnly, array.Length)
-
-            let ndRange =
-                Range1D.CreateValid(array.Length, workGroupSize)
-
-            let kernel = kernel.GetKernel()
-
-            processor.Post(Msg.MsgSetArguments(fun () -> kernel.KernelFunc ndRange array.Length array bitmap))
-
-            processor.Post(Msg.CreateRunMsg<_, _>(kernel))
+            let bitmap = getBitmap processor DeviceOnly array
 
             let result =
                 (sum processor bitmap).ToHostAndFree processor
 
-            processor.Post(Msg.CreateFreeMsg bitmap)
+            bitmap.Free processor
 
             result

src/GraphBLAS-sharp.Backend/Quotes/Map.fs

@@ -28,6 +28,11 @@ module Map =
             | Some _ -> 1
             | None -> 0 @>
 
+    let predicateBitmap<'a> (predicate: Expr<'a -> bool>) =
+        <@ fun (x: 'a) ->
+            let res = (%predicate) x
+            if res then 1 else 0 @>
+
     let inc = <@ fun item -> item + 1 @>
 
     let subtraction = <@ fun first second -> first - second @>