Merge pull request #89 from kirillgarbar/io

Benchmarks and IO fix
SparseLinearAlgebra · Nov 6, 2023 · 8452ee6 · 8452ee6
2 parents 099e787 + e6bae88
commit 8452ee6
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 38 deletions.
diff --git a/benchmarks/GraphBLAS-sharp.Benchmarks/Configs/Context.txt b/benchmarks/GraphBLAS-sharp.Benchmarks/Configs/Context.txt
@@ -1,3 +1,3 @@
-NVIDIA*
+AMD*
 Gpu
-32
+64
diff --git a/benchmarks/GraphBLAS-sharp.Benchmarks/Configs/WorkflowTargets.txt b/benchmarks/GraphBLAS-sharp.Benchmarks/Configs/WorkflowTargets.txt
@@ -1 +1 @@
-BFSBenchmark
+BFSWithoutTransfer
diff --git a/benchmarks/GraphBLAS-sharp.Benchmarks/Scripts/Benchmark.py b/benchmarks/GraphBLAS-sharp.Benchmarks/Scripts/Benchmark.py
@@ -7,8 +7,8 @@
 
 from dataclasses import dataclass
 
-ROOT = pathlib.Path(__file__).parent.parent.parent.parent
-BENCHMARKS = pathlib.Path(__file__).parent.parent
+ROOT = pathlib.Path(__file__).resolve().parent.parent.parent.parent
+BENCHMARKS = pathlib.Path(__file__).resolve().parent.parent
 CONFIGS = BENCHMARKS / "Configs"
 BINARIES = BENCHMARKS / "bin" / "Release" / "net7.0"
 RESULTS = ROOT / "BenchmarkDotNet.Artifacts" / "results"

diff --git a/src/GraphBLAS-sharp/IO/MtxReader.fs b/src/GraphBLAS-sharp/IO/MtxReader.fs
@@ -68,40 +68,46 @@ type MtxReader(pathToFile: string) =
             let sortedData =
                 match this.Symmetry with
                 | General ->
-                    [ 0 .. nnz - 1 ]
-                    |> List.map (fun _ -> streamReader.ReadLine().Split(' '))
-                    |> Array.ofList
-                    |> Array.Parallel.map
-                        (fun line ->
-                            let i = int line.[0]
-                            let j = int line.[1]
-
-                            let v =
-                                converter
-                                <| if line.Length > 2 then line.[2] else ""
-
-                            struct (pack i j, v))
-                    |> Array.sortBy (fun struct (packedIndex, _) -> packedIndex)
+                    let result =
+                        [| 0 .. nnz - 1 |]
+                        |> Array.map
+                            (fun _ ->
+                                let line = streamReader.ReadLine().Split(' ')
+
+                                let i = int line.[0]
+                                let j = int line.[1]
+
+                                let v =
+                                    converter
+                                    <| if line.Length > 2 then line.[2] else ""
+
+                                struct (pack i j, v))
+
+                    Array.sortInPlaceBy (fun struct (packedIndex, _) -> packedIndex) result
+                    result
                 | Symmetric ->
-                    [ 0 .. nnz - 1 ]
-                    |> List.map (fun _ -> streamReader.ReadLine().Split(' '))
-                    |> Array.ofList
-                    |> Array.Parallel.map
-                        (fun line ->
-                            let i = int line.[0]
-                            let j = int line.[1]
-
-                            let v =
-                                converter
-                                <| if line.Length > 2 then line.[2] else ""
-
-                            if i = j then
-                                [| struct (pack i j, v) |]
-                            else
-                                [| struct (pack i j, v)
-                                   struct (pack j i, v) |])
-                    |> Array.concat
-                    |> Array.sortBy (fun struct (packedIndex, _) -> packedIndex)
+                    let result =
+                        [| 0 .. nnz - 1 |]
+                        |> Array.map
+                            (fun _ ->
+                                let line = streamReader.ReadLine().Split(' ')
+
+                                let i = int line.[0]
+                                let j = int line.[1]
+
+                                let v =
+                                    converter
+                                    <| if line.Length > 2 then line.[2] else ""
+
+                                if i = j then
+                                    [| struct (pack i j, v) |]
+                                else
+                                    [| struct (pack i j, v)
+                                       struct (pack j i, v) |])
+                        |> Array.concat
+
+                    Array.sortInPlaceBy (fun struct (packedIndex, _) -> packedIndex) result
+                    result
                 | _ ->
                     failwith
                     <| sprintf "This symmetry processing is not implemented: %A" this.Symmetry
-Original file line number
+Diff line change
@@ -1,3 +1,3 @@
-    NVIDIA*
+    AMD*
     Gpu