refactor: Vector.fillSubVector, .fillSubVectorComplemented

Author: IgorErin

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

@@ -1,5 +1,7 @@
 namespace GraphBLAS.FSharp.Backend.Common
 
+open FSharp.Quotations
+
 type AtLeastOne<'a, 'b when 'a: struct and 'b: struct> =
     | Both of 'a * 'b
     | Left of 'a
@@ -102,36 +104,28 @@ module StandardOperations =
     let floatMulAtLeastOne = mkNumericMulAtLeastOne 0.0
     let float32MulAtLeastOne = mkNumericMulAtLeastOne 0f
 
-    let mask<'a, 'b when 'a: struct and 'b: struct> =
-        <@ fun (left: 'a option) (right: 'b option) value ->
-            match left, right with
-            | _, None -> left
-            | _ -> Some value @>
-
-    let maskAtLeastOne<'a, 'b when 'a: struct and 'b: struct> =
-        <@ fun (pair: AtLeastOne<'a, 'b>) value ->
-            match pair with
-            | Left left -> Some left
-            | _ -> Some value @>
-
-    let complementedMask<'a, 'b when 'a: struct and 'b: struct> =
-        <@ fun (left: 'a option) (right: 'b option) value ->
-            match left, right with
-            | _, Some _ -> left
-            | _ -> Some value @>
-
-    let atLeastOneToNormalForm op =
+    let atLeastOneToOption op =
         <@ fun (leftItem: 'a option) (rightItem: 'b option) ->
             match leftItem, rightItem with
             | Some left, Some right -> (%op) (Both(left, right))
             | None, Some right -> (%op) (Right right)
             | Some left, None -> (%op) (Left left)
             | None, None -> None @>
 
