refactor: flags in ClArray

Author: IgorErin

src/GraphBLAS-sharp.Backend/Algorithms/BFS.fs

@@ -23,7 +23,7 @@ module BFS =
             SpMV.runTo clContext add mul workGroupSize
 
         let zeroCreate =
-            ClArray.zeroCreate clContext workGroupSize
+            ClArray.zeroCreate clContext workGroupSize CPUInterop
 
         let ofList = Vector.ofList clContext workGroupSize
 

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

@@ -5,7 +5,7 @@ open Microsoft.FSharp.Quotations
 open GraphBLAS.FSharp.Backend.Objects.ClContext
 
 module ClArray =
-    let init (initializer: Expr<int -> 'a>) (clContext: ClContext) workGroupSize =
+    let init (clContext: ClContext) workGroupSize flag (initializer: Expr<int -> 'a>) =
 
         let init =
             <@ fun (range: Range1D) (outputBuffer: ClArray<'a>) (length: int) ->
@@ -18,9 +18,8 @@ module ClArray =
         let program = clContext.Compile(init)
 
         fun (processor: MailboxProcessor<_>) (length: int) ->
-            // TODO: Выставить нужные флаги
             let outputArray =
-                clContext.CreateClArrayWithFlag(GPUOnly, length)
+                clContext.CreateClArrayWithFlag(flag, length)
 
             let kernel = program.GetKernel()
 
@@ -32,7 +31,7 @@ module ClArray =
 
             outputArray
 
-    let create (clContext: ClContext) workGroupSize =
+    let create (clContext: ClContext) workGroupSize flag =
 
         let create =
             <@ fun (range: Range1D) (outputBuffer: ClArray<'a>) (length: int) (value: ClCell<'a>) ->
@@ -48,7 +47,7 @@ module ClArray =
             let value = clContext.CreateClCell(value)
 
             let outputArray =
-                clContext.CreateClArrayWithFlag(GPUOnly, length)
+                clContext.CreateClArrayWithFlag(flag, length)
 
             let kernel = program.GetKernel()
 
@@ -61,15 +60,15 @@ module ClArray =
 
             outputArray
 
-    let zeroCreate (clContext: ClContext) workGroupSize =
+    let zeroCreate (clContext: ClContext) workGroupSize flag =
 
-        let create = create clContext workGroupSize
+        let create = create clContext workGroupSize flag
 
-        fun (processor: MailboxProcessor<_>) (length: int) -> create processor length Unchecked.defaultof<'a>
+        fun (processor: MailboxProcessor<_>) length ->
+            create processor length Unchecked.defaultof<'a>
 
-    let copy (clContext: ClContext) workGroupSize =
+    let copy (clContext: ClContext) workGroupSize flag =
         let copy =
-
             <@ fun (ndRange: Range1D) (inputArrayBuffer: ClArray<'a>) (outputArrayBuffer: ClArray<'a>) inputArrayLength ->
 
                 let i = ndRange.GlobalID0
@@ -84,7 +83,7 @@ module ClArray =
                 Range1D.CreateValid(inputArray.Length, workGroupSize)
 
             let outputArray =
-                clContext.CreateClArrayWithFlag(GPUOnly, inputArray.Length)
+                clContext.CreateClArrayWithFlag(flag, inputArray.Length)
 
             let kernel = program.GetKernel()
 
@@ -96,7 +95,7 @@ module ClArray =
 
             outputArray
 
-    let replicate (clContext: ClContext) =
+    let replicate (clContext: ClContext) flag =
 
         let replicate =
             <@ fun (ndRange: Range1D) (inputArrayBuffer: ClArray<'a>) (outputArrayBuffer: ClArray<'a>) inputArrayLength outputArrayLength ->
@@ -112,7 +111,7 @@ module ClArray =
             let outputArrayLength = inputArray.Length * count
 
             let outputArray =
-                clContext.CreateClArrayWithFlag(GPUOnly, outputArrayLength)
+                clContext.CreateClArrayWithFlag(flag, outputArrayLength)
 
             let ndRange =
                 Range1D.CreateValid(outputArray.Length, workGroupSize)
@@ -174,25 +173,25 @@ module ClArray =
     ///<param name="zero">Zero element for binary operation.</param>
     let prefixSumIncludeInplace = PrefixSum.runIncludeInplace
 
-    let prefixSumExclude plus (clContext: ClContext) workGroupSize =
+    let prefixSumExclude plus (clContext: ClContext) workGroupSize flag =
 
         let runExcludeInplace =
             prefixSumExcludeInplace plus clContext workGroupSize
 
-        let copy = copy clContext workGroupSize
+        let copy = copy clContext workGroupSize flag
 
         fun (processor: MailboxProcessor<_>) (inputArray: ClArray<'a>) (totalSum: ClCell<'a>) (zero: 'a) ->
 
             let outputArray = copy processor inputArray
 
             runExcludeInplace processor outputArray totalSum zero
 
-    let prefixSumInclude plus (clContext: ClContext) workGroupSize =
+    let prefixSumInclude plus (clContext: ClContext) workGroupSize flag =
 
         let runIncludeInplace =
             prefixSumIncludeInplace plus clContext workGroupSize
 
-        let copy = copy clContext workGroupSize
+        let copy = copy clContext workGroupSize flag
 
         fun (processor: MailboxProcessor<_>) (inputArray: ClArray<'a>) (totalSum: ClCell<'a>) (zero: 'a) ->
 
@@ -206,7 +205,7 @@ module ClArray =
     let prefixSumBackwardsIncludeInplace plus =
         PrefixSum.runBackwardsIncludeInplace plus
 
-    let getUniqueBitmap (clContext: ClContext) =
+    let getUniqueBitmap (clContext: ClContext) flag =
 
         let getUniqueBitmap =
             <@ fun (ndRange: Range1D) (inputArray: ClArray<'a>) inputLength (isUniqueBitmap: ClArray<int>) ->
@@ -229,7 +228,7 @@ module ClArray =
                 Range1D.CreateValid(inputLength, workGroupSize)
 
             let bitmap =
-                clContext.CreateClArrayWithFlag(GPUOnly, inputLength)
+                clContext.CreateClArrayWithFlag(flag, inputLength)
 
             let kernel = kernel.GetKernel()
 
@@ -248,10 +247,10 @@ module ClArray =
         let scatter =
             Scatter.runInplace clContext workGroupSize
 
-        let getUniqueBitmap = getUniqueBitmap clContext
+        let getUniqueBitmap = getUniqueBitmap clContext GPUOnly
 
         let prefixSumExclude =
-            prefixSumExclude <@ (+) @> clContext workGroupSize
+            prefixSumExclude <@ (+) @> clContext workGroupSize GPUOnly
 
         fun (processor: MailboxProcessor<_>) (inputArray: ClArray<'a>) ->
 
@@ -308,7 +307,7 @@ module ClArray =
 
             result
 
-    let map<'a, 'b> (clContext: ClContext) (workGroupSize: int) (op: Expr<'a -> 'b>) =
+    let map<'a, 'b> (clContext: ClContext) workGroupSize (op: Expr<'a -> 'b>) flag =
 
         let map =
             <@ fun (ndRange: Range1D) (lenght: int) (inputArray: ClArray<'a>) (result: ClArray<'b>) ->
@@ -320,7 +319,7 @@ module ClArray =
 
         let kernel = clContext.Compile map
 
-        fun (processor: MailboxProcessor<_>) (inputArray: ClArray<'a>) flag ->
+        fun (processor: MailboxProcessor<_>) (inputArray: ClArray<'a>) ->
 
             let result =
                 clContext.CreateClArrayWithFlag(flag, inputArray.Length)