refactor: duplication, allTests in Reduce

Author: IgorErin

src/GraphBLAS-sharp.Backend/Common/ClArray.fs

@@ -6,6 +6,7 @@ open GraphBLAS.FSharp.Backend.Objects.ClContext
 open GraphBLAS.FSharp.Backend.Objects.ClCell
 open GraphBLAS.FSharp.Backend.Quotes
 open GraphBLAS.FSharp.Backend.Objects.ArraysExtensions
+open GraphBLAS.FSharp.Backend.Quotes
 
 module ClArray =
     let init (clContext: ClContext) workGroupSize (initializer: Expr<int -> 'a>) =
@@ -167,16 +168,12 @@ module ClArray =
 
     let getUniqueBitmapFirstOccurrence clContext =
         getUniqueBitmapGeneral
-        <| <@ fun (gid: int) (_: int) (inputArray: ClArray<'a>) ->
-                  gid = 0
-                  || inputArray.[gid - 1] <> inputArray.[gid] @>
+        <| Predicates.firstOccurrence ()
         <| clContext
 
     let getUniqueBitmapLastOccurrence clContext =
         getUniqueBitmapGeneral
-        <| <@ fun (gid: int) (length: int) (inputArray: ClArray<'a>) ->
-                  gid = length - 1
-                  || inputArray.[gid] <> inputArray.[gid + 1] @>
+        <| Predicates.lastOccurrence ()
         <| clContext
 
     ///<description>Remove duplicates form the given array.</description>

src/GraphBLAS-sharp.Backend/Common/Scatter.fs

@@ -1,20 +1,9 @@
 namespace GraphBLAS.FSharp.Backend.Common
 
 open Brahma.FSharp
+open GraphBLAS.FSharp.Backend.Quotes
 
 module internal Scatter =
-    let private firstOccurencePredicate () =
-        <@ fun gid _ (positions: ClArray<int>) ->
-            // first occurrence condition
-            (gid = 0 || positions.[gid - 1] <> positions.[gid]) @>
-
-    let private lastOccurrencePredicate () =
-        <@ fun gid positionsLength (positions: ClArray<int>) ->
-            // last occurrence condition
-            (gid = positionsLength - 1
-             || positions.[gid] <> positions.[gid + 1]) @>
-
-
     let private general<'a> predicate (clContext: ClContext) workGroupSize =
 
         let run =
@@ -75,7 +64,7 @@ module internal Scatter =
     /// </code>
     /// </example>
     let firstOccurrence clContext =
-        general <| firstOccurencePredicate () <| clContext
+        general <| Predicates.firstOccurrence () <| clContext
 
     /// <summary>
     /// Creates a new array from the given one where it is indicated by the array of positions at which position in the new array
@@ -96,7 +85,7 @@ module internal Scatter =
     /// </code>
     /// </example>
     let lastOccurrence clContext =
-        general <| lastOccurrencePredicate () <| clContext
+        general <| Predicates.lastOccurrence () <| clContext
 
     let private generalInit<'a> predicate valueMap (clContext: ClContext) workGroupSize =
 
@@ -156,7 +145,7 @@ module internal Scatter =
     /// <param name="valueMap">Maps global id to a value</param>
     let initFirsOccurrence<'a> valueMap =
         generalInit<'a>
-        <| firstOccurencePredicate ()
+        <| Predicates.firstOccurrence ()
         <| valueMap
 
     /// <summary>
@@ -180,5 +169,5 @@ module internal Scatter =
     /// <param name="valueMap">Maps global id to a value</param>
     let initLastOccurrence<'a> valueMap =
         generalInit<'a>
-        <| lastOccurrencePredicate ()
+        <| Predicates.lastOccurrence ()
         <| valueMap

src/GraphBLAS-sharp.Backend/Quotes/Arithmetic.fs

@@ -159,7 +159,7 @@ module ArithmeticOperations =
     // multiplication
     let intMul = createPair 0 (*) <@ (*) @>
 
-    let boolMul = createPair false (&&) <@ (&&) @>
+    let boolMul = createPair true (&&) <@ (&&) @>
 
     let floatMul = createPair 0.0 (*) <@ (*) @>
 

src/GraphBLAS-sharp.Backend/Quotes/Predicates.fs

@@ -1,8 +1,20 @@
 namespace GraphBLAS.FSharp.Backend.Quotes
 
+open Brahma.FSharp
+
 module Predicates =
     let isSome<'a> =
         <@ fun (item: 'a option) ->
             match item with
             | Some _ -> true
             | _ -> false @>
+
+    let inline lastOccurrence () =
+        <@ fun (gid: int) (length: int) (inputArray: ClArray<'a>) ->
+                  gid = length - 1
+                  || inputArray.[gid] <> inputArray.[gid + 1] @>
+
+    let inline firstOccurrence () =
+        <@ fun (gid: int) (_: int) (inputArray: ClArray<'a>) ->
+                  gid = 0
+                  || inputArray.[gid - 1] <> inputArray.[gid] @>

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

@@ -15,17 +15,17 @@ let processor = Context.defaultContext.Queue
 
 let config = Utils.defaultConfig
 
-let getOffsets array =
+let private getOffsets array =
     Array.map fst array
     |> HostPrimitives.getUniqueBitmapFirstOccurrence
     |> HostPrimitives.getBitPositions
 
-let getOffsets2D array =
+let private getOffsets2D array =
     Array.map (fun (fst, snd, _) -> fst, snd) array
     |> HostPrimitives.getUniqueBitmapFirstOccurrence
     |> HostPrimitives.getBitPositions
 
-let checkResult isEqual actualKeys actualValues keys values reduceOp =
+let private checkResult isEqual actualKeys actualValues keys values reduceOp =
 
     let expectedKeys, expectedValues =
         HostPrimitives.reduceByKey keys values reduceOp
@@ -36,7 +36,7 @@ let checkResult isEqual actualKeys actualValues keys values reduceOp =
     "Values must the same"
     |> Utils.compareArrays isEqual actualValues expectedValues
 
-let makeTest isEqual reduce reduceOp (arrayAndKeys: (int * 'a) []) =
+let private makeTest isEqual reduce reduceOp (arrayAndKeys: (int * 'a) []) =
     let keys, values =
         Array.sortBy fst arrayAndKeys |> Array.unzip
 
@@ -60,7 +60,7 @@ let makeTest isEqual reduce reduceOp (arrayAndKeys: (int * 'a) []) =
 
         checkResult isEqual actualKeys actualValues keys values reduceOp
 
-let createTestSequential<'a> (isEqual: 'a -> 'a -> bool) reduceOp reduceOpQ =
+let private createTestSequential<'a> (isEqual: 'a -> 'a -> bool) reduceOp reduceOpQ =
 
     let reduce =
         Reduce.ByKey.sequential context Utils.defaultWorkGroupSize reduceOpQ
@@ -339,7 +339,7 @@ let createTestSequentialSegments2D<'a> (isEqual: 'a -> 'a -> bool) reduceOp redu
               arbitrary = [ typeof<Generators.ArrayOfDistinctKeys> ] }
         $"test on {typeof<'a>}"
 
-let sequentialSegmentTests2D =
+let sequentialSegment2DTests =
     let addTests =
         testList
             "add tests"
@@ -446,7 +446,7 @@ let createTest2DOption (isEqual: 'a -> 'a -> bool) (reduceOpQ, reduceOp) =
               arbitrary = [ typeof<Generators.ArrayOfDistinctKeys> ] }
         $"test on {typeof<'a>}"
 
-let testsByKey2DSegmentsSequentialOption =
+let testsSegmentsSequential2DOption =
     [ createTest2DOption (=) ArithmeticOperations.intAdd
 
       if Utils.isFloat64Available context.ClDevice then
@@ -455,3 +455,13 @@ let testsByKey2DSegmentsSequentialOption =
       createTest2DOption Utils.float32IsEqual ArithmeticOperations.float32Add
       createTest2DOption (=) ArithmeticOperations.boolAdd ]
     |> testList "2D option"
+
+let allTests =
+    testList
+       "Reduce.ByKey"
+       [ sequentialTest
+         oneWorkGroupTest
+         sequentialSegmentTests
+         sequential2DTest
+         sequentialSegment2DTests
+         testsSegmentsSequential2DOption ]

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -23,10 +23,7 @@ let commonTests =
     let reduceTests =
         testList
             "Reduce"
-            [ Common.Reduce.ByKey.sequentialTest
-              Common.Reduce.ByKey.sequentialSegmentTests
-              Common.Reduce.ByKey.oneWorkGroupTest
-              Common.Reduce.ByKey.testsByKey2DSegmentsSequentialOption
+            [ Common.Reduce.ByKey.allTests
               Common.Reduce.Reduce.tests
               Common.Reduce.Sum.tests ]