Merge branch 'semiring-impl' into master

Author: dpanfilyonok

paket.dependencies

@@ -9,12 +9,8 @@ nuget Expecto 8.13.1
 nuget YoloDev.Expecto.TestSdk 0.8.0
 nuget Microsoft.NET.Test.Sdk 15.7.2
 nuget altcover ~> 6
+
 nuget Brahma.FSharp
-nuget FsUnit.xUnit
-nuget FsCheck.Xunit
-nuget xunit
-nuget xunit.runner.visualstudio
-nuget coverlet.collector
 nuget FSharpx.Collections 1.15.1
 
 // [ FAKE GROUP ]

paket.lock

@@ -13,7 +13,6 @@ NUGET
     Chessie (0.6) - restriction: >= netcoreapp1.0
       FSharp.Core (>= 4.0.1.7-alpha) - restriction: >= netstandard1.6
       NETStandard.Library (>= 1.6) - restriction: >= netstandard1.6
-    coverlet.collector (1.3)
     dotnet-mono (0.5.2) - clitool: true
       Argu (>= 3.7) - restriction: >= netcoreapp1.0
       Chessie (>= 0.6) - restriction: >= netcoreapp1.0
@@ -27,12 +26,6 @@ NUGET
     Expecto (8.13.1)
       FSharp.Core (>= 4.3.4) - restriction: || (>= net461) (>= netstandard2.0)
       Mono.Cecil (>= 0.11) - restriction: || (>= net461) (>= netstandard2.0)
-    FsCheck (2.14.3)
-      FSharp.Core (>= 4.0.0.1) - restriction: && (< net452) (>= netstandard1.0) (< netstandard1.6)
-      FSharp.Core (>= 4.2.3) - restriction: || (>= net452) (>= netstandard1.6)
-    FsCheck.Xunit (2.14.3)
-      FsCheck (2.14.3)
-      xunit.extensibility.execution (>= 2.2 < 3.0)
     FSharp.Core (4.3.4)
       System.Collections (>= 4.0.11) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
       System.Console (>= 4.0) - restriction: && (< net45) (>= netstandard1.6) (< netstandard2.0)
@@ -61,11 +54,6 @@ NUGET
       FSharp.Core (>= 4.3.1) - restriction: >= netstandard2.0
     FSharpx.Collections (1.15.1)
       FSharp.Core
-    FsUnit.xUnit (4.0.1)
-      FSharp.Core (>= 4.3.4) - restriction: >= netstandard2.0
-      NETStandard.Library (>= 2.0.3) - restriction: >= netstandard2.0
-      NHamcrest (>= 2.0.1 < 2.1) - restriction: >= netstandard2.0
-      xunit (>= 2.4.1 < 2.5) - restriction: >= netstandard2.0
     Microsoft.Build (16.3) - restriction: >= netcoreapp1.0
       Microsoft.Build.Framework (>= 16.3) - restriction: || (>= net472) (>= netcoreapp2.1)
       Microsoft.Win32.Registry (>= 4.3) - restriction: >= netcoreapp2.1
@@ -106,7 +94,7 @@ NUGET
       Microsoft.NETCore.DotNetHostResolver (>= 3.0.1)
     Microsoft.NETCore.DotNetHostResolver (3.0.1) - restriction: >= netcoreapp2.2
       Microsoft.NETCore.DotNetAppHost (>= 3.0.1)
-    Microsoft.NETCore.Platforms (3.0) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (>= net45) (< netstandard1.3) (>= netstandard2.0)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4) (>= netstandard2.0)) (&& (>= net461) (>= netstandard2.0)) (>= netcoreapp2.0) (&& (>= netcoreapp5.0) (< netstandard2.0)) (&& (< netstandard1.0) (>= netstandard2.0) (< portable-net45+win8)) (&& (< netstandard1.0) (>= netstandard2.0) (>= win8)) (&& (< netstandard1.0) (>= netstandard2.0) (< win8)) (&& (< netstandard1.3) (>= netstandard2.0) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= netstandard2.0) (>= uap10.0)) (&& (>= netstandard2.0) (< portable-net45+win8+wpa81)) (&& (>= netstandard2.0) (>= uap10.1)) (&& (>= netstandard2.0) (>= wp8))
+    Microsoft.NETCore.Platforms (3.0) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (>= netcoreapp2.1) (&& (>= netcoreapp5.0) (< netstandard2.0))
     Microsoft.NETCore.Targets (3.0) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (>= netcoreapp2.1) (&& (>= netcoreapp5.0) (< netstandard2.0))
     Microsoft.NETFramework.ReferenceAssemblies (1.0) - copy_local: true
       Microsoft.NETFramework.ReferenceAssemblies.net20 (>= 1.0) - restriction: && (>= net20) (< net40)
