refactor: tests, binSearch

Author: artemiipatov

src/GraphBLAS-sharp.Backend/GraphBLAS-sharp.Backend.fsproj

@@ -26,6 +26,7 @@
     <Compile Include="Quotes/PreparePositions.fs" />
     <Compile Include="Quotes/Predicates.fs" />
     <Compile Include="Quotes/Map.fs" />
+    <Compile Include="Quotes\BinSearch.fs" />
     <Compile Include="Common/Scatter.fs" />
     <Compile Include="Common/Utils.fs" />
     <Compile Include="Common/Sum.fs" />

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

@@ -2,18 +2,19 @@
 
 open Brahma.FSharp
 open GraphBLAS.FSharp.Backend.Matrix
+open GraphBLAS.FSharp.Backend.Quotes
 open Microsoft.FSharp.Quotations
 open GraphBLAS.FSharp.Backend.Objects
 open GraphBLAS.FSharp.Backend
 open GraphBLAS.FSharp.Backend.Objects.ClMatrix
 open GraphBLAS.FSharp.Backend.Objects.ClContext
 
 
-module Map =
+module internal Map =
     let preparePositions<'a, 'b> (clContext: ClContext) workGroupSize opAdd =
 
         let preparePositions (op: Expr<'a option -> 'b option>) =
-            <@ fun (ndRange: Range1D) rowCount columnCount valuesLength (values: ClArray<'a>) (rowPointers: ClArray<int>) (columns: ClArray<int>) (resultBitmap: ClArray<int>) (resultValues: ClArray<'b>) (resultRows: ClArray<int>) (resultColumns: ClArray<int>) ->
+            <@ fun (ndRange: Range1D) rowCount columnCount valuesLength (values: ClArray<'a>) (rows: ClArray<int>) (columns: ClArray<int>) (resultBitmap: ClArray<int>) (resultValues: ClArray<'b>) (resultRows: ClArray<int>) (resultColumns: ClArray<int>) ->
 
                 let gid = ndRange.GlobalID0
 
@@ -26,7 +27,7 @@ module Map =
                         (uint64 rowIndex <<< 32) ||| (uint64 columnIndex)
 
                     let value =
-                        (%Map2.binSearch) valuesLength index rowPointers columns values
+                        (%BinSearch.searchCOO) valuesLength index rows columns values
 
                     match (%op) value with
                     | Some resultValue ->
@@ -37,7 +38,6 @@ module Map =
                         resultBitmap.[gid] <- 1
                     | None -> resultBitmap.[gid] <- 0 @>
 
-
         let kernel =
             clContext.Compile <| preparePositions opAdd
 
@@ -83,7 +83,6 @@ module Map =
 
             resultBitmap, resultValues, resultRows, resultColumns
 
-
     let run<'a, 'b when 'a: struct and 'b: struct and 'b: equality>
         (clContext: ClContext)
         (opAdd: Expr<'a option -> 'b option>)

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

@@ -5,36 +5,11 @@ open GraphBLAS.FSharp.Backend.Matrix
 open Microsoft.FSharp.Quotations
 open GraphBLAS.FSharp.Backend.Objects
 open GraphBLAS.FSharp.Backend
+open GraphBLAS.FSharp.Backend.Quotes
 open GraphBLAS.FSharp.Backend.Objects.ClMatrix
 open GraphBLAS.FSharp.Backend.Objects.ClContext
 
 module internal Map2 =
-    let binSearch<'a> =
-        <@ fun lenght sourceIndex (rowIndices: ClArray<int>) (columnIndices: ClArray<int>) (values: ClArray<'a>) ->
-
-            let mutable leftEdge = 0
-            let mutable rightEdge = lenght - 1
-
-            let mutable result = None
-
-            while leftEdge <= rightEdge do
-                let middleIdx = (leftEdge + rightEdge) / 2
-
-                let currentIndex: uint64 =
-                    ((uint64 rowIndices.[middleIdx]) <<< 32)
-                    ||| (uint64 columnIndices.[middleIdx])
-
-                if sourceIndex = currentIndex then
-                    result <- Some values.[middleIdx]
-
-                    rightEdge <- -1 // TODO() break
-                elif sourceIndex < currentIndex then
-                    rightEdge <- middleIdx - 1
-                else
-                    leftEdge <- middleIdx + 1
-
-            result @>
-
     let preparePositions<'a, 'b, 'c> (clContext: ClContext) workGroupSize opAdd =
 
         let preparePositions (op: Expr<'a option -> 'b option -> 'c option>) =
@@ -51,10 +26,10 @@ module internal Map2 =
                         (uint64 rowIndex <<< 32) ||| (uint64 columnIndex)
 
                     let leftValue =
-                        (%binSearch) leftValuesLength index leftRows leftColumns leftValues
+                        (%BinSearch.searchCOO) leftValuesLength index leftRows leftColumns leftValues
 
                     let rightValue =
-                        (%binSearch) rightValuesLength index rightRows rightColumn rightValues
+                        (%BinSearch.searchCOO) rightValuesLength index rightRows rightColumn rightValues
 
                     match (%op) leftValue rightValue with
                     | Some value ->

src/GraphBLAS-sharp.Backend/Matrix/CSRMatrix/Map.fs

@@ -3,37 +3,14 @@
 open Brahma.FSharp
 open FSharp.Quotations
 open GraphBLAS.FSharp.Backend
+open GraphBLAS.FSharp.Backend.Quotes
 open GraphBLAS.FSharp.Backend.Matrix
 open GraphBLAS.FSharp.Backend.Matrix.COO
 open GraphBLAS.FSharp.Backend.Objects
 open GraphBLAS.FSharp.Backend.Objects.ClMatrix
 open GraphBLAS.FSharp.Backend.Objects.ClContext
 
-module Map =
-    let binSearch<'a> =
-        <@ fun startIndex nnzInRow sourceColumn (columnIndices: ClArray<int>) (values: ClArray<'a>) ->
-
-            let mutable leftEdge = startIndex
-            let mutable rightEdge = startIndex + nnzInRow - 1
-
-            let mutable result = None
-
-            while leftEdge <= rightEdge do
-                let middleIdx = (leftEdge + rightEdge) / 2
-
-                let currentColumn = columnIndices.[middleIdx]
-
-                if sourceColumn = currentColumn then
-                    result <- Some values.[middleIdx]
-
-                    rightEdge <- -1 // TODO() break
-                elif sourceColumn < currentColumn then
-                    rightEdge <- middleIdx - 1
-                else
-                    leftEdge <- middleIdx + 1
-
-            result @>
-
+module internal Map =
     let preparePositions<'a, 'b> (clContext: ClContext) workGroupSize opAdd =
 
         let preparePositions (op: Expr<'a option -> 'b option>) =
@@ -46,12 +23,11 @@ module Map =
                     let columnIndex = gid % columnCount
                     let rowIndex = gid / columnCount
 
-                    let nnzInRow =
-                        rowPointers.[rowIndex + 1]
-                        - rowPointers.[rowIndex]
+                    let startIndex = rowPointers.[rowIndex]
+                    let lastIndex = rowPointers.[rowIndex + 1] - 1
 
                     let value =
-                        (%binSearch) rowPointers.[rowIndex] nnzInRow columnIndex columns values
+                        (%BinSearch.searchInRange) startIndex lastIndex columnIndex columns values
 
                     match (%op) value with
                     | Some resultValue ->
@@ -106,7 +82,6 @@ module Map =
 
             resultBitmap, resultValues, resultRows, resultColumns
 
-
     let runToCOO<'a, 'b when 'a: struct and 'b: struct and 'b: equality>
         (clContext: ClContext)
         (opAdd: Expr<'a option -> 'b option>)
@@ -145,11 +120,11 @@ module Map =
         workGroupSize
         =
 
-        let elementwiseToCOO = runToCOO clContext opAdd workGroupSize
+        let mapToCOO = runToCOO clContext opAdd workGroupSize
 
         let toCSRInplace =
             Matrix.toCSRInplace clContext workGroupSize
 
         fun (queue: MailboxProcessor<_>) allocationMode (matrix: ClMatrix.CSR<'a>) ->
-            elementwiseToCOO queue allocationMode matrix
+            mapToCOO queue allocationMode matrix
             |> toCSRInplace queue allocationMode

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

@@ -3,6 +3,16 @@
 open GraphBLAS.FSharp.Backend.Objects
 
 module ArithmeticOperations =
+    let inline mkOpWithConst zero op constant =
+        <@ fun x ->
+          let mutable res = zero
+
+          match x with
+          | Some v -> res <- (op v constant)
+          | None -> res <- constant
+
+          if res = zero then None else Some res @>
+
     let inline mkNumericSum zero =
         <@ fun (x: 't option) (y: 't option) ->
             let mutable res = zero
@@ -98,3 +108,9 @@ module ArithmeticOperations =
     let byteMulAtLeastOne = mkNumericMulAtLeastOne 0uy
     let floatMulAtLeastOne = mkNumericMulAtLeastOne 0.0
     let float32MulAtLeastOne = mkNumericMulAtLeastOne 0f
+
+    let notQ =
+        <@ fun x ->
+            match x with
+            | Some true -> None
+            | _ -> Some true @>

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

@@ -0,0 +1,55 @@
+namespace GraphBLAS.FSharp.Backend.Quotes
+
+open Brahma.FSharp
+
+module BinSearch =
+    let searchInRange<'a> =
+        <@ fun leftEdge rightEdge sourceIndex (indices: ClArray<int>) (values: ClArray<'a>) ->
+
+            let mutable leftEdge = leftEdge
+            let mutable rightEdge = rightEdge
+
+            let mutable result = None
+
+            while leftEdge <= rightEdge do
+                let middleIdx = (leftEdge + rightEdge) / 2
+
+                let currentColumn = indices.[middleIdx]
+
+                if sourceIndex = currentColumn then
+                    result <- Some values.[middleIdx]
+
+                    rightEdge <- -1 // TODO() break
+                elif sourceIndex < currentColumn then
+                    rightEdge <- middleIdx - 1
+                else
+                    leftEdge <- middleIdx + 1
+
+            result @>
+
+    let searchCOO<'a> =
+        <@ fun lenght sourceIndex (rowIndices: ClArray<int>) (columnIndices: ClArray<int>) (values: ClArray<'a>) ->
+
+            let mutable leftEdge = 0
+            let mutable rightEdge = lenght - 1
+
+            let mutable result = None
+
+            while leftEdge <= rightEdge do
+                let middleIdx = (leftEdge + rightEdge) / 2
+
+                let currentIndex: uint64 =
+                    ((uint64 rowIndices.[middleIdx]) <<< 32)
+                    ||| (uint64 columnIndices.[middleIdx])
+
+                if sourceIndex = currentIndex then
+                    result <- Some values.[middleIdx]
+
+                    rightEdge <- -1 // TODO() break
+                elif sourceIndex < currentIndex then
+                    rightEdge <- middleIdx - 1
+                else
+                    leftEdge <- middleIdx + 1
+
+            result @>
+

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

@@ -5,6 +5,7 @@ open Expecto.Logging
 open Expecto.Logging.Message
 open Microsoft.FSharp.Collections
 open GraphBLAS.FSharp.Backend
+open GraphBLAS.FSharp.Backend.Quotes
 open GraphBLAS.FSharp.Backend.Matrix
 open GraphBLAS.FSharp.Backend.Objects
 open GraphBLAS.FSharp.Backend.Objects.ClContext
@@ -105,13 +106,7 @@ let testFixturesMapNot case =
       let q = case.TestContext.Queue
       q.Error.Add(fun e -> failwithf "%A" e)
 
-      let notQ =
-          <@ fun x ->
-              match x with
-              | Some true -> None
-              | _ -> Some true @>
-
-      createTestMap case false not (=) notQ Matrix.map ]
+      createTestMap case false not (=) ArithmeticOperations.notQ Matrix.map ]
 
 let notTests =
     operationGPUTests "Backend.Matrix.map not tests" testFixturesMapNot
@@ -121,35 +116,9 @@ let testFixturesMapAdd case =
       let q = case.TestContext.Queue
       q.Error.Add(fun e -> failwithf "%A" e)
 
-      let addFloat64Q =
-          <@ fun x ->
-              let mutable res = 0.0
-
-              match x with
-              | Some v -> res <- (v + 10.0)
-              | None -> res <- 10.0
-
-              if res = 0.0 then None else Some res @>
-
-      let addFloat32Q =
-          <@ fun x ->
-              let mutable res = 0.0f
-
-              match x with
-              | Some v -> res <- (v + 10.0f)
-              | None -> res <- 10.0f
-
-              if res = 0.0f then None else Some res @>
-
-      let addByte =
-          <@ fun x ->
-              let mutable res = 0uy
-
-              match x with
-              | Some v -> res <- (v + 10uy)
-              | None -> res <- 10uy
-
-              if res = 0uy then None else Some res @>
+      let addFloat64Q = ArithmeticOperations.mkOpWithConst 0.0 (+) 10.0
+      let addFloat32Q = ArithmeticOperations.mkOpWithConst 0.0f (+) 10.0f
+      let addByte = ArithmeticOperations.mkOpWithConst 0uy (+) 10uy
 
       if Utils.isFloat64Available context.ClDevice then
           createTestMap case 0.0 ((+) 10.0) Utils.floatIsEqual addFloat64Q Matrix.map
@@ -165,36 +134,9 @@ let testFixturesMapMul case =
       let q = case.TestContext.Queue
       q.Error.Add(fun e -> failwithf "%A" e)
 
-      let mulFloat64Q =
-          <@ fun x ->
-              let mutable res = 0.0
-
-              match x with
-              | Some v -> res <- (v * 10.0)
-              | _ -> ()
-
-              if res = 0.0 then None else Some res @>
-
-      let mulFloat32Q =
-          <@ fun x ->
-              let mutable res = 0.0f
-
-              match x with
-              | Some v -> res <- (v * 10.0f)
-              | _ -> ()
-
-              if res = 0.0f then None else Some res @>
-
-
-      let mulByte =
-          <@ fun x ->
-              let mutable res = 0uy
-
-              match x with
-              | Some v -> res <- (v * 10uy)
-              | _ -> ()
-
-              if res = 0uy then None else Some res @>
+      let mulFloat64Q = ArithmeticOperations.mkOpWithConst 0.0 (*) 10.0
+      let mulFloat32Q = ArithmeticOperations.mkOpWithConst 0.0f (*) 10.0f
+      let mulByte = ArithmeticOperations.mkOpWithConst 0uy (*) 10uy
 
       if Utils.isFloat64Available context.ClDevice then
           createTestMap case 0.0 ((*) 10.0) Utils.floatIsEqual mulFloat64Q Matrix.map