Merge pull request #70 from IgorErin/radix

Radix

Author: gsvgit

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

@@ -129,82 +129,6 @@ module ClArray =
 
             outputArray
 
-    /// <summary>
-    /// Exclude inplace prefix sum.
-    /// </summary>
-    /// <example>
-    /// <code>
-    /// let arr = [| 1; 1; 1; 1 |]
-    /// let sum = [| 0 |]
-    /// runExcludeInplace clContext workGroupSize processor arr sum <@ (+) @> 0
-    /// |> ignore
-    /// ...
-    /// > val arr = [| 0; 1; 2; 3 |]
-    /// > val sum = [| 4 |]
-    /// </code>
-    /// </example>
-    ///<param name="workGroupSize">Should be a power of 2 and greater than 1.</param>
-    ///<param name="plus">Associative binary operation.</param>
-    ///<param name="zero">Zero element for binary operation.</param>
-    let prefixSumExcludeInplace = PrefixSum.runExcludeInplace
-
-    /// <summary>
-    /// Include inplace prefix sum.
-    /// </summary>
-    /// <example>
-    /// <code>
-    /// let arr = [| 1; 1; 1; 1 |]
-    /// let sum = [| 0 |]
-    /// runExcludeInplace clContext workGroupSize processor arr sum <@ (+) @> 0
-    /// |> ignore
-    /// ...
-    /// > val arr = [| 1; 2; 3; 4 |]
-    /// > val sum = [| 4 |]
-    /// </code>
-    /// </example>
-    ///<param name="workGroupSize">Should be a power of 2 and greater than 1.</param>
-    ///<param name="plus">Associative binary operation.</param>
-    ///<param name="zero">Zero element for binary operation.</param>
-    let prefixSumIncludeInplace = PrefixSum.runIncludeInplace
-
-    let prefixSumExclude plus (clContext: ClContext) workGroupSize =
-
-        let runExcludeInplace =
-            prefixSumExcludeInplace plus clContext workGroupSize
-
-        let copy = copy clContext workGroupSize
-
-        fun (processor: MailboxProcessor<_>) allocationMode (inputArray: ClArray<'a>) (zero: 'a) ->
-
-            let outputArray = copy processor allocationMode inputArray
-
-            let totalSum =
-                runExcludeInplace processor outputArray zero
-
-            outputArray, totalSum
-
-    let prefixSumInclude plus (clContext: ClContext) workGroupSize =
-
-        let runIncludeInplace =
-            prefixSumIncludeInplace plus clContext workGroupSize
-
-        let copy = copy clContext workGroupSize
-
-        fun (processor: MailboxProcessor<_>) allocationMode (inputArray: ClArray<'a>) (zero: 'a) ->
-
-            let outputArray = copy processor allocationMode inputArray
-
-            let totalSum =
-                runIncludeInplace processor outputArray zero
-
-            outputArray, totalSum
-
-    let prefixSumBackwardsExcludeInplace plus =
-        PrefixSum.runBackwardsExcludeInplace plus
-
-    let prefixSumBackwardsIncludeInplace plus =
-        PrefixSum.runBackwardsIncludeInplace plus
-
     let getUniqueBitmap (clContext: ClContext) workGroupSize =
 
         let getUniqueBitmap =
@@ -250,7 +174,7 @@ module ClArray =
         let getUniqueBitmap = getUniqueBitmap clContext workGroupSize
 
         let prefixSumExclude =
-            prefixSumExcludeInplace <@ (+) @> clContext workGroupSize
+            PrefixSum.runExcludeInplace <@ (+) @> clContext workGroupSize
 
         fun (processor: MailboxProcessor<_>) (inputArray: ClArray<'a>) ->
 
@@ -380,7 +304,7 @@ module ClArray =
             <| Map.optionToValueOrZero Unchecked.defaultof<'b>
 
         let prefixSum =
-            prefixSumExcludeInplace <@ (+) @> clContext workGroupSize
+            PrefixSum.runExcludeInplace <@ (+) @> clContext workGroupSize
 
         let scatter =
             Scatter.runInplace clContext workGroupSize

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

@@ -218,3 +218,55 @@ module PrefixSum =
     let runBackwardsExcludeInplace plus = runInplace true scanExclusive plus
 
     let runBackwardsIncludeInplace plus = runInplace true scanInclusive plus
+
+    /// <summary>
+    /// Exclude inplace prefix sum.
+    /// </summary>
+    /// <example>
+    /// <code>
+    /// let arr = [| 1; 1; 1; 1 |]
+    /// let sum = [| 0 |]
+    /// runExcludeInplace clContext workGroupSize processor arr sum <@ (+) @> 0
+    /// |> ignore
+    /// ...
+    /// > val arr = [| 0; 1; 2; 3 |]
+    /// > val sum = [| 4 |]
+    /// </code>
+    /// </example>
+    ///<param name="workGroupSize">Should be a power of 2 and greater than 1.</param>
+    ///<param name="plus">Associative binary operation.</param>
+    ///<param name="zero">Zero element for binary operation.</param>
+    let standardExcludeInplace (clContext: ClContext) workGroupSize =
+
+        let scan =
+            runExcludeInplace <@ (+) @> clContext workGroupSize
+
+        fun (processor: MailboxProcessor<_>) (inputArray: ClArray<int>) ->
+
+            scan processor inputArray 0
+
+    /// <summary>
+    /// Include inplace prefix sum.
+    /// </summary>
+    /// <example>
+    /// <code>
+    /// let arr = [| 1; 1; 1; 1 |]
+    /// let sum = [| 0 |]
+    /// runExcludeInplace clContext workGroupSize processor arr sum <@ (+) @> 0
+    /// |> ignore
+    /// ...
+    /// > val arr = [| 1; 2; 3; 4 |]
+    /// > val sum = [| 4 |]
+    /// </code>
+    /// </example>
+    ///<param name="workGroupSize">Should be a power of 2 and greater than 1.</param>
+    ///<param name="plus">Associative binary operation.</param>
+    ///<param name="zero">Zero element for binary operation.</param>
+    let standardIncludeInplace (clContext: ClContext) workGroupSize =
+
+        let scan =
+            runIncludeInplace <@ (+) @> clContext workGroupSize
+
+        fun (processor: MailboxProcessor<_>) (inputArray: ClArray<int>) ->
+
+            scan processor inputArray 0

src/GraphBLAS-sharp.Backend/Common/BitonicSort.fs renamed to src/GraphBLAS-sharp.Backend/Common/Sort/Bitonic.fs

@@ -1,8 +1,9 @@
-namespace GraphBLAS.FSharp.Backend.Common
+namespace GraphBLAS.FSharp.Backend.Common.Sort
 
 open Brahma.FSharp
+open GraphBLAS.FSharp.Backend.Common
 
-module internal BitonicSort =
+module internal Bitonic =
     let private localBegin (clContext: ClContext) workGroupSize =
 
         let processedSize = workGroupSize * 2