Fix mtx reader

Author: dpanfilyonok

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksBFS.fs

@@ -55,7 +55,7 @@ type BFSBenchmarks() =
     member this.BuildMatrixAndSetSource() =
         matrix <-
             graphblas {
-                let matrix = this.InputMatrixReader.ReadMatrixBoolean(fun _ -> true)
+                let matrix = this.InputMatrixReader.ReadMatrix(fun _ -> true)
 
                 return! Matrix.switch CSR matrix
                 >>= Matrix.synchronizeAndReturn

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksQG.fs

@@ -49,7 +49,7 @@ type QGBenchmarks() =
 
     [<GlobalSetup>]
     member this.BuildMatrixAndSetSource() =
-        let matrix = this.InputMatrixReader.ReadMatrixBoolean(fun _ -> true)
+        let matrix = this.InputMatrixReader.ReadMatrix(fun _ -> true)
 
         match matrix with
         | MatrixCSR csr -> failwith "Not implemented"

src/GraphBLAS-sharp/IO/MtxReader.fs

@@ -45,7 +45,7 @@ type MtxReader(pathToFile: string) =
             Nnz = nnz
         |}
 
-    member this.ReadMatrixReal() : Matrix<float32> =
+    member this.ReadMatrixReal(converter: string -> 'a) : Matrix<'a> =
         if object <> MtxMatrix then failwith "Object is not matrix"
         if field <> Real then failwith "Field is not real"
 
@@ -73,7 +73,7 @@ type MtxReader(pathToFile: string) =
                     (fun line ->
                         let i = int line.[0]
                         let j = int line.[1]
-                        let v = float32 line.[2]
+                        let v = converter line.[2]
                         struct(pack i j, v)
                     )
                 |> Array.sortBy (fun struct(packedIndex, _) -> packedIndex)
@@ -102,9 +102,9 @@ type MtxReader(pathToFile: string) =
         | Coordinate -> matrixFromCoordinateFormat ()
         | Array -> failwith "Unsupported matrix format"
 
-    member this.ReadMatrixBoolean(converter: string -> bool) : Matrix<bool> =
+    member this.ReadMatrixBoolean(converter: string -> 'a) : Matrix<'a> =
         if object <> MtxMatrix then failwith "Object is not matrix"
-        // if field <> f then failwith "Field is not mmm"
+        if field <> Pattern then failwith "Field is not boolean"
 
         use streamReader = new StreamReader(pathToFile)
         while streamReader.Peek() = int '%' do
@@ -130,7 +130,7 @@ type MtxReader(pathToFile: string) =
                     (fun line ->
                         let i = int line.[0]
                         let j = int line.[1]
-                        let v = converter line.[2]
+                        let v = converter ""
                         struct(pack i j, v)
                     )
                 |> Array.sortBy (fun struct(packedIndex, _) -> packedIndex)
@@ -159,6 +159,12 @@ type MtxReader(pathToFile: string) =
         | Coordinate -> matrixFromCoordinateFormat ()
         | Array -> failwith "Unsupported matrix format"
 
+    member this.ReadMatrix(converter: string -> 'a) : Matrix<'a> =
+        match field with
+        | Real -> this.ReadMatrixReal(converter)
+        | Pattern -> this.ReadMatrixBoolean(converter)
+        | _ -> failwith "Not implemented"
+
 and MtxObject =
     | MtxMatrix
     | MtxVector

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

@@ -17,7 +17,7 @@ let testCases = [
         let expected =
             graphblas {
                 let! matrix =
-                    MtxReader("arc130.mtx").ReadMatrixBoolean(fun _ -> true)
+                    MtxReader("arc130.mtx").ReadMatrixReal(fun _ -> true)
                     |> Matrix.switch CSR
 
                 return!

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -6,21 +6,39 @@ open Brahma.FSharp.OpenCL.WorkflowBuilder.Evaluation
 open GraphBLAS.FSharp.Backend.Common
 open Brahma.FSharp.OpenCL.Core
 open OpenCL.Net
+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.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
+
+        return!
+            BFS.levelSingleSource matrix 0
+            >>= Vector.synchronizeAndReturn
+    }
+    |> EvalGB.withClContext (OpenCLEvaluationContext())
+    |> EvalGB.runSync
+    |> ignore
+
+    0