refactor: Brahma update, SpMV.localMemSize

Author: IgorErin

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/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/Vector/SpMV.fs

@@ -13,8 +13,8 @@ module SpMV =
         (mul: Expr<'a option -> 'b option -> 'c option>)
         workGroupSize
         =
-        //Until LocalMemSize added to ClDevice as member
-        let localMemorySize = Utils.getLocalMemorySize clContext
+
+        let localMemorySize = clContext.ClDevice.LocalMemSize / 1<Byte>
 
         let localPointersArraySize = workGroupSize + 1