RawCommandQueue 3

Author: kirillgarbar

benchmarks/GraphBLAS-sharp.Benchmarks/Algorithms/BFS.fs

@@ -69,7 +69,7 @@ type Benchmarks<'elem when 'elem : struct>(
         this.ResultLevels <- this.FunToBenchmark this.Processor matrix vertex
 
     member this.ClearInputMatrix() =
-        matrix.Dispose this.Processor
+        matrix.Dispose()
 
     member this.ClearResult() =
         match this.ResultLevels with

benchmarks/GraphBLAS-sharp.Benchmarks/Algorithms/PageRank.fs

@@ -68,10 +68,10 @@ type Benchmarks(
         this.Result <- this.FunToBenchmark this.Processor matrixPrepared Constants.PageRank.accuracy
 
     member this.ClearInputMatrix() =
-        matrix.Dispose this.Processor
+        matrix.Dispose()
 
     member this.ClearPreparedMatrix() =
-        matrixPrepared.Dispose this.Processor
+        matrixPrepared.Dispose()
 
     member this.ClearResult() = this.Result.Dispose()
 

benchmarks/GraphBLAS-sharp.Benchmarks/Matrix/Map2/Map2.fs

@@ -79,11 +79,11 @@ type Benchmarks<'matrixT, 'elem when 'matrixT :> IDeviceMemObject and 'elem : st
         this.ResultMatrix <- this.FunToBenchmark this.Processor HostInterop firstMatrix secondMatrix
 
     member this.ClearInputMatrices() =
-        firstMatrix.Dispose this.Processor
-        secondMatrix.Dispose this.Processor
+        firstMatrix.Dispose()
+        secondMatrix.Dispose()
 
     member this.ClearResult() =
-        this.ResultMatrix.Dispose this.Processor
+        this.ResultMatrix.Dispose()
 
     member this.ReadMatrices() =
         firstMatrixHost <- this.ReadMatrix <| fst this.InputMatrixReader

benchmarks/GraphBLAS-sharp.Benchmarks/Matrix/SpGeMM/Expand.fs

@@ -77,11 +77,11 @@ type Benchmarks<'elem when 'elem : struct>(
         this.ResultMatrix <- this.FunToBenchmark this.Processor DeviceOnly matrix matrix
 
     member this.ClearInputMatrices() =
-        matrix.Dispose this.Processor
+        matrix.Dispose()
 
     member this.ClearResult() =
         match this.ResultMatrix with
-        | Some matrix -> matrix.Dispose this.Processor
+        | Some matrix -> matrix.Dispose()
         | None -> ()
 
     member this.ReadMatrices() =

benchmarks/GraphBLAS-sharp.Benchmarks/Matrix/SpGeMM/Masked.fs

@@ -100,12 +100,12 @@ type Masked<'elem when 'elem : struct>(
         this.ResultMatrix <- this.FunToBenchmark this.Processor firstMatrix secondMatrix mask
 
     member this.ClearInputMatrices() =
-        firstMatrix.Dispose this.Processor
-        secondMatrix.Dispose this.Processor
-        mask.Dispose this.Processor
+        firstMatrix.Dispose()
+        secondMatrix.Dispose()
+        mask.Dispose()
 
     member this.ClearResult() =
-        this.ResultMatrix.Dispose this.Processor
+        this.ResultMatrix.Dispose()
 
     member this.ReadMask(maskReader) =
         maskHost <- Matrix.COO <| this.ReadMatrix maskReader

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

@@ -138,26 +138,26 @@ module internal MSBFS =
                     //Getting new frontier
                     match spGeMM queue DeviceOnly (ClMatrix.COO front) matrix with
                     | None ->
-                        front.Dispose queue
+                        front.Dispose()
                         stop <- true
 
                     | Some newFrontier ->
-                        front.Dispose queue
+                        front.Dispose()
 
                         //Filtering visited vertices
                         match updateFrontAndLevels queue DeviceOnly level newFrontier levels with
                         | l, Some f ->
                             front <- f
 
-                            levels.Dispose queue
+                            levels.Dispose()
 
                             levels <- l
 
-                            newFrontier.Dispose queue
+                            newFrontier.Dispose()
 
                         | _, None ->
                             stop <- true
-                            newFrontier.Dispose queue
+                            newFrontier.Dispose()
 
                 ClMatrix.COO levels
 
@@ -242,24 +242,24 @@ module internal MSBFS =
                     //Getting new frontier
                     match spGeMM queue DeviceOnly (ClMatrix.COO front) matrix with
                     | None ->
-                        front.Dispose queue
+                        front.Dispose()
                         stop <- true
 
                     | Some newFrontier ->
-                        front.Dispose queue
+                        front.Dispose()
 
                         //Filtering visited vertices
                         match updateFrontAndParents queue DeviceOnly newFrontier parents with
                         | p, Some f ->
                             front <- f
 
-                            parents.Dispose queue
+                            parents.Dispose()
                             parents <- p
 
-                            newFrontier.Dispose queue
+                            newFrontier.Dispose()
 
                         | _, None ->
                             stop <- true
-                            newFrontier.Dispose queue
+                            newFrontier.Dispose()
 
                 ClMatrix.COO parents

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

@@ -16,9 +16,9 @@ module PageRank =
     type PageRankMatrix =
         | PreparedMatrix of ClMatrix<float32>
 
-        member this.Dispose(processor: RawCommandQueue) =
+        member this.Dispose() =
             match this with
-            | PreparedMatrix matrix -> matrix.Dispose processor
+            | PreparedMatrix matrix -> matrix.Dispose()
 
     let private countOutDegree (clContext: ClContext) workGroupSize =
 
@@ -111,13 +111,7 @@ module PageRank =
                 let ndRange =
                     Range1D.CreateValid(matrix.RowCount * workGroupSize, workGroupSize)
 
-                kernel.KernelFunc
-                    ndRange
-                    matrix.RowCount
-                    matrix.RowPointers
-                    matrix.Values
-                    outDegree
-                    resultValues
+                kernel.KernelFunc ndRange matrix.RowCount matrix.RowPointers matrix.Values outDegree resultValues
 
                 queue.RunKernel(kernel)
 

src/GraphBLAS-sharp.Backend/Algorithms/PageRank.fsi

@@ -7,7 +7,7 @@ open GraphBLAS.FSharp.Objects
 module PageRank =
     [<Sealed>]
     type PageRankMatrix =
-        member Dispose : RawCommandQueue -> unit
+        member Dispose : unit -> unit
 
     val internal prepareMatrix : ClContext -> int -> (RawCommandQueue -> ClMatrix<float32> -> PageRankMatrix)