@@ -148,7 +136,7 @@ NUGET
     Microsoft.Win32.SystemEvents (4.6) - restriction: >= netcoreapp3.0
       Microsoft.NETCore.Platforms (>= 3.0) - restriction: >= netcoreapp2.0
     Mono.Cecil (0.11.1) - restriction: || (>= net461) (>= netstandard2.0)
-    NETStandard.Library (2.0.3) - restriction: || (&& (< net35) (>= netstandard1.1)) (&& (< net452) (>= netstandard1.1)) (>= netcoreapp1.0) (>= netstandard2.0) (>= uap10.0)
+    NETStandard.Library (2.0.3) - restriction: || (>= netcoreapp1.0) (&& (< netstandard1.3) (>= uap10.0)) (&& (< netstandard2.0) (>= uap10.0))
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (>= net45) (< netstandard1.3)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4)) (>= net461) (>= netcoreapp2.0) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8) (< win8)) (&& (< netstandard1.0) (< portable-net45+win8) (>= portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= win8)) (&& (< netstandard1.3) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (>= uap10.1) (>= wp8)
     Newtonsoft.Json (12.0.3) - restriction: || (>= netcoreapp2.1) (>= uap10.0)
       Microsoft.CSharp (>= 4.3) - restriction: || (&& (< net20) (>= netstandard1.0) (< netstandard1.3)) (&& (< net20) (>= netstandard1.3) (< netstandard2.0))
@@ -157,8 +145,6 @@ NUGET
       System.Runtime.Serialization.Formatters (>= 4.3) - restriction: && (< net20) (>= netstandard1.3) (< netstandard2.0)
       System.Runtime.Serialization.Primitives (>= 4.3) - restriction: || (&& (< net20) (>= netstandard1.0) (< netstandard1.3)) (&& (< net20) (>= netstandard1.3) (< netstandard2.0))
       System.Xml.XmlDocument (>= 4.3) - restriction: && (< net20) (>= netstandard1.3) (< netstandard2.0)
-    NHamcrest (2.0.1) - restriction: >= netstandard2.0
-      NETStandard.Library (>= 1.6.1) - restriction: && (< net451) (>= netstandard1.5)
     NuGet.Frameworks (5.3.1) - restriction: || (&& (>= net451) (>= netcoreapp1.0) (>= uap10.0)) (&& (>= netcoreapp1.0) (>= netstandard2.0) (>= uap10.0)) (>= netcoreapp2.1)
     OpenCL.Net (2.2.9)
     runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp5.0) (< netstandard2.0))
@@ -639,25 +625,6 @@ NUGET
       System.Text.Encoding (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Threading (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
       System.Xml.ReaderWriter (>= 4.3) - restriction: && (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
-    xunit (2.4.1)
-      xunit.analyzers (>= 0.10)
-      xunit.assert (2.4.1)
-      xunit.core (2.4.1)
-    xunit.abstractions (2.0.3) - restriction: >= netstandard1.1
-      NETStandard.Library (>= 1.6) - restriction: && (< net35) (>= netstandard1.0) (< netstandard2.0)
-    xunit.analyzers (0.10)
-    xunit.assert (2.4.1)
-      NETStandard.Library (>= 1.6.1) - restriction: && (< net452) (>= netstandard1.1)
-    xunit.core (2.4.1)
-      xunit.extensibility.core (2.4.1)
-      xunit.extensibility.execution (2.4.1)
-    xunit.extensibility.core (2.4.1)
-      NETStandard.Library (>= 1.6.1) - restriction: && (< net452) (>= netstandard1.1)
-      xunit.abstractions (>= 2.0.3) - restriction: >= netstandard1.1
-    xunit.extensibility.execution (2.4.1)
-      NETStandard.Library (>= 1.6.1) - restriction: && (< net452) (>= netstandard1.1)
-      xunit.extensibility.core (2.4.1) - restriction: >= netstandard1.1
-    xunit.runner.visualstudio (2.4.3)
     YC.PrettyPrinter (0.0.5)
       FSharp.Core
     YoloDev.Expecto.TestSdk (0.8)

src/GraphBLAS-sharp/CSRMatrix.fs

@@ -34,9 +34,8 @@ type CSRMatrix<'a when 'a : struct and 'a : equality>(csrTuples: CSRFormat<'a>)
                 "vector"
                 (sprintf "Argument has invalid dimension. Need %i, but given %i" csrMatrixColumnCount vectorLength)
 
-        // let (BinaryOp op) = context.Times
-        let plus = !> context.PlusMonoid.Append
-        let mult = !> context.Times
+        let (BinaryOp plus) = context.PlusMonoid.Append
+        let (BinaryOp mult) = context.Times
 
         let resultVector = Array.zeroCreate<'a> csrMatrixRowCount
         let command =
@@ -71,8 +70,6 @@ type CSRMatrix<'a when 'a : struct and 'a : equality>(csrTuples: CSRFormat<'a>)
 
         upcast DenseVector(resultVector)
 
-    new() = CSRMatrix(CSRFormat.ZeroCreate())
-
     member this.Values = csrTuples.Values
     member this.Columns = csrTuples.Columns
     member this.RowPointers = csrTuples.RowPointers

src/GraphBLAS-sharp/ComputationalContext.fs

@@ -3,9 +3,6 @@ namespace GraphBLAS.FSharp
 type DenseVector<'a when 'a : struct and 'a : equality>(vector: 'a[]) =
     inherit Vector<'a>()
 