-    let fillSubVectorAtLeastOneToNormalForm op =
+    let fillSubToOption (op: Expr<'a option -> 'a option -> 'a option>) =
         <@ fun (leftItem: 'a option) (rightItem: 'b option) (value: 'a) ->
-            match leftItem, rightItem with
-            | Some left, Some right -> (%op) (Both(left, right)) value
-            | None, Some right -> (%op) (Right right) value
-            | Some left, None -> (%op) (Left left) value
-            | None, None -> None @>
+            match rightItem with
+            | Some _ -> (%op) leftItem (Some value)
+            | None -> (%op) leftItem None @>
+
+    let fillSubComplementedToOption (op: Expr<'a option -> 'a option -> 'a option>) =
+        <@ fun (leftItem: 'a option) (rightItem: 'b option) (value: 'a) ->
+            match rightItem with
+            | Some _ -> (%op) leftItem None
+            | None -> (%op) leftItem (Some value) @>
+
+    let mask<'a when 'a: struct> =
+        <@ fun (left: 'a option) (right: 'a option) ->
+            match left, right with
+            | _, None -> left
+            | _ -> right @>

src/GraphBLAS-sharp.Backend/Vector/DenseVector/DenseVector.fs

@@ -46,7 +46,7 @@ module DenseVector =
             resultVector
 
     let elementWiseAtLeastOne clContext op workGroupSize =
-        elementWise clContext (StandardOperations.atLeastOneToNormalForm op) workGroupSize
+        elementWise clContext (StandardOperations.atLeastOneToOption op) workGroupSize
 
     let fillSubVector<'a, 'b when 'a: struct and 'b: struct>
         (clContext: ClContext)
@@ -87,9 +87,6 @@ module DenseVector =
 
             resultVector
 
-    let fillSubVectorAtLeasOne clContext opAdd workGroupSize =
-        fillSubVector clContext (StandardOperations.fillSubVectorAtLeastOneToNormalForm opAdd) workGroupSize
-
     let private getBitmap<'a when 'a: struct> (clContext: ClContext) (workGroupSize: int) =
 
         let getPositions =

src/GraphBLAS-sharp.Backend/Vector/SparseVector/SparseVector.fs

@@ -218,7 +218,7 @@ module SparseVector =
         (opAdd: Expr<AtLeastOne<'a, 'b> -> 'c option>)
         (workGroupSize: int)
         =
-        elementWise clContext (StandardOperations.atLeastOneToNormalForm opAdd) workGroupSize
+        elementWise clContext (StandardOperations.atLeastOneToOption opAdd) workGroupSize
 
     let private preparePositionsFillSubVector<'a, 'b when 'a: struct and 'b: struct>
         (clContext: ClContext)
@@ -309,9 +309,6 @@ module SparseVector =
               Indices = resultIndices
               Size = max leftVector.Size rightVector.Size }
 
-    let fillSubVectorAtLeastOne (clContext: ClContext) opAdd (workGroupSize: int) =
-        fillSubVector clContext (StandardOperations.fillSubVectorAtLeastOneToNormalForm opAdd) workGroupSize
-
     let toDense (clContext: ClContext) (workGroupSize: int) =
 
         let toDense =

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

@@ -118,12 +118,12 @@ module Vector =
             | ClVectorSparse left, ClVectorSparse right -> ClVectorSparse <| addSparse processor left right
             | _ -> failwith "Vector formats are not matching."
 
-    let fillSubVector (clContext: ClContext) maskOp (workGroupSize: int) =
+    let fillSubVector<'a, 'b when 'a: struct and 'b: struct> maskOp (clContext: ClContext) (workGroupSize: int) =
         let sparseFillVector =
-            SparseVector.fillSubVector clContext maskOp workGroupSize
+            SparseVector.fillSubVector clContext (StandardOperations.fillSubToOption maskOp) workGroupSize
 
         let denseFillVector =
-            DenseVector.fillSubVector clContext maskOp workGroupSize
+            DenseVector.fillSubVector clContext (StandardOperations.fillSubToOption maskOp) workGroupSize
 
         let toSparseVector =
             DenseVector.toSparse clContext workGroupSize
@@ -150,9 +150,13 @@ module Vector =
                 ClVectorDense
                 <| denseFillVector processor vector mask value
 
-    let fillSubVectorComplemented (clContext: ClContext) maskOp (workGroupSize: int) =
+    let fillSubVectorComplemented<'a, 'b when 'a: struct and 'b: struct>
+        maskOp
+        (clContext: ClContext)
+        (workGroupSize: int)
+        =
         let denseFillVector =
-            DenseVector.fillSubVector clContext maskOp workGroupSize
+            DenseVector.fillSubVector clContext (StandardOperations.fillSubComplementedToOption maskOp) workGroupSize
 
         let vectorToDense =
             SparseVector.toDense clContext workGroupSize
@@ -182,6 +186,12 @@ module Vector =
                 ClVectorDense
                 <| denseFillVector processor vector mask value
 
+    let standardFillSubVector<'a, 'b when 'a: struct and 'b: struct> =
+        fillSubVector<'a, 'b> StandardOperations.mask<'a>
+
+    let standardFillSubVectorComplemented<'a, 'b when 'a: struct and 'b: struct> =
+        fillSubVectorComplemented<'a, 'b> StandardOperations.mask<'a>
+
     let reduce (clContext: ClContext) (workGroupSize: int) (opAdd: Expr<'a -> 'a -> 'a>) =
         let sparseReduce =
             SparseVector.reduce clContext workGroupSize opAdd

tests/GraphBLAS-sharp.Tests/Vector/FillSubVector.fs

@@ -124,7 +124,7 @@ let testFixtures case =
     let isComplemented = false
 
     [ let intFill =
-          Vector.fillSubVector context StandardOperations.mask wgSize
+          Vector.standardFillSubVector context wgSize
 
       let intToCoo = Vector.toSparse context wgSize
 
@@ -133,7 +133,7 @@ let testFixtures case =
       |> testPropertyWithConfig config (getCorrectnessTestName "int")
 
       let floatFill =
-          Vector.fillSubVector context StandardOperations.mask wgSize
+          Vector.standardFillSubVector context wgSize
 
       let floatToCoo = Vector.toSparse context wgSize
 
@@ -142,7 +142,7 @@ let testFixtures case =
       |> testPropertyWithConfig config (getCorrectnessTestName "float")
 
       let byteFill =
-          Vector.fillSubVector context StandardOperations.mask wgSize
+          Vector.standardFillSubVector context wgSize
 
       let byteToCoo = Vector.toSparse context wgSize
 
@@ -151,7 +151,7 @@ let testFixtures case =
       |> testPropertyWithConfig config (getCorrectnessTestName "byte")
 
       let boolFill =
-          Vector.fillSubVector context StandardOperations.mask wgSize
+          Vector.standardFillSubVector context wgSize
 
       let boolToCoo = Vector.toSparse context wgSize
 
@@ -177,7 +177,7 @@ let testFixturesComplemented case =
     let isComplemented = true
 
     [ let intFill =
-          Vector.fillSubVectorComplemented context StandardOperations.complementedMask wgSize
+          Vector.standardFillSubVectorComplemented context wgSize
 
       let intToCoo = Vector.toSparse context wgSize
 
@@ -186,7 +186,7 @@ let testFixturesComplemented case =
       |> testPropertyWithConfig config (getCorrectnessTestName "int")
 
       let floatFill =
-          Vector.fillSubVectorComplemented context StandardOperations.complementedMask wgSize
+          Vector.standardFillSubVectorComplemented context wgSize
 
       let floatToCoo = Vector.toSparse context wgSize
 
@@ -195,7 +195,7 @@ let testFixturesComplemented case =
       |> testPropertyWithConfig config (getCorrectnessTestName "float")
 
       let byteFill =
-          Vector.fillSubVectorComplemented context StandardOperations.complementedMask wgSize
+          Vector.standardFillSubVectorComplemented context wgSize
 
       let byteToCoo = Vector.toSparse context wgSize
 
@@ -204,7 +204,7 @@ let testFixturesComplemented case =
       |> testPropertyWithConfig config (getCorrectnessTestName "byte")
 
       let boolFill =
-          Vector.fillSubVectorComplemented context StandardOperations.complementedMask wgSize
+          Vector.standardFillSubVectorComplemented context wgSize
 
       let boolToCoo = Vector.toSparse context wgSize