Change bfs matrix type to int; add mxv test on WrappedInt

Author: dpanfilyonok

src/GraphBLAS-sharp/Algorithms/BFS.fs

@@ -4,11 +4,10 @@ open GraphBLAS.FSharp.Predefined
 open GraphBLAS.FSharp
 
 module BFS =
-    let levelSingleSource (matrix: Matrix<bool>) (source: int) = graphblas {
+    let levelSingleSource (matrix: Matrix<int>) (source: int) = graphblas {
         let vertexCount = Matrix.rowCount matrix
         let! levels = Vector.zeroCreate vertexCount // v
-        let! frontier = Vector.ofList vertexCount [source, true] // q[s] = true
-
+        let! frontier = Vector.ofList vertexCount [source, 1] // q[s] = true
         let! transposed = Matrix.transpose matrix // A'
 
         let mutable currentLevel = 0
@@ -22,14 +21,14 @@ module BFS =
             do! Vector.fillSubVector levels frontierMask currentLevelScalar // v[q] = d
 
             let! levelsComplemented = Vector.complemented levels
-            do! Matrix.mxvWithMask AnyAll.bool levelsComplemented transposed frontier // q[!v] = (A' ||.&& q)' = q' ||.&& A -- replace + comp
+            do! Matrix.mxvWithMask AddMult.int levelsComplemented transposed frontier // q[!v] = (A' ||.&& q)' = q' ||.&& A -- replace + comp
             >>= Vector.assignVector frontier
 
             let! succ =
-                Vector.reduce AnyAll.bool frontier
+                Vector.reduce AddMult.int frontier
                 >>= Scalar.exportValue
 
-            break' <- not succ
+            break' <- succ = 0
 
         return levels
     }

src/GraphBLAS-sharp/Algorithms/ShortestPath.fs

@@ -6,13 +6,16 @@ open Brahma.FSharp.OpenCL.WorkflowBuilder.Basic
 open Brahma.FSharp.OpenCL.WorkflowBuilder.Evaluation
 
 module ShortestPath =
+    // FIXME Unsupported call: min
     let singleSource (matrix: Matrix<float>) (source: int) = graphblas {
         let vertexCount = Matrix.rowCount matrix
         let! distance = Vector.ofList vertexCount [source, 0.]
 
+        let! transposed = Matrix.transpose matrix // A'
+
         // TODO terminate earlier if we reach a fixed point
         for _ = 1 to vertexCount - 1 do
-            do! Matrix.vxm MinAdd.float distance matrix
+            do! Matrix.mxv MinAdd.float transposed distance
             >>= Vector.assignVector distance
 
         return distance

src/GraphBLAS-sharp/Backend/CSRMatrix/Convert.fs

@@ -19,7 +19,8 @@ module internal rec Convert =
         else
             let! compressedRows = compressRows matrix.RowCount matrix.Rows
             let! cols = Copy.copyArray matrix.Columns
-            let! vals = Copy.copyArray matrix.Values
+            // FIXME copy broken
+            let vals = matrix.Values
 
             return {
                 RowCount = matrix.RowCount

tests/GraphBLAS-sharp.Tests/AlgorithmsTests/BfsTests.fs

@@ -13,7 +13,7 @@ open GraphBLAS.FSharp.Algorithms
 let logger = Log.create "Bfs.Tests"
 
 let testCases = [
-    ftestCase "" <| fun () ->
+    testCase "" <| fun () ->
         let expected =
             graphblas {
                 let! matrix =

tests/GraphBLAS-sharp.Tests/GraphBLAS-sharp.Tests.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="../../src/GraphBLAS-sharp/GraphBLAS-sharp.fsproj" />

tests/GraphBLAS-sharp.Tests/Helpers.fs

@@ -19,6 +19,23 @@ module Extensions =
             let (ClosedBinaryOp f) = this
             QuotationEvaluator.Evaluate f
 
+module CustomDatatypes =
+    [<Struct>]
+    type WrappedInt = { InnerValue: int }
+    with
+        static member (+) (x: WrappedInt, y: WrappedInt) = { InnerValue = x.InnerValue + y.InnerValue }
+        static member (*) (x: WrappedInt, y: WrappedInt) = { InnerValue = x.InnerValue * y.InnerValue }
+
+    let addMultSemiringOnWrappedInt: Semiring<WrappedInt> =
+        {
+            PlusMonoid = {
+                AssociativeOp = ClosedBinaryOp <@ (+) @>
+                Identity = { InnerValue = 0 }
+            }
+
+            TimesSemigroup = { AssociativeOp = ClosedBinaryOp <@ (*) @> }
+        }
+
 module Generators =
     let logger = Log.create "Generators"
 
@@ -185,6 +202,13 @@ module Generators =
             |> genericSparseGenerator false Arb.generate<bool>
             |> Arb.fromGen
 
+        static member WrappedInt() =
+            pairOfMatrixAndVectorOfCompatibleSizeGenerator
+            |> genericSparseGenerator
+                CustomDatatypes.addMultSemiringOnWrappedInt.PlusMonoid.Identity
+                Arb.generate<CustomDatatypes.WrappedInt>
+            |> Arb.fromGen
+
     type PairOfSparseVectorAndMatrixOfCompatibleSize() =
         static let pairOfVectorAndMatrixOfCompatibleSizeGenerator (valuesGenerator: Gen<'a>) = gen {
             let! (nrows, ncols) = dimension2DGenerator

tests/GraphBLAS-sharp.Tests/MatrixOperationsTests/MxvTests.fs

@@ -216,6 +216,10 @@ let testFixtures case = [
 
         "Values of actual and expected vectors should be the same"
         |> Expect.sequenceEqual actual.Values expected.Values
+
+    case
+    |> correctnessGenericTest<CustomDatatypes.WrappedInt> CustomDatatypes.addMultSemiringOnWrappedInt (=)
+    |> ftestPropertyWithConfig config (getCorrectnessTestName "WrappedInt")
 ]
 
 let tests =

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -10,35 +10,36 @@ open GraphBLAS.FSharp
 open GraphBLAS.FSharp.Algorithms
 open GraphBLAS.FSharp.IO
 
-// [<Tests>]
-// let allTests =
-//     testList "All tests" [
-//         Backend.PrefixSum.tests
-//         Backend.BitonicSort.tests
-//         Backend.RemoveDuplicates.tests
-//         Matrix.GetTuples.tests
-//         Matrix.Mxv.tests
-//         Matrix.Transpose.tests
-//         Algo.Bfs.tests
-//     ]
-//     |> testSequenced
+[<Tests>]
+let allTests =
+    testList "All tests" [
+        Backend.PrefixSum.tests
+        Backend.BitonicSort.tests
+        Backend.RemoveDuplicates.tests
+        Matrix.EWiseAdd.tests
+        Matrix.GetTuples.tests
+        Matrix.Mxv.tests
+        Matrix.Transpose.tests
+        Algo.Bfs.tests
+    ]
+    |> testSequenced
 
 [<EntryPoint>]
 let main argv =
-    // allTests
-    // |> runTestsWithCLIArgs [] argv
+    allTests
+    |> runTestsWithCLIArgs [] argv
 
-    graphblas {
-        let! matrix =
-            MtxReader("arc130.mtx").ReadMatrixReal(fun _ -> true)
-            |> Matrix.switch CSR
+    // graphblas {
+    //     let! matrix =
+    //         MtxReader("arc130.mtx").ReadMatrix(fun _ -> 1)
+    //         |> Matrix.switch CSR
 
-        return!
-            BFS.levelSingleSource matrix 0
-            >>= Vector.synchronizeAndReturn
-    }
-    |> EvalGB.withClContext (OpenCLEvaluationContext())
-    |> EvalGB.runSync
-    |> ignore
+    //     return!
+    //         BFS.levelSingleSource matrix 0
+    //         >>= Vector.synchronizeAndReturn
+    // }
+    // |> EvalGB.withClContext (OpenCLEvaluationContext())
+    // |> EvalGB.runSync
+    // |> printfn "%A"
 
-    0
+    // 0