-    new() = DenseVector(Array.zeroCreate<'a> 0)
-    new(listOfIndices: int list) = DenseVector(Array.zeroCreate<'a> 0)
-
     override this.Length = failwith "Not Implemented"
     override this.AsArray = failwith "Not Implemented"
 

src/GraphBLAS-sharp/DenseVector.fs

@@ -11,7 +11,7 @@
     <Compile Include="Operators.fs" />
     <Compile Include="Monoid.fs" />
     <Compile Include="Semiring.fs" />
-    <Compile Include="ComputationalContext.fs" />
+    <Compile Include="OpenCLContext.fs" />
     <Compile Include="Scalar.fs" />
     <Compile Include="MatrixAndVector.fs" />
     <Compile Include="DenseVector.fs" />

src/GraphBLAS-sharp/GraphBLAS-sharp.fsproj

@@ -1,6 +1,6 @@
 namespace GraphBLAS.FSharp
 
-type Monoid<'a> = {
-    Zero: 'a
-    Append: BinaryOp<'a, 'a, 'a>
+type Monoid<'T> = {
+    Zero: 'T
+    Append: BinaryOp<'T, 'T, 'T>
 }

src/GraphBLAS-sharp/Monoid.fs

@@ -0,0 +1,25 @@
+namespace GraphBLAS.FSharp
+
+open Brahma.OpenCL
+open OpenCL.Net
+open Brahma.OpenCL
+
+type OpenCLContext = {
+    Provider: ComputeProvider
+    CommandQueue: CommandQueue
+}
+
+module OpenCLContext =
+
+    let private defaultProvider =
+        try ComputeProvider.Create("*", DeviceType.Default)
+        with
+        | ex -> failwith ex.Message
+
+    let private defaultQueue =
+        new CommandQueue(defaultProvider, defaultProvider.Devices |> Seq.head)
+
+    let currentContext = {
+        Provider = defaultProvider
+        CommandQueue = defaultQueue
+    }

src/GraphBLAS-sharp/OpenCLContext.fs

@@ -2,11 +2,11 @@ namespace GraphBLAS.FSharp
 
 open Microsoft.FSharp.Quotations
 
-type UnaryOp<'a, 'b> = UnaryOp of Expr<'a -> 'b>
+type UnaryOp<'TIn, 'TOut> = UnaryOp of Expr<'TIn -> 'TOut>
 with
     static member op_Implicit (UnaryOp source) = source
 
 
-type BinaryOp<'a, 'b, 'c> = BinaryOp of Expr<'a -> 'b -> 'c>
+type BinaryOp<'T1, 'T2, 'TOut> = BinaryOp of Expr<'T1 -> 'T2 -> 'TOut>
 with
     static member op_Implicit (BinaryOp source) = source

src/GraphBLAS-sharp/Operators.fs

@@ -1,12 +1,14 @@
 namespace GraphBLAS.FSharp
 
-type Semiring<'a> = {
-    PlusMonoid: Monoid<'a>
-    Times: BinaryOp<'a, 'a, 'a>
+type Semiring<'T1, 'T2, 'TOut> = {
+    PlusMonoid: Monoid<'TOut>
+    Times: BinaryOp<'T1, 'T2, 'TOut>
 }
 
+type Semiring<'T> = Semiring<'T, 'T, 'T>
+
 module Semiring =
-    let create<'a> (zero: 'a) (plus: BinaryOp<'a, 'a, 'a>) (times: BinaryOp<'a, 'a, 'a>) =
+    let create<'a> (zero: 'a) (plus: BinaryOp<'a, 'a, 'a>) (times: BinaryOp<'a, 'a, 'a>) : Semiring<'a> =
         {
             PlusMonoid = {
                 Zero = zero