Test file, tests and kernels renamed

Author: kirillgarbar

src/GraphBLAS-sharp.Backend/COOMatrix/COOMatrix.fs

@@ -407,13 +407,13 @@ module COOMatrix =
                 if i < totalSum then
                     expandedNnzPerRow.[nonZeroRowsIndices.[i] + 1] <- nnzPerRowSparse.[i] @>
 
-        let kernelCHSR =
+        let kernelCalcHyperSparseRows =
             clContext.CreateClKernel calcHyperSparseRows
 
-        let kernelCNPRS =
+        let kernelCalcNnzPerRowSparse =
             clContext.CreateClKernel calcNnzPerRowSparse
 
-        let kernelENPR = clContext.CreateClKernel expandNnzPerRow
+        let kernelExpandNnzPerRow = clContext.CreateClKernel expandNnzPerRow
 
         let getUniqueBitmap = ClArray.getUniqueBitmap clContext
 
@@ -445,7 +445,7 @@ module COOMatrix =
             processor.Post(
                 Msg.MsgSetArguments
                     (fun () ->
-                        kernelCHSR.SetArguments
+                        kernelCalcHyperSparseRows.SetArguments
                             ndRangeCHSR
                             rowIndices
                             bitmap
@@ -455,7 +455,7 @@ module COOMatrix =
                             nnz)
             )
 
-            processor.Post(Msg.CreateRunMsg<_, _> kernelCHSR)
+            processor.Post(Msg.CreateRunMsg<_, _> kernelCalcHyperSparseRows)
 
             let nnzPerRowSparse = clContext.CreateClArray totalSum
 
@@ -465,26 +465,30 @@ module COOMatrix =
             processor.Post(
                 Msg.MsgSetArguments
                     (fun () ->
-                        kernelCNPRS.SetArguments ndRangeCNPRSandENPR nonZeroRowsPointers nnzPerRowSparse totalSum)
+                        kernelCalcNnzPerRowSparse.SetArguments
+                            ndRangeCNPRSandENPR
+                            nonZeroRowsPointers
+                            nnzPerRowSparse
+                            totalSum)
             )
 
-            processor.Post(Msg.CreateRunMsg<_, _> kernelCNPRS)
+            processor.Post(Msg.CreateRunMsg<_, _> kernelCalcNnzPerRowSparse)
 
             let expandedNnzPerRow =
                 clContext.CreateClArray(Array.zeroCreate rowCount)
 
             processor.Post(
                 Msg.MsgSetArguments
                     (fun () ->
-                        kernelENPR.SetArguments
+                        kernelExpandNnzPerRow.SetArguments
                             ndRangeCNPRSandENPR
                             totalSum
                             nnzPerRowSparse
                             nonZeroRowsIndices
                             expandedNnzPerRow)
             )
 
-            processor.Post(Msg.CreateRunMsg<_, _> kernelENPR)
+            processor.Post(Msg.CreateRunMsg<_, _> kernelExpandNnzPerRow)
 
             let rowPointers, _ =
                 getRowPointers processor expandedNnzPerRow

…endCommonTests/COOMatrixEwiseAddTests.fs …ackendCommonTests/MatrixEwiseAddTests.fstests/GraphBLAS-sharp.Tests/BackendCommonTests/COOMatrixEwiseAddTests.fs renamed to tests/GraphBLAS-sharp.Tests/BackendCommonTests/MatrixEwiseAddTests.fs tests/GraphBLAS-sharp.Tests/BackendCommonTests/COOMatrixEwiseAddTests.fs renamed to tests/GraphBLAS-sharp.Tests/BackendCommonTests/MatrixEwiseAddTests.fs

@@ -218,28 +218,28 @@ let testCases =
 
         | _ -> failwith "No other types of matrices tested yet."
 
-    [ testProperty "Correctness test on random int arrays COO"
+    [ testProperty "Correctness test on random int matrices COO"
       <| (fun size -> makeTest context (PairOfSparseMatricesOfEqualSize.IntType()) size COO (+) <@ (+) @> 0)
 
-      testProperty "Correctness test on random bool arrays COO"
+      testProperty "Correctness test on random bool matrices COO"
       <| (fun size -> makeTest context (PairOfSparseMatricesOfEqualSize.BoolType()) size COO (||) <@ (||) @> false)
 
-      testProperty "Correctness test on random float arrays COO"
+      testProperty "Correctness test on random float matrices COO"
       <| (fun size -> makeTest context (PairOfSparseMatricesOfEqualSize.FloatType()) size COO (+) <@ (+) @> 0.0)
 
-      testProperty "Correctness test on random byte arrays COO"
+      testProperty "Correctness test on random byte matrices COO"
       <| (fun size -> makeTest context (PairOfSparseMatricesOfEqualSize.ByteType()) size COO (+) <@ (+) @> 0uy)
 
-      testProperty "Correctness test on random int arrays CSR"
+      testProperty "Correctness test on random int matrices CSR"
       <| (fun size -> makeTest context (PairOfSparseMatricesOfEqualSize.IntType()) size CSR (+) <@ (+) @> 0)
 
-      testProperty "Correctness test on random boll arrays CSR"
+      testProperty "Correctness test on random bool matrices CSR"
       <| (fun size -> makeTest context (PairOfSparseMatricesOfEqualSize.BoolType()) size CSR (||) <@ (||) @> false)
 
-      testProperty "Correctness test on random float arrays CSR"
+      testProperty "Correctness test on random float matrices CSR"
       <| (fun size -> makeTest context (PairOfSparseMatricesOfEqualSize.FloatType()) size CSR (+) <@ (+) @> 0.0)
 
-      testProperty "Correctness test on random byte arrays CSR"
+      testProperty "Correctness test on random byte matrices CSR"
       <| (fun size -> makeTest context (PairOfSparseMatricesOfEqualSize.ByteType()) size CSR (+) <@ (+) @> 0uy) ]
 
 let tests =

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

@@ -16,7 +16,7 @@
     <Compile Include="BackendCommonTests/RemoveDuplicatesTests.fs" />
     <Compile Include="BackendCommonTests/CopyTests.fs" />
     <Compile Include="BackendCommonTests/ReplicateTests.fs" />
-    <Compile Include="BackendCommonTests/COOMatrixEwiseAddTests.fs" />
+    <Compile Include="BackendCommonTests/MatrixEwiseAddTests.fs" />
     <!--Compile Include="MatrixOperationsTests/GetTuplesTests.fs" /-->
     <!--Compile Include="MatrixOperationsTests/MxmTests.fs" /-->
     <!--Compile Include="MatrixOperationsTests/MxvTests.fs" /-->