add: CSR.byRows tests

Author: IgorErin

src/GraphBLAS-sharp/Objects/Matrix.fs

@@ -24,7 +24,7 @@ module Matrix =
  |> List.mapi (fun i x -> (x, i))
  |> List.filter (fun pair -> not <| isZero (fst pair)))
  |> List.fold
- (fun (rowPtrs, valueInx) row -> ((rowPtrs.Head + row.Length) :: rowPtrs), valueInx @ row)
+ (fun (rowPointers, valueInx) row -> ((rowPointers.Head + row.Length) :: rowPointers), valueInx @ row)
  ([ 0 ], [])
 
  { Values =

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

@@ -53,6 +53,7 @@
  <Compile Include="Matrix/SpGeMM/Masked.fs" />
  <Compile Include="Matrix/SpGeMM/Expand.fs" />
  <Compile Include="Matrix/RowsLengths.fs" />
+ <Compile Include="Matrix/ByRows.fs" />
  <Compile Include="Program.fs" />
  </ItemGroup>
  <Import Project="..\..\.paket\Paket.Restore.targets" />

tests/GraphBLAS-sharp.Tests/Matrix/ByRows.fs

@@ -0,0 +1,55 @@
+module GraphBLAS.FSharp.Tests.Matrix.ByRows
+
+open Expecto
+open GraphBLAS.FSharp.Tests
+open GraphBLAS.FSharp.Backend
+open GraphBLAS.FSharp.Objects
+open GraphBLAS.FSharp.Backend.Matrix
+open GraphBLAS.FSharp.Backend.Objects
+open GraphBLAS.FSharp.Backend.Objects.ClContext
+open GraphBLAS.FSharp.Objects.ClVectorExtensions
+
+let context = Context.defaultContext.ClContext
+
+let processor = Context.defaultContext.Queue
+
+let config = Utils.defaultConfig
+
+let makeTest<'a when 'a : struct> isEqual zero testFun (array: 'a [,]) =
+
+ let matrix = Matrix.CSR.FromArray2D(array, isEqual zero)
+
+ if matrix.NNZ > 0 then
+
+ let clMatrix = matrix.ToDevice context
+
+ let rows = testFun processor HostInterop clMatrix
+
+ "Rows count must be the same"
+ |> Expect.equal (Seq.length rows) (Array2D.length1 array)
+
+ rows
+ |> Seq.iteri (fun index -> function
+ | Some (actualRow: ClVector.Sparse<_>) ->
+ let expectedRow = Vector.Sparse.FromArray(array.[index, *], (isEqual zero))
+ let actualHost = actualRow.ToHost processor
+
+ Utils.compareSparseVectors isEqual actualHost expectedRow
+ | None ->
+ "Expected row must be None"
+ |> Expect.isFalse (Array.exists ((<<) not <| isEqual zero) array.[index, *]))
+
+let createTest isEqual (zero: 'a) =
+ CSR.Matrix.byRows context Utils.defaultWorkGroupSize
+ |> makeTest<'a> isEqual zero
+ |> testPropertyWithConfig config $"test on %A{typeof<'a>}"
+
+let tests =
+ [ createTest (=) 0
+
+ if Utils.isFloat64Available context.ClDevice then
+ createTest Utils.floatIsEqual 0.0
+
+ createTest Utils.float32IsEqual 0.0f
+ createTest (=) false ]
+ |> testList "CSR byRows"

tests/GraphBLAS-sharp.Tests/Matrix/Convert.fs

@@ -45,6 +45,12 @@ let makeTest context q formatFrom formatTo convertFun isZero (array: 'a [,]) =
  let expected =
  Utils.createMatrixFromArray2D formatTo array isZero
 
+ "Row count should be the same"
+ |> Expect.equal actual.RowCount (Array2D.length1 array)
+
+ "Column count should be the same"
+ |> Expect.equal actual.ColumnCount (Array2D.length2 array)
+
  "Matrices should be equal"
  |> Expect.equal actual expected
 
@@ -56,7 +62,7 @@ let createTest<'a when 'a: struct and 'a: equality> convertFun formatTo (isZero:
  |> List.map
  (fun formatFrom ->
  makeTest context q formatFrom formatTo convertFun isZero
- |> testPropertyWithConfig { config with endSize = 10 } $"test on %A{typeof<'a>} from %A{formatFrom}")
+ |> testPropertyWithConfig config $"test on %A{typeof<'a>} from %A{formatFrom}")
 
 let testFixtures formatTo =
  match formatTo with

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -16,7 +16,8 @@ let matrixTests =
  Matrix.SpGeMM.Expand.generalTests
  Matrix.SpGeMM.Masked.tests
  Matrix.Transpose.tests
- Matrix.RowsLengths.tests ]
+ Matrix.RowsLengths.tests
+ Matrix.ByRows.tests ]
  |> testSequenced
 
 let commonTests =