refactor: tests

IgorErin · IgorErin · commit a1498d5bf4f1 · 2023-01-05T13:57:53.000+03:00
diff --git a/tests/GraphBLAS-sharp.Tests/Algorithms/BFS.fs b/tests/GraphBLAS-sharp.Tests/Algorithms/BFS.fs
@@ -1,4 +1,4 @@
-module Algo.BFS
+module GraphBLAS.FSharp.Tests.Backend.Algo.BFS
 
 open Expecto
 open GraphBLAS.FSharp.Backend
diff --git a/tests/GraphBLAS-sharp.Tests/Common/BitonicSort.fs b/tests/GraphBLAS-sharp.Tests/Common/BitonicSort.fs
@@ -1,4 +1,4 @@
-module Backend.BitonicSort
+module GraphBLAS.FSharp.Tests.Backend.Common.BitonicSort
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Common/Copy.fs b/tests/GraphBLAS-sharp.Tests/Common/Copy.fs
@@ -1,4 +1,4 @@
-module Backend.Copy
+module GraphBLAS.FSharp.Tests.Backend.Common.Copy
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Common/PrefixSum.fs b/tests/GraphBLAS-sharp.Tests/Common/PrefixSum.fs
@@ -1,4 +1,4 @@
-module Backend.PrefixSum
+module GraphBLAS.FSharp.Tests.Backend.Common.PrefixSum
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Common/Reduce.fs b/tests/GraphBLAS-sharp.Tests/Common/Reduce.fs
@@ -1,4 +1,4 @@
-module Backend.Reduce
+module GraphBLAS.FSharp.Tests.Backend.Common.Reduce
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Common/RemoveDuplicates.fs b/tests/GraphBLAS-sharp.Tests/Common/RemoveDuplicates.fs
@@ -1,4 +1,4 @@
-module Backend.RemoveDuplicates
+module GraphBLAS.FSharp.Tests.Backend.Common.RemoveDuplicates
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Common/Replicate.fs b/tests/GraphBLAS-sharp.Tests/Common/Replicate.fs
@@ -1,4 +1,4 @@
-module Backend.Replicate
+module GraphBLAS.FSharp.Tests.Backend.Common.Replicate
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Common/Scatter.fs b/tests/GraphBLAS-sharp.Tests/Common/Scatter.fs
@@ -1,4 +1,4 @@
-module Backend.Scatter
+module GraphBLAS.FSharp.Tests.Backend.Common.Scatter
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Common/Sum.fs b/tests/GraphBLAS-sharp.Tests/Common/Sum.fs
@@ -1,4 +1,4 @@
-module Backend.Sum
+module GraphBLAS.FSharp.Tests.Backend.Common.Sum
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/GraphBLAS-sharp.Tests.fsproj b/tests/GraphBLAS-sharp.Tests/GraphBLAS-sharp.Tests.fsproj
@@ -15,19 +15,14 @@
         <Compile Include="QuickGraph/CreateGraph.fs" />
         <Compile Include="QuickGraph/Algorithms/ConnectedComponents.fs" />
         <Compile Include="QuickGraph/Algorithms/BFS.fs" />
-        <Compile Include="BackendCommonTests/BitonicSortTests.fs" />
-        <Compile Include="BackendCommonTests/RemoveDuplicatesTests.fs" />
-        <Compile Include="BackendCommonTests/CopyTests.fs" />
-        <Compile Include="BackendCommonTests/ReplicateTests.fs" />
-        <Compile Include="BackendCommonTests/PrefixSumTests.fs" />
-        <Compile Include="BackendCommonTests/ScatterTests.fs" />
-        <Compile Include="BackendCommonTests/MatrixElementwiseTests.fs" />
-        <Compile Include="BackendCommonTests/ConvertTests.fs" />
-        <Compile Include="BackendCommonTests/TransposeTests.fs" />
-        <Compile Include="BackendCommonTests/MxmTests.fs" />
-        <Compile Include="BackendCommonTests/SpMVTests.fs" />
-        <Compile Include="BackendCommonTests/SumTest.fs" />
-        <Compile Include="BackendCommonTests/ReduceTests.fs" />
+        <Compile Include="Common\BitonicSort.fs" />
+        <Compile Include="Common\RemoveDuplicates.fs" />
+        <Compile Include="Common\Copy.fs" />
+        <Compile Include="Common\Replicate.fs" />
+        <Compile Include="Common\PrefixSum.fs" />
+        <Compile Include="Common\Scatter.fs" />
+        <Compile Include="Common\Sum.fs" />
+        <Compile Include="Common\Reduce.fs" />
         <!--Compile Include="MatrixOperationsTests/GetTuplesTests.fs" /-->
         <!--Compile Include="MatrixOperationsTests/MxvTests.fs" /-->
         <!--Compile Include="MatrixOperationsTests/VxmTests.fs" /-->
