refactor: tests, names

Author: IgorErin

src/GraphBLAS-sharp.Backend/Matrix/CSRMatrix/SpGEMM/Expand.fs

@@ -139,75 +139,75 @@ module Expand =
  let expandRowPointers =
  Common.expandRowPointers clContext workGroupSize
 
- let AGather = Gather.run clContext workGroupSize
+ let leftMatrixGather = Gather.run clContext workGroupSize
 
- let BGather = Gather.run clContext workGroupSize
+ let rightMatrixGather = Gather.run clContext workGroupSize
 
  fun (processor: MailboxProcessor<_>) lengths (segmentsPointers: Indices) (leftMatrix: ClMatrix.CSR<'a>) (rightMatrix: ClMatrix.CSR<'b>) ->
 
- // Compute A positions
- let APositions = zeroCreate processor DeviceOnly lengths
+ // Compute left matrix positions
+ let leftMatrixPositions = zeroCreate processor DeviceOnly lengths
 
- idScatter processor segmentsPointers APositions
+ idScatter processor segmentsPointers leftMatrixPositions
 
- (maxPrefixSum processor APositions 0)
+ (maxPrefixSum processor leftMatrixPositions 0)
  .Free processor
 
- // Compute B positions
- let BPositions = create processor DeviceOnly lengths 1
+ // Compute right matrix positions
+ let rightMatrixPositions = create processor DeviceOnly lengths 1
 
- let requiredBPointers =
+ let requiredRightMatrixPointers =
  zeroCreate processor DeviceOnly leftMatrix.Columns.Length
 
- gather processor leftMatrix.Columns rightMatrix.RowPointers requiredBPointers
+ gather processor leftMatrix.Columns rightMatrix.RowPointers requiredRightMatrixPointers
 
- scatter processor segmentsPointers requiredBPointers BPositions
+ scatter processor segmentsPointers requiredRightMatrixPointers rightMatrixPositions
 
- requiredBPointers.Free processor
+ requiredRightMatrixPointers.Free processor
 
  // another way to get offsets ???
  let offsets =
  removeDuplicates processor segmentsPointers
 
- segmentPrefixSum processor offsets.Length BPositions APositions offsets
+ segmentPrefixSum processor offsets.Length rightMatrixPositions leftMatrixPositions offsets
 
  offsets.Free processor
 
  // compute columns
  let columns =
  clContext.CreateClArrayWithSpecificAllocationMode(DeviceOnly, lengths)
 
- gather processor BPositions rightMatrix.Columns columns
+ gather processor rightMatrixPositions rightMatrix.Columns columns
 
  // compute rows
- let ARows =
+ let leftMatrixRows =
  expandRowPointers processor DeviceOnly leftMatrix.RowPointers leftMatrix.NNZ leftMatrix.RowCount
 
  let rows =
  clContext.CreateClArrayWithSpecificAllocationMode(DeviceOnly, lengths)
 
- gather processor APositions ARows rows
+ gather processor leftMatrixPositions leftMatrixRows rows
 
- ARows.Free processor
+ leftMatrixRows.Free processor
 
- // compute leftMatrix values
- let AValues =
+ // compute left matrix values
+ let leftMatrixValues =
  clContext.CreateClArrayWithSpecificAllocationMode(DeviceOnly, lengths)
 
- AGather processor APositions leftMatrix.Values AValues
+ leftMatrixGather processor leftMatrixPositions leftMatrix.Values leftMatrixValues
 
- APositions.Free processor
+ leftMatrixPositions.Free processor
 
  // compute right matrix values
- let BValues =
+ let rightMatrixValues =
  clContext.CreateClArrayWithSpecificAllocationMode(DeviceOnly, lengths)
 
- BGather processor BPositions rightMatrix.Values BValues
+ rightMatrixGather processor rightMatrixPositions rightMatrix.Values rightMatrixValues
 
- BPositions.Free processor
+ rightMatrixPositions.Free processor
 
  // left, right matrix values, columns and rows indices
- AValues, BValues, columns, rows
+ leftMatrixValues, rightMatrixValues, columns, rows
 
  let sortByColumnsAndRows (clContext: ClContext) workGroupSize =
 

tests/GraphBLAS-sharp.Tests/Common/Reduce/ReduceByKey.fs

@@ -15,17 +15,17 @@ let processor = Context.defaultContext.Queue
 
 let config = Utils.defaultConfig
 
-let private getOffsets array =
+let getOffsets array =
  Array.map fst array
  |> HostPrimitives.getUniqueBitmapFirstOccurrence
  |> HostPrimitives.getBitPositions
 
-let private getOffsets2D array =
+let getOffsets2D array =
  Array.map (fun (fst, snd, _) -> fst, snd) array
  |> HostPrimitives.getUniqueBitmapFirstOccurrence
  |> HostPrimitives.getBitPositions
 
-let private checkResult isEqual actualKeys actualValues keys values reduceOp =
+let checkResult isEqual actualKeys actualValues keys values reduceOp =
 
  let expectedKeys, expectedValues =
  HostPrimitives.reduceByKey keys values reduceOp
@@ -36,7 +36,7 @@ let private checkResult isEqual actualKeys actualValues keys values reduceOp =
  "Values must the same"
  |> Utils.compareArrays isEqual actualValues expectedValues
 
-let private makeTest isEqual reduce reduceOp (arrayAndKeys: (int * 'a) []) =
+let makeTest isEqual reduce reduceOp (arrayAndKeys: (int * 'a) []) =
  let keys, values =
  Array.sortBy fst arrayAndKeys |> Array.unzip
 
@@ -60,7 +60,7 @@ let private makeTest isEqual reduce reduceOp (arrayAndKeys: (int * 'a) []) =
 
  checkResult isEqual actualKeys actualValues keys values reduceOp
 
-let private createTestSequential<'a> (isEqual: 'a -> 'a -> bool) reduceOp reduceOpQ =
+let createTestSequential<'a> (isEqual: 'a -> 'a -> bool) reduceOp reduceOpQ =
 
  let reduce =
  Reduce.ByKey.sequential context Utils.defaultWorkGroupSize reduceOpQ

tests/GraphBLAS-sharp.Tests/Common/Scan/PrefixSum.fs

@@ -33,7 +33,7 @@ let makeTest plus zero isEqual scan (array: 'a []) =
  let (total: ClCell<_>) = scan q clArray zero
 
  let actual = clArray.ToHostAndFree q
- let actualSum = total.ToHostAndFree(q)
+ let actualSum = total.ToHostAndFree q
  actual, actualSum
 
  logger.debug (

tests/GraphBLAS-sharp.Tests/Helpers.fs

@@ -254,9 +254,7 @@ module HostPrimitives =
  // add and filter
  |> Array.map Some
  |> Array.fold add None
- |> function
- | Some value -> value
- | None -> zero
+ |> Option.defaultValue zero
 
  let scanByKey scan keysAndValues =
  Array.groupBy fst keysAndValues

tests/GraphBLAS-sharp.Tests/Matrix/SpGeMM/Expand.fs

@@ -67,23 +67,23 @@ let makeTest isZero testFun (leftArray: 'a [,], rightArray: 'a [,]) =
  "Result pointers must be the same"
  |> Expect.sequenceEqual actualPointers expectedPointers
 
-let createTest<'a when 'a: struct> (isZero: 'a -> bool) testFun =
+let createTest<'a when 'a: struct> (isZero: 'a -> bool) =
 
  let testFun =
- testFun context Utils.defaultWorkGroupSize
+ Expand.getSegmentPointers context Utils.defaultWorkGroupSize
 
  makeTest isZero testFun
  |> testPropertyWithConfig config $"test on {typeof<'a>}"
 
 let getSegmentsTests =
- [ createTest ((=) 0) Expand.getSegmentPointers
+ [ createTest ((=) 0)
 
  if Utils.isFloat64Available context.ClDevice then
- createTest ((=) 0.0) Expand.getSegmentPointers
+ createTest ((=) 0.0)
 
- createTest ((=) 0f) Expand.getSegmentPointers
- createTest ((=) false) Expand.getSegmentPointers
- createTest ((=) 0uy) Expand.getSegmentPointers ]
+ createTest ((=) 0f)
+ createTest ((=) false)
+ createTest ((=) 0uy) ]
  |> testList "get segment pointers"
 
 let expand length segmentPointers (leftMatrix: Matrix.CSR<'a>) (rightMatrix: Matrix.CSR<'b>) =