Merge pull request #61 from IgorErin/ewisegen

Refactor

Author: gsvgit

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksMxm.fs

@@ -26,11 +26,11 @@ type MxmBenchmarks<'elem when 'elem : struct>(
 
     let mutable firstMatrix = Unchecked.defaultof<ClMatrix<'elem>>
     let mutable secondMatrix = Unchecked.defaultof<ClMatrix<'elem>>
-    let mutable mask = Unchecked.defaultof<ClMask2D>
+    let mutable mask = Unchecked.defaultof<ClMatrix<_>>
 
     let mutable firstMatrixHost = Unchecked.defaultof<_>
     let mutable secondMatrixHost = Unchecked.defaultof<_>
-    let mutable maskHost = Unchecked.defaultof<Mask2D>
+    let mutable maskHost = Unchecked.defaultof<Matrix<_>>
 
     member val ResultMatrix = Unchecked.defaultof<ClMatrix<'elem>> with get, set
 
@@ -108,15 +108,7 @@ type MxmBenchmarks<'elem when 'elem : struct>(
         this.ResultMatrix.Dispose this.Processor
 
     member this.ReadMask(maskReader) =
-        match this.ReadMatrix maskReader with
-        | Matrix.COO m ->
-            maskHost <-
-                { IsComplemented = false
-                  RowCount = m.RowCount
-                  ColumnCount = m.ColumnCount
-                  Rows = m.Rows
-                  Columns = m.Columns }
-        | _ -> failwith "Unsupported matrix format"
+        maskHost <- this.ReadMatrix maskReader
 
     member this.ReadMatrices() =
         let matrixReader, maskReader = this.InputMatrixReader
@@ -127,7 +119,7 @@ type MxmBenchmarks<'elem when 'elem : struct>(
     member this.LoadMatricesToGPU () =
         firstMatrix <- buildMatrix this.OclContext firstMatrixHost
         secondMatrix <- buildMatrix this.OclContext secondMatrixHost
-        mask <- maskHost.ToBackend(this.OclContext)
+        mask <- maskHost.ToDevice this.OclContext
 
     member this.ConvertSecondMatrixToCSC() =
         secondMatrix <- this.FunCSR2CSC this.Processor HostInterop secondMatrix

paket.dependencies

@@ -16,7 +16,7 @@ nuget System.CodeDom >= 7.0
 nuget FSharp.Quotations.Evaluator 2.1.0
 nuget FSharpx.Collections >= 3.1
 nuget FSharpx.Text.StructuredFormat >= 3.1
-nuget Brahma.FSharp >= 2.0.1
+nuget Brahma.FSharp >= 2.0.4
 nuget BenchmarkDotNet
 nuget MathNet.Numerics.FSharp 4.0.0
 nuget MathNet.Numerics.MKL.Win-x64 2.5.0

paket.lock

@@ -18,26 +18,26 @@ NUGET
       System.Reflection.Emit.Lightweight (>= 4.7) - restriction: >= netstandard2.0
       System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: >= netstandard2.0
     BenchmarkDotNet.Annotations (0.13.2) - restriction: >= netstandard2.0
-    Brahma.FSharp (2.0.3)
-      Brahma.FSharp.OpenCL.Printer (>= 2.0.3) - restriction: >= net7.0
-      Brahma.FSharp.OpenCL.Shared (>= 2.0.3) - restriction: >= net7.0
-      Brahma.FSharp.OpenCL.Translator (>= 2.0.3) - restriction: >= net7.0
+    Brahma.FSharp (2.0.4)
+      Brahma.FSharp.OpenCL.Printer (>= 2.0.4) - restriction: >= net7.0
+      Brahma.FSharp.OpenCL.Shared (>= 2.0.4) - restriction: >= net7.0
+      Brahma.FSharp.OpenCL.Translator (>= 2.0.4) - restriction: >= net7.0
       FSharp.Core (7.0) - restriction: >= net7.0
       FSharp.Quotations.Evaluator (>= 2.1) - restriction: >= net7.0
-      YC.OpenCL.NET (>= 2.0.3) - restriction: >= net7.0
-    Brahma.FSharp.OpenCL.AST (2.0.3) - restriction: >= net7.0
+      YC.OpenCL.NET (>= 2.0.4) - restriction: >= net7.0
+    Brahma.FSharp.OpenCL.AST (2.0.4) - restriction: >= net7.0
       FSharp.Core (7.0) - restriction: >= net7.0
-    Brahma.FSharp.OpenCL.Printer (2.0.3) - restriction: >= net7.0
-      Brahma.FSharp.OpenCL.AST (>= 2.0.3) - restriction: >= net7.0
-      Brahma.FSharp.OpenCL.Translator (>= 2.0.3) - restriction: >= net7.0
+    Brahma.FSharp.OpenCL.Printer (2.0.4) - restriction: >= net7.0
+      Brahma.FSharp.OpenCL.AST (>= 2.0.4) - restriction: >= net7.0
+      Brahma.FSharp.OpenCL.Translator (>= 2.0.4) - restriction: >= net7.0
       FSharp.Core (7.0) - restriction: >= net7.0
       FSharpx.Collections (>= 3.1) - restriction: >= net7.0
       FSharpx.Text.StructuredFormat (>= 3.1) - restriction: >= net7.0
-    Brahma.FSharp.OpenCL.Shared (2.0.3) - restriction: >= net7.0
-      YC.OpenCL.NET (>= 2.0.3) - restriction: >= net7.0
-    Brahma.FSharp.OpenCL.Translator (2.0.3) - restriction: >= net7.0
-      Brahma.FSharp.OpenCL.AST (>= 2.0.3) - restriction: >= net7.0
-      Brahma.FSharp.OpenCL.Shared (>= 2.0.3) - restriction: >= net7.0
+    Brahma.FSharp.OpenCL.Shared (2.0.4) - restriction: >= net7.0
+      YC.OpenCL.NET (>= 2.0.4) - restriction: >= net7.0
+    Brahma.FSharp.OpenCL.Translator (2.0.4) - restriction: >= net7.0
+      Brahma.FSharp.OpenCL.AST (>= 2.0.4) - restriction: >= net7.0
+      Brahma.FSharp.OpenCL.Shared (>= 2.0.4) - restriction: >= net7.0
       FSharp.Core (7.0) - restriction: >= net7.0
       FSharp.Quotations.Evaluator (>= 2.1) - restriction: >= net7.0
       FSharpx.Collections (>= 3.1) - restriction: >= net7.0
@@ -501,7 +501,7 @@ NUGET
       System.Globalization (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Reflection (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Runtime (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.0) (< win8) (< wp8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    System.Runtime (4.3.1) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.4) (>= netstandard1.6)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.1) (>= netstandard1.6) (>= uap10.0) (< win8)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< netstandard2.0) (>= uap10.0))
+    System.Runtime (4.3.1) - restriction: || (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (< netstandard1.1) (>= netstandard1.6) (>= uap10.0) (< win8)) (&& (< netstandard1.3) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (< netstandard2.0) (>= uap10.0))
       Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.2) (< win8) (< wp8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
       Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (< monoandroid) (< net45) (>= netstandard1.0) (< netstandard1.2) (< win8) (< wp8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monotouch) (< net45) (>= netstandard1.5) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
     System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (&& (< monoandroid) (>= netcoreapp2.0) (< netcoreapp2.1)) (>= net462) (&& (>= net6.0) (< net7.0)) (&& (< net6.0) (>= xamarinios)) (&& (< net6.0) (>= xamarinmac)) (>= netstandard2.0)
@@ -744,7 +744,7 @@ NUGET
       System.Xml.XmlDocument (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net45) (>= netstandard1.3) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
     TypeShape (9.0)
       FSharp.Core (>= 4.3.2) - restriction: >= netstandard2.0
-    YC.OpenCL.NET (2.0.3) - restriction: >= net7.0
+    YC.OpenCL.NET (2.0.4) - restriction: >= net7.0
       ExtraConstraints.Fody (1.14) - restriction: >= net7.0
       Microsoft.Build.Framework (16.10) - restriction: >= net7.0
       System.CodeDom (>= 7.0) - restriction: >= net7.0

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

@@ -15,7 +15,7 @@ module BFS =
     let singleSource
         (clContext: ClContext)
         (add: Expr<int option -> int option -> int option>)
-        (mul: Expr<'a option -> 'b option -> int option>)
+        (mul: Expr<'a option -> int option -> int option>)
         workGroupSize
         =
 

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

@@ -290,7 +290,7 @@ module internal BitonicSort =
             queue.Post(Msg.MsgSetArguments(fun () -> kernel.KernelFunc ndRange rows cols values values.Length))
             queue.Post(Msg.CreateRunMsg<_, _>(kernel))
 
-    let sortKeyValuesInplace (clContext: ClContext) workGroupSize =
+    let sortKeyValuesInplace<'n, 'a when 'n: comparison> (clContext: ClContext) workGroupSize =
 
         let localBegin = localBegin clContext workGroupSize
         let globalStep = globalStep clContext workGroupSize

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

@@ -22,7 +22,7 @@ module internal Scatter =
     /// > val result = [| 2.8; 5.5; 6.4; 8.2; 9.1 |]
     /// </code>
     /// </example>
-    let runInplace (clContext: ClContext) workGroupSize =
+    let runInplace<'a> (clContext: ClContext) workGroupSize =
 
         let run =
             <@ fun (ndRange: Range1D) (positions: ClArray<int>) (positionsLength: int) (values: ClArray<'a>) (result: ClArray<'a>) (resultLength: int) ->

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

@@ -26,13 +26,6 @@ module internal Utils =
 
     let ceilToMultiple multiple x = ((x - 1) / multiple + 1) * multiple
 
-    let getLocalMemorySize (clContext: ClContext) =
-        let error = ref Unchecked.defaultof<ClErrorCode>
-
-        Cl
-            .GetDeviceInfo(clContext.ClDevice.Device, OpenCL.Net.DeviceInfo.LocalMemSize, error)
-            .CastTo<int>()
-
     let getClArrayOfValueTypeSize<'a when 'a: struct> localMemorySize = localMemorySize / sizeof<'a>
 
     //Option type in C is represented as structure with additional integer field

src/GraphBLAS-sharp.Backend/GraphBLAS-sharp.Backend.fsproj

@@ -15,7 +15,6 @@
     <Compile Include="Objects/ArraysExtentions.fs" />
     <Compile Include="Objects/Vector.fs" />
     <Compile Include="Objects/Matrix.fs" />
-    <Compile Include="Objects/Masks.fs" />
     <Compile Include="Objects/AtLeastOne.fs" />
     <Compile Include="Objects/ClContextExtensions.fs" />
     <Compile Include="Quotes/SubReduce.fs" />

src/GraphBLAS-sharp.Backend/Mask/GetComplemented.fs

@@ -253,6 +253,6 @@ module CSRMatrix =
         let run =
             SpGEMM.run clContext workGroupSize opAdd opMul
 
-        fun (queue: MailboxProcessor<_>) (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSC<'b>) (mask: ClMask2D) ->
+        fun (queue: MailboxProcessor<_>) (matrixLeft: ClMatrix.CSR<'a>) (matrixRight: ClMatrix.CSC<'b>) (mask: ClMatrix.COO<_>) ->
 
             run queue matrixLeft matrixRight mask