@@ -41,7 +36,12 @@
         <Compile Include="Vector/Reduce.fs" />
         <Compile Include="Vector/ElementWise.fs" />
         <Compile Include="Vector/ContainsNonZero.fs" />
+        <Compile Include="Vector\SpMV.fs" />
         <Compile Include="Algorithms/BFS.fs" />
+        <Compile Include="Matrix\Convert.fs" />
+        <Compile Include="Matrix\Elementwise.fs" />
+        <Compile Include="Matrix\Mxm.fs" />
+        <Compile Include="Matrix\Transpose.fs" />
         <Compile Include="Program.fs" />
     </ItemGroup>
     <Import Project="..\..\.paket\Paket.Restore.targets" />
diff --git a/tests/GraphBLAS-sharp.Tests/Matrix/Convert.fs b/tests/GraphBLAS-sharp.Tests/Matrix/Convert.fs
@@ -1,4 +1,4 @@
-module Backend.Convert
+module GraphBLAS.FSharp.Tests.Backend.Matrix.Convert
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Matrix/Elementwise.fs b/tests/GraphBLAS-sharp.Tests/Matrix/Elementwise.fs
@@ -1,5 +1,4 @@
-module Backend.Elementwise
-
+module GraphBLAS.FSharp.Tests.Backend.Matrix.Elementwise
 
 open Expecto
 open Expecto.Logging
@@ -11,7 +10,6 @@ open GraphBLAS.FSharp.Tests.TestCases
 open Microsoft.FSharp.Collections
 open Backend.Common.StandardOperations
 open Context
-open TestCases
 open Utils
 
 let logger = Log.create "Elementwise.Tests"
diff --git a/tests/GraphBLAS-sharp.Tests/Matrix/Mxm.fs b/tests/GraphBLAS-sharp.Tests/Matrix/Mxm.fs
@@ -1,9 +1,7 @@
-module Backend.Mxm
+module GraphBLAS.FSharp.Tests.Backend.Matrix.Mxm
 
 open Expecto
 open Expecto.Logging
-open Expecto.Logging.Message
-
 open GraphBLAS.FSharp.Tests.Utils
 open GraphBLAS.FSharp.Tests.Context
 open GraphBLAS.FSharp.Tests
diff --git a/tests/GraphBLAS-sharp.Tests/Matrix/Transpose.fs b/tests/GraphBLAS-sharp.Tests/Matrix/Transpose.fs
@@ -1,4 +1,4 @@
-module Backend.Transpose
+module GraphBLAS.FSharp.Tests.Backend.Matrix.Transpose
 
 open Expecto
 open Expecto.Logging
@@ -7,7 +7,6 @@ open GraphBLAS.FSharp.Backend
 open GraphBLAS.FSharp
 open GraphBLAS.FSharp.Tests.Utils
 open GraphBLAS.FSharp.Tests.TestCases
-open OpenCL.Net
 
 let logger = Log.create "Transpose.Tests"
 
diff --git a/tests/GraphBLAS-sharp.Tests/Program.fs b/tests/GraphBLAS-sharp.Tests/Program.fs
@@ -1,35 +1,38 @@
 open Expecto
-
-open Brahma.FSharp.OpenCL
-open GraphBLAS.FSharp.Backend.Common
-open OpenCL.Net
 open GraphBLAS.FSharp
-//open GraphBLAS.FSharp.Algorithms
-open GraphBLAS.FSharp.IO
+open GraphBLAS.FSharp.Tests.
 
 [<Tests>]
-let allTests =
+let matrixTests =
     testList
-        "All tests"
-        [ Backend.Mxm.tests
-          Backend.BitonicSort.tests
-          Backend.PrefixSum.tests
-          Backend.Scatter.tests
-          Backend.Convert.tests
-          Backend.RemoveDuplicates.tests
-          Backend.Copy.tests
-          Backend.Replicate.tests
-          //Backend.Elementwise.elementwiseAddTests
-          //Backend.Elementwise.elementwiseAddAtLeastOneTests
-          //Backend.Elementwise.elementwiseAddAtLeastOneToCOOTests
-          //Backend.Elementwise.elementwiseMulAtLeastOneTests
-          Backend.Transpose.tests
-          Backend.SpMV.tests
-          //Matrix.GetTuples.tests
-          //Matrix.Mxv.tests
-          Algo.BFS.tests
-          Backend.Reduce.tests
-          Backend.Sum.tests
+        "Matrix tests"
+        [ Backend.Matrix.Convert.tests
+          Backend.Matrix.Elementwise.elementwiseAddTests
+          Backend.Matrix.Elementwise.elementwiseAddAtLeastOneTests
+          Backend.Matrix.Elementwise.elementwiseMulAtLeastOneTests
+          Backend.Matrix.Elementwise.elementwiseAddAtLeastOneToCOOTests
+          Backend.Matrix.Mxm.tests
+          Backend.Matrix.Transpose.tests ]
+        |> testSequenced
+
+[<Tests>]
+let commonTests =
+    testList
+        "Common tests"
+        [ Backend.Common.BitonicSort.tests
+          Backend.Common.PrefixSum.tests
+          Backend.Common.Scatter.tests
+          Backend.Common.RemoveDuplicates.tests
+          Backend.Common.Copy.tests
+          Backend.Common.Replicate.tests
+          Backend.Common.Reduce.tests
+          Backend.Common.Sum.tests ]
+        |> testSequenced
+
+let vectorTests =
+    testList
+        "Vector tests"
+        [ Backend.Vector.SpMV.tests
           Backend.Vector.ZeroCreate.tests
           Backend.Vector.OfList.tests
           Backend.Vector.Copy.tests
@@ -42,23 +45,23 @@ let allTests =
           Backend.Vector.FillSubVector.complementedTests
           Backend.Vector.Reduce.tests
           Backend.Vector.ContainNonZero.tests ]
+        |> testSequenced
+
+let algoTests =
+    testList
+        "Algorithms tests"
+        [ Backend.Algo.BFS.tests ]
+        |> testSequenced
+
+[<Tests>]
+let allTests =
+    testList
+        "All tests"
+        [ commonTests
+          matrixTests
+          vectorTests
+          algoTests ]
     |> testSequenced
 
 [<EntryPoint>]
 let main argv = allTests |> runTestsWithCLIArgs [] argv
-
-// graphblas {
-//     let! matrix =
-//         MtxReader("webbase-1M.mtx").ReadMatrix(fun _ -> 1)
-//         |> Matrix.switch CSR
-//         >>= Matrix.synchronizeAndReturn
-//     let! vector = Vector.ofList matrix.ColumnCount (List.init matrix.ColumnCount (fun i -> i, 1))
-//     return!
-//         Matrix.mxv Predefined.AddMult.int matrix vector
-//         >>= Vector.synchronizeAndReturn
-// }
-// |> EvalGB.withClContext (OpenCLEvaluationContext())
-// |> EvalGB.runSync
-// |> printfn "%A"
-
-// 0
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/ContainsNonZero.fs b/tests/GraphBLAS-sharp.Tests/Vector/ContainsNonZero.fs
@@ -1,4 +1,4 @@
-module Backend.Vector.ContainNonZero
+module GraphBLAS.FSharp.Tests.Backend.Vector.ContainNonZero
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/Convert.fs b/tests/GraphBLAS-sharp.Tests/Vector/Convert.fs
@@ -1,4 +1,4 @@
-module Backend.Vector.Convert
+module GraphBLAS.FSharp.Tests.Backend.Vector.Convert
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/Copy.fs b/tests/GraphBLAS-sharp.Tests/Vector/Copy.fs
@@ -1,4 +1,4 @@
-module Backend.Vector.Copy
+module GraphBLAS.FSharp.Tests.Backend.Vector.Copy
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/ElementWise.fs b/tests/GraphBLAS-sharp.Tests/Vector/ElementWise.fs
@@ -1,4 +1,4 @@
-module Backend.Vector.ElementWise
+module GraphBLAS.FSharp.Tests.Backend.Vector.ElementWise
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/ElementWiseAtLeasOne.fs b/tests/GraphBLAS-sharp.Tests/Vector/ElementWiseAtLeasOne.fs
@@ -1,4 +1,4 @@
-module Backend.Vector.ElementWiseAtLeastOne
+module GraphBLAS.FSharp.Tests.Backend.Vector.ElementWiseAtLeastOne
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/FillSubVector.fs b/tests/GraphBLAS-sharp.Tests/Vector/FillSubVector.fs
@@ -1,4 +1,4 @@
-module Backend.Vector.FillSubVector
+module GraphBLAS.FSharp.Tests.Backend.Vector.FillSubVector
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/OfList.fs b/tests/GraphBLAS-sharp.Tests/Vector/OfList.fs
@@ -1,4 +1,4 @@
-module Backend.Vector.OfList
+module GraphBLAS.FSharp.Tests.Backend.Vector.OfList
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/Reduce.fs b/tests/GraphBLAS-sharp.Tests/Vector/Reduce.fs
@@ -1,4 +1,4 @@
-module Backend.Vector.Reduce
+module GraphBLAS.FSharp.Tests.Backend.Vector.Reduce
 
 open Expecto
 open Expecto.Logging
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/SpMV.fs b/tests/GraphBLAS-sharp.Tests/Vector/SpMV.fs
@@ -1,4 +1,4 @@
-﻿module Backend.SpMV
+﻿module GraphBLAS.FSharp.Tests.Backend.Vector.SpMV
 
 open GraphBLAS.FSharp.Backend
 open GraphBLAS.FSharp.Backend.ArraysExtensions
diff --git a/tests/GraphBLAS-sharp.Tests/Vector/ZeroCreate.fs b/tests/GraphBLAS-sharp.Tests/Vector/ZeroCreate.fs
@@ -1,4 +1,4 @@
-module Backend.Vector.ZeroCreate
+module GraphBLAS.FSharp.Tests.Backend.Vector.ZeroCreate
 
 open Expecto
 open Expecto.Logging

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Algo.BFS`
	`1`	`+module GraphBLAS.FSharp.Tests.Backend.Algo.BFS`
`2`	`2`
`3`	`3`	`open Expecto`
`4`	`4`	`open GraphBLAS.FSharp.Backend`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Backend.BitonicSort`
	`1`	`+module GraphBLAS.FSharp.Tests.Backend.Common.BitonicSort`
`2`	`2`
`3`	`3`	`open Expecto`
`4`	`4`	`open Expecto.Logging`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Backend.Copy`
	`1`	`+module GraphBLAS.FSharp.Tests.Backend.Common.Copy`
`2`	`2`
`3`	`3`	`open Expecto`
`4`	`4`	`open Expecto.Logging`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Backend.PrefixSum`
	`1`	`+module GraphBLAS.FSharp.Tests.Backend.Common.PrefixSum`
`2`	`2`
`3`	`3`	`open Expecto`
`4`	`4`	`open Expecto.Logging`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Backend.Reduce`
	`1`	`+module GraphBLAS.FSharp.Tests.Backend.Common.Reduce`
`2`	`2`
`3`	`3`	`open Expecto`
`4`	`4`	`open Expecto.Logging`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Backend.RemoveDuplicates`
	`1`	`+module GraphBLAS.FSharp.Tests.Backend.Common.RemoveDuplicates`
`2`	`2`
`3`	`3`	`open Expecto`
`4`	`4`	`open Expecto.Logging`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Backend.Replicate`
	`1`	`+module GraphBLAS.FSharp.Tests.Backend.Common.Replicate`
`2`	`2`
`3`	`3`	`open Expecto`
`4`	`4`	`open Expecto.Logging`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Backend.Scatter`
	`1`	`+module GraphBLAS.FSharp.Tests.Backend.Common.Scatter`
`2`	`2`
`3`	`3`	`open Expecto`
`4`	`4`	`open Expecto.Logging`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module Backend.Sum`
	`1`	`+module GraphBLAS.FSharp.Tests.Backend.Common.Sum`
`2`	`2`
`3`	`3`	`open Expecto`
`4`	`4`	`open Expecto.Logging`