add: ClArray.upperBoundWithValue

Author: IgorErin

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

@@ -268,9 +268,11 @@ module ClArray =
 
                 result
 
-        let firstOccurrence2 clContext = getUniqueBitmap2General firstOccurrence clContext
+        let firstOccurrence2 clContext =
+            getUniqueBitmap2General firstOccurrence clContext
 
-        let lastOccurrence2 clContext = getUniqueBitmap2General lastOccurrence clContext
+        let lastOccurrence2 clContext =
+            getUniqueBitmap2General lastOccurrence clContext
 
     ///<description>Remove duplicates form the given array.</description>
     ///<param name="clContext">Computational context</param>
@@ -694,33 +696,39 @@ module ClArray =
             else
                 None
 
-    let upperBound<'a when 'a : equality and 'a : comparison> (clContext: ClContext) workGroupSize =
+    let private bound<'a, 'b when 'a: equality and 'a: comparison>
+        (lowerBound: Expr<(int -> 'a -> ClArray<'a> -> 'b)>)
+        (clContext: ClContext)
+        workGroupSize
+        =
 
         let kernel =
-            <@ fun (ndRange: Range1D) length (values: ClArray<'a>) (value: ClCell<'a>) (result: ClCell<int>) ->
+            <@ fun (ndRange: Range1D) length (values: ClArray<'a>) (value: ClCell<'a>) (result: ClCell<'b>) ->
 
                 let value = value.Value
                 let gid = ndRange.GlobalID0
 
                 if gid = 0 then
 
-                    result.Value <-
-                        (%Search.Bin.lowerBound 0) length value values @>
+                    result.Value <- (%lowerBound) length value values @>
 
         let program = clContext.Compile(kernel)
 
         fun (processor: MailboxProcessor<_>) (values: ClArray<'a>) (value: ClCell<'a>) ->
-            let result = clContext.CreateClCell 0
+            let result =
+                clContext.CreateClCell Unchecked.defaultof<'b>
 
             let kernel = program.GetKernel()
 
-            let ndRange =
-                Range1D.CreateValid(1, workGroupSize)
+            let ndRange = Range1D.CreateValid(1, workGroupSize)
 
             processor.Post(Msg.MsgSetArguments(fun () -> kernel.KernelFunc ndRange values.Length values value result))
             processor.Post(Msg.CreateRunMsg<_, _> kernel)
 
             result
 
+    let upperBoundAndValue<'a when 'a: comparison> clContext =
+        bound<'a, int * 'a> Search.Bin.lowerBoundAndValue clContext
 
-
+    let upperBound<'a when 'a: comparison> clContext =
+        bound<'a, int> Search.Bin.lowerBound clContext

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

@@ -22,9 +22,9 @@ module Matrix =
 
                 if gid < columnsLength then
                     let result =
-                        (%Search.Bin.lowerBound 0) pointersLength gid pointers
+                        (%Search.Bin.lowerBound) pointersLength gid pointers
 
-                    results.[gid] <- result - 1  @>
+                    results.[gid] <- result - 1 @>
 
         let program = clContext.Compile kernel
 
@@ -38,14 +38,16 @@ module Matrix =
             let ndRange =
                 Range1D.CreateValid(matrix.Columns.Length, workGroupSize)
 
-            processor.Post(Msg.MsgSetArguments(
-                fun () ->
-                    kernel.KernelFunc
-                        ndRange
-                        matrix.Columns.Length
-                        matrix.RowPointers.Length
-                        matrix.RowPointers
-                        rows))
+            processor.Post(
+                Msg.MsgSetArguments
+                    (fun () ->
+                        kernel.KernelFunc
+                            ndRange
+                            matrix.Columns.Length
+                            matrix.RowPointers.Length
+                            matrix.RowPointers
+                            rows)
+            )
 
             processor.Post(Msg.CreateRunMsg<_, _> kernel)
 
@@ -63,9 +65,9 @@ module Matrix =
 
                 if gid < resultLength then
                     let result =
-                        (%Search.Bin.lowerBound 0) pointersLength shiftedId pointers
+                        (%Search.Bin.lowerBound) pointersLength shiftedId pointers
 
-                    results.[gid] <- result - 1  @>
+                    results.[gid] <- result - 1 @>
 
         let program = clContext.Compile kernel
 
@@ -86,7 +88,9 @@ module Matrix =
             // extract rows
             let rowPointers = matrix.RowPointers.ToHost processor
 
-            let resultLength = rowPointers.[startIndex + count] - rowPointers.[startIndex]
+            let resultLength =
+                rowPointers.[startIndex + count]
+                - rowPointers.[startIndex]
 
             let rows =
                 clContext.CreateClArrayWithSpecificAllocationMode(allocationMode, resultLength)
@@ -96,15 +100,17 @@ module Matrix =
             let ndRange =
                 Range1D.CreateValid(matrix.Columns.Length, workGroupSize)
 
-            processor.Post(Msg.MsgSetArguments(
-                fun () ->
-                    kernel.KernelFunc
-                        ndRange
-                        resultLength
-                        startIndex
-                        matrix.RowPointers.Length
-                        matrix.RowPointers
-                        rows))
+            processor.Post(
+                Msg.MsgSetArguments
+                    (fun () ->
+                        kernel.KernelFunc
+                            ndRange
+                            resultLength
+                            startIndex
+                            matrix.RowPointers.Length
+                            matrix.RowPointers
+                            rows)
+            )
 
             processor.Post(Msg.CreateRunMsg<_, _> kernel)
 
@@ -130,15 +136,15 @@ module Matrix =
               Values = values }
 
     let toCOO (clContext: ClContext) workGroupSize =
-        let prepare = expandRowPointers clContext workGroupSize
+        let prepare =
+            expandRowPointers clContext workGroupSize
 
         let copy = ClArray.copy clContext workGroupSize
 
         let copyData = ClArray.copy clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
-            let rows =
-                prepare processor allocationMode matrix
+            let rows = prepare processor allocationMode matrix
 
             let cols =
                 copy processor allocationMode matrix.Columns
@@ -154,11 +160,11 @@ module Matrix =
               Values = values }
 
     let toCOOInPlace (clContext: ClContext) workGroupSize =
-        let prepare = expandRowPointers clContext workGroupSize
+        let prepare =
+            expandRowPointers clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
-            let rows =
-                prepare processor allocationMode matrix
+            let rows = prepare processor allocationMode matrix
 
             processor.Post(Msg.CreateFreeMsg(matrix.RowPointers))