Skip to content

Commit becee4d

Browse files
IgorErinIgorErin
committed
refactor: formatting
1 parent ab4d3ac commit becee4d

File tree

4 files changed

+110
-108
lines changed

4 files changed

+110
-108
lines changed

‎src/GraphBLAS-sharp.Backend/GraphBLAS-sharp.Backend.fsproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@
3535
<Compile Include="Common/Sort/Radix.fs" />
3636
<Compile Include="Common/Sort/Bitonic.fs" />
3737
<Compile Include="Common/Sum.fs" />
38-
<Compile Include="Common\Merge.fs" />
38+
<Compile Include="Common/Merge.fs" />
3939
<Compile Include="Matrix/Common.fs" />
40-
<Compile Include="Matrix\COO\Map.fs" />
41-
<Compile Include="Matrix\COO\Merge.fs" />
42-
<Compile Include="Matrix\COO\Map2.fs" />
43-
<Compile Include="Matrix\COO\Matrix.fs" />
44-
<Compile Include="Matrix\CSR\Merge.fs" />
45-
<Compile Include="Matrix\CSR\Map2.fs" />
46-
<Compile Include="Matrix\CSR\SpGEMM\Expand.fs" />
47-
<Compile Include="Matrix\CSR\SpGEMM\Masked.fs" />
48-
<Compile Include="Matrix\CSR\Map.fs" />
49-
<Compile Include="Matrix\CSR\Matrix.fs" />
40+
<Compile Include="Matrix/COO/Map.fs" />
41+
<Compile Include="Matrix/COO/Merge.fs" />
42+
<Compile Include="Matrix/COO/Map2.fs" />
43+
<Compile Include="Matrix/COO/Matrix.fs" />
44+
<Compile Include="Matrix/CSR/Merge.fs" />
45+
<Compile Include="Matrix/CSR/Map2.fs" />
46+
<Compile Include="Matrix/CSR/SpGEMM/Expand.fs" />
47+
<Compile Include="Matrix/CSR/SpGEMM/Masked.fs" />
48+
<Compile Include="Matrix/CSR/Map.fs" />
49+
<Compile Include="Matrix/CSR/Matrix.fs" />
5050
<Compile Include="Matrix/Matrix.fs" />
5151
<Compile Include="Vector/SparseVector/Common.fs" />
5252
<Compile Include="Vector/SparseVector/Merge.fs" />

‎tests/GraphBLAS-sharp.Tests/Common/Merge.fs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ let context = Context.defaultContext.ClContext
1010

1111
let processor = Context.defaultContext.Queue
1212

13-
let config = { Utils.defaultConfig with endSize = 10000000 }
13+
let config =
14+
{ Utils.defaultConfig with
15+
endSize = 10000000 }
1416

1517
let makeTest isEqual testFun (leftArray: 'a []) (rightArray: 'a []) =
1618
if leftArray.Length > 0 && rightArray.Length > 0 then

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<Compile Include="QuickGraph/Algorithms/BFS.fs" />
1919
<Compile Include="Common/Scatter.fs" />
2020
<Compile Include="Common/Gather.fs" />
21-
<Compile Include="Common\Merge.fs" />
21+
<Compile Include="Common/Merge.fs" />
2222
<Compile Include="Common/ClArray/Choose.fs" />
2323
<Compile Include="Common/ClArray/Exists.fs" />
2424
<Compile Include="Common/ClArray/Map.fs" />
@@ -49,7 +49,7 @@
4949
<Compile Include="Matrix/Map.fs" />
5050
<Compile Include="Matrix/SpGeMM/Masked.fs" />
5151
<Compile Include="Matrix/SpGeMM/Expand.fs" />
52-
<Compile Include="Matrix\Merge.fs" />
52+
<Compile Include="Matrix/Merge.fs" />
5353
<Compile Include="Program.fs" />
5454
</ItemGroup>
5555
<Import Project="..\..\.paket\Paket.Restore.targets" />

‎tests/GraphBLAS-sharp.Tests/Program.fs‎

Lines changed: 94 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -2,99 +2,99 @@ open Expecto
22
open GraphBLAS.FSharp.Tests.Backend
33
open GraphBLAS.FSharp.Tests
44

5-
// let matrixTests =
6-
// testList
7-
// "Matrix tests"
8-
// [ Matrix.Convert.tests
9-
// Matrix.Map2.addTests
10-
// Matrix.Map2.addAtLeastOneTests
11-
// Matrix.Map2.mulAtLeastOneTests
12-
// Matrix.Map2.addAtLeastOneToCOOTests
13-
// Matrix.Map.notTests
14-
// Matrix.Map.addTests
15-
// Matrix.Map.mulTests
16-
// Matrix.Transpose.tests
17-
// Matrix.SpGeMM.Masked.tests
18-
// Matrix.SpGeMM.Expand.generalTests ]
19-
// |> testSequenced
20-
//
21-
// let commonTests =
22-
// let scanTests =
23-
// testList
24-
// "Scan"
25-
// [ Common.Scan.ByKey.sequentialSegmentsTests
26-
// Common.Scan.PrefixSum.tests ]
27-
//
28-
// let reduceTests =
29-
// testList
30-
// "Reduce"
31-
// [ Common.Reduce.ByKey.allTests
32-
// Common.Reduce.Reduce.tests
33-
// Common.Reduce.Sum.tests ]
34-
//
35-
// let clArrayTests =
36-
// testList
37-
// "ClArray"
38-
// [ Common.ClArray.RemoveDuplicates.tests
39-
// Common.ClArray.Copy.tests
40-
// Common.ClArray.Replicate.tests
41-
// Common.ClArray.Exists.tests
42-
// Common.ClArray.Map.tests
43-
// Common.ClArray.Map2.addTests
44-
// Common.ClArray.Map2.mulTests
45-
// Common.ClArray.Choose.allTests ]
46-
//
47-
// let sortTests =
48-
// testList
49-
// "Sort"
50-
// [ Common.Sort.Bitonic.tests
51-
// Common.Sort.Radix.testByKeys
52-
// Common.Sort.Radix.testKeysOnly ]
53-
//
54-
// testList
55-
// "Common tests"
56-
// [ Common.Scatter.allTests
57-
// Common.Gather.allTests
58-
// clArrayTests
59-
// sortTests
60-
// reduceTests
61-
// scanTests ]
62-
// |> testSequenced
63-
//
64-
// let vectorTests =
65-
// testList
66-
// "Vector tests"
67-
// [ Vector.SpMV.tests
68-
// Vector.ZeroCreate.tests
69-
// Vector.OfList.tests
70-
// Vector.Copy.tests
71-
// Vector.Convert.tests
72-
// Vector.Map2.addTests
73-
// Vector.Map2.mulTests
74-
// Vector.Map2.addAtLeastOneTests
75-
// Vector.Map2.mulAtLeastOneTests
76-
// Vector.Map2.complementedGeneralTests
77-
// Vector.AssignByMask.tests
78-
// Vector.AssignByMask.complementedTests
79-
// Vector.Reduce.tests ]
80-
// |> testSequenced
81-
//
82-
// let algorithmsTests =
83-
// testList "Algorithms tests" [ Algorithms.BFS.tests ]
84-
// |> testSequenced
85-
//
86-
// [<Tests>]
87-
// let allTests =
88-
// testList
89-
// "All tests"
90-
// [ matrixTests
91-
// vectorTests
92-
// commonTests
93-
// algorithmsTests ]
94-
// |> testSequenced
5+
let matrixTests =
6+
testList
7+
"Matrix tests"
8+
[ Matrix.Convert.tests
9+
Matrix.Map2.addTests
10+
Matrix.Map2.addAtLeastOneTests
11+
Matrix.Map2.mulAtLeastOneTests
12+
Matrix.Map2.addAtLeastOneToCOOTests
13+
Matrix.Map.notTests
14+
Matrix.Map.addTests
15+
Matrix.Map.mulTests
16+
Matrix.Transpose.tests
17+
Matrix.Merge.allTests
18+
Matrix.SpGeMM.Masked.tests
19+
Matrix.SpGeMM.Expand.generalTests ]
20+
|> testSequenced
9521

96-
[<EntryPoint>]
97-
let main argv =
98-
Common.Merge.tests
22+
let commonTests =
23+
let scanTests =
24+
testList
25+
"Scan"
26+
[ Common.Scan.ByKey.sequentialSegmentsTests
27+
Common.Scan.PrefixSum.tests ]
28+
29+
let reduceTests =
30+
testList
31+
"Reduce"
32+
[ Common.Reduce.ByKey.allTests
33+
Common.Reduce.Reduce.tests
34+
Common.Reduce.Sum.tests ]
35+
36+
let clArrayTests =
37+
testList
38+
"ClArray"
39+
[ Common.ClArray.RemoveDuplicates.tests
40+
Common.ClArray.Copy.tests
41+
Common.ClArray.Replicate.tests
42+
Common.ClArray.Exists.tests
43+
Common.ClArray.Map.tests
44+
Common.ClArray.Map2.addTests
45+
Common.ClArray.Map2.mulTests
46+
Common.ClArray.Choose.allTests ]
47+
48+
let sortTests =
49+
testList
50+
"Sort"
51+
[ Common.Sort.Bitonic.tests
52+
Common.Sort.Radix.testByKeys
53+
Common.Sort.Radix.testKeysOnly ]
54+
55+
testList
56+
"Common tests"
57+
[ Common.Scatter.allTests
58+
Common.Gather.allTests
59+
Common.Merge.tests
60+
clArrayTests
61+
sortTests
62+
reduceTests
63+
scanTests ]
64+
|> testSequenced
65+
66+
let vectorTests =
67+
testList
68+
"Vector tests"
69+
[ Vector.SpMV.tests
70+
Vector.ZeroCreate.tests
71+
Vector.OfList.tests
72+
Vector.Copy.tests
73+
Vector.Convert.tests
74+
Vector.Map2.addTests
75+
Vector.Map2.mulTests
76+
Vector.Map2.addAtLeastOneTests
77+
Vector.Map2.mulAtLeastOneTests
78+
Vector.Map2.complementedGeneralTests
79+
Vector.AssignByMask.tests
80+
Vector.AssignByMask.complementedTests
81+
Vector.Reduce.tests
82+
Vector.Merge.tests ]
83+
|> testSequenced
84+
85+
let algorithmsTests =
86+
testList "Algorithms tests" [ Algorithms.BFS.tests ]
9987
|> testSequenced
100-
|> runTestsWithCLIArgs [] argv
88+
89+
[<Tests>]
90+
let allTests =
91+
testList
92+
"All tests"
93+
[ matrixTests
94+
vectorTests
95+
commonTests
96+
algorithmsTests ]
97+
|> testSequenced
98+
99+
[<EntryPoint>]
100+
let main argv = allTests |> runTestsWithCLIArgs [] argv

0 commit comments

Comments
 (0)