Add vxm correctness test

Author: dpanfilyonok

benchmarks/GraphBLAS-sharp.Benchmarks/BfsBenchmark.fs

@@ -7,10 +7,11 @@ open BenchmarkDotNet.Configs
 open BenchmarkDotNet.Columns
 open System.IO
 open System
+open MatrixBackend
 
 [<Config(typeof<Config>)>]
 [<SimpleJob(targetCount=10)>]
-type BfsBenchmark() =
+type BFSBenchmark4CSRMatrix() =
     let random = Random()
 
     let mutable matrix = Unchecked.defaultof<Matrix<bool>>
@@ -20,12 +21,12 @@ type BfsBenchmark() =
     member val PathToGraph = "" with get, set
 
     [<GlobalSetup>]
-    member this.BuildMatrix () =
-        matrix <- Matrix.Build<bool> this.PathToGraph
+    member this.BuildMatrix() =
+        matrix <- Matrix.Build<bool>(this.PathToGraph, CSR)
         source <- random.Next matrix.RowCount
 
     [<Benchmark>]
-    member this.LevelBFS () =
+    member this.LevelBFS() =
         levelBFS matrix source
 
     /// Sequence of paths to files where data for benchmarking will be taken from

benchmarks/GraphBLAS-sharp.Benchmarks/GraphBLAS-sharp.Benchmarks.fsproj

@@ -19,4 +19,4 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>

benchmarks/GraphBLAS-sharp.Benchmarks/Program.fs

@@ -4,7 +4,7 @@ open GraphBLAS.FSharp.Benchmarks
 [<EntryPoint>]
 let main argv =
     let benchmarks = BenchmarkSwitcher [|
-        typeof<BfsBenchmark>
+        typeof<BFSBenchmark4CSRMatrix>
     |]
 
     benchmarks.Run argv |> ignore

paket.dependencies

@@ -20,6 +20,7 @@ nuget FSharpx.Collections 2.1.3
 nuget FSharpx.Text.StructuredFormat 2.3.0
 nuget Brahma.FSharp.OpenCL.WorkflowBuilder
 nuget BenchmarkDotNet
+nuget MathNet.Numerics.FSharp
 
 // [ FAKE GROUP ]
 group Build

paket.lock

@@ -13,8 +13,7 @@ module MatrixBackend =
             failwith "Not Implemented"
 
 [<AutoOpen>]
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
-module Matrix =
+module MatrixExtensions =
     open MatrixBackend
     type Matrix<'a when 'a : struct and 'a : equality> with
         static member Build(denseMatrix: 'T[,], zero: 'T) : Matrix<'T> =
@@ -26,3 +25,6 @@ module Matrix =
         static member ZeroCreate(rowCount: int, columnCount: int) : Matrix<'T> =
             Matrix.ZeroCreate(rowCount, columnCount)
 
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module Matrix =
+    let toSeq (matrix: Matrix<'a>) = failwith "Not Implemented"

src/GraphBLAS-sharp/Matrix.fs

@@ -1,8 +1,7 @@
 namespace GraphBLAS.FSharp
 
 [<AutoOpen>]
-[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
-module Vector =
+module VectorExtensions =
     type Vector<'a when 'a : struct and 'a : equality> with
         static member Sparse(denseVector: 'T[], zero: 'T) : Vector<'T> =
             failwith "Not Implemented"
@@ -17,3 +16,7 @@ module Vector =
             failwith "Not Implemented"
         static member ZeroDense(length: int, monoid: Monoid<'T>) : Vector<'T> =
             failwith "Not Implemented"
+
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module Vector =
+    let toSeq (vector: Vector<'a>) = failwith "Not Implemented"

src/GraphBLAS-sharp/Vector.fs

@@ -3,6 +3,7 @@ namespace GraphBLAS.FSharp.Tests
 open Expecto
 open FsCheck
 open GraphBLAS.FSharp
+open MathNet.Numerics
 
 type OperationCase = {
     VectorCase: VectorType
@@ -11,25 +12,25 @@ type OperationCase = {
 }
 
 type MatrixMultiplicationPair =
-    static member DimensionGen2 () =
+    static member DimensionGen2() =
         fun size ->
             Gen.choose (0, size |> float |> sqrt |> int)
             |> Gen.two
         |> Gen.sized
         |> Arb.fromGen
 
-    static member DimensionGen3 () =
+    static member DimensionGen3() =
         fun size ->
             Gen.choose (0, size |> float |> sqrt |> int)
             |> Gen.three
         |> Gen.sized
         |> Arb.fromGen
 
-    static member FloatSparseMatrixVectorPair () =
+    static member FloatSparseMatrixVectorPair() =
         fun size ->
             let floatSparseGenerator =
                 Gen.oneof [
-                    Arb.Default.NormalFloat () |> Arb.toGen |> Gen.map float
+                    Arb.Default.NormalFloat() |> Arb.toGen |> Gen.map float
                     Gen.constant 0.
                 ]
 
@@ -74,8 +75,9 @@ module VxmTests =
             })
 
     [<Tests>]
-    let vxmTestList =
-        testList "Vector-matrix multiplication tests" (
+    let vxmTestsInStandardSemiring =
+        let stdSemiring = Predefined.FloatSemiring.addMult
+        ptestList "Float vector-matrix multiplication tests" (
             List.collect (fun case ->
                 let matrixBackend =
                     match case.MatrixCase with
@@ -94,17 +96,31 @@ module VxmTests =
 
                 [
                     testPropertyWithConfig config "Dimensional mismatch should raise an exception" <|
-                        // тут просто размерности генерить и создавать пустые объекты
                         fun matrixRowCount matrixColumnCount vectorSize ->
                             let emptyMatrix = Matrix.ZeroCreate(matrixRowCount, matrixColumnCount, matrixBackend)
                             let emptyVector = zeroVectorConstructor vectorSize
 
                             Expect.throwsT<System.ArgumentException>
-                                (fun () -> (emptyVector @. emptyMatrix) Mask1D.none Predefined.FloatSemiring.addMult |> ignore)
-                                "sss???"
+                                (fun () -> (emptyVector @. emptyMatrix) Mask1D.none stdSemiring |> ignore)
+                                (sprintf "1x%i @ %ix%i" vectorSize matrixRowCount matrixColumnCount)
 
                     testPropertyWithConfig config "Operation should have correct semantic" <|
-                        fun (matrix: float[,]) (vector: float[,]) -> ()
+                        fun (denseMatrix: float[,]) (denseVector: float[]) ->
+                            let matrix = Matrix.Build(denseMatrix, 0., matrixBackend)
+                            let vector = vectorConstructor denseVector
+                            let result = (vector @. matrix) Mask1D.none stdSemiring
+                            let a = LinearAlgebra.DenseMatrix.ofArray2 denseMatrix
+                            let b = LinearAlgebra.DenseVector.ofArray denseVector
+                            let c = b * a
+                            let elementWiseDifference =
+                                (result |> Vector.toSeq, c.AsArray() |> Seq.ofArray)
+                                ||>  Seq.zip
+                                |> Seq.map (fun (a, b) -> a - b)
+
+                            Expect.all
+                                elementWiseDifference
+                                (fun diff -> abs diff < Accuracy.medium.absolute)
+                                (sprintf "%A @ %A = %A" vector matrix result)
 
                     ptestPropertyWithConfig config "Explicit zeroes after operation should be dropped" <|
                         fun a b -> a + b = b + a

tests/GraphBLAS-sharp.Tests/OperationsTests/VxmTests.fs

@@ -5,6 +5,7 @@ Expecto
 Expecto.FsCheck
 Microsoft.NET.Test.Sdk
 YoloDev.Expecto.TestSdk
+MathNet.Numerics.FSharp
 
 dotnet-mono