refactor: merge min max

Author: IgorErin

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

@@ -136,9 +136,7 @@ module PrefixSum =
 
     let private scanExclusive<'a when 'a: struct> =
         scanGeneral
-            <@ fun (a: ClArray<'a>) (b: 'a) (c: int) (d: int) (e: int) ->
-
-                () @>
+            <@ fun (_: ClArray<'a>) (_: 'a) (_: int) (_: int) (_: int) -> () @>
             <@ fun (resultBuffer: ClArray<'a>) (resultLocalBuffer: 'a []) (inputArrayLength: int) (smth: int) (gid: int) (i: int) (localID: int) ->
 
                 if gid < inputArrayLength then

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

@@ -108,12 +108,11 @@ module COOMatrix =
                     let diagonalNumber = x
 
                     let mutable leftEdge = diagonalNumber + 1 - secondSide
-                    if leftEdge < 0 then leftEdge <- 0
+                    leftEdge <- max 0 leftEdge
 
                     let mutable rightEdge = firstSide - 1
 
-                    if rightEdge > diagonalNumber then // TODO()
-                        rightEdge <- diagonalNumber
+                    rightEdge <- min diagonalNumber rightEdge
 
                     while leftEdge <= rightEdge do
                         let middleIdx = (leftEdge + rightEdge) / 2
@@ -169,12 +168,11 @@ module COOMatrix =
 
                 if i < sumOfSides then
                     let mutable leftEdge = localID + 1 - secondLocalLength
-                    if leftEdge < 0 then leftEdge <- 0
+                    leftEdge <- max 0 leftEdge
 
                     let mutable rightEdge = firstLocalLength - 1
 
-                    if rightEdge > localID then // TODO()
-                        rightEdge <- localID
+                    rightEdge <- min localID rightEdge
 
                     while leftEdge <= rightEdge do
                         let middleIdx = (leftEdge + rightEdge) / 2

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

@@ -3,7 +3,6 @@ namespace GraphBLAS.FSharp.Backend.Matrix.CSR
 open System
 open Brahma.FSharp
 open GraphBLAS.FSharp.Backend.Common
-open GraphBLAS.FSharp.Backend.Predefined
 open Microsoft.FSharp.Quotations
 
 module internal Elementwise =
@@ -84,7 +83,7 @@ module internal Elementwise =
         let localArraySize = workGroupSize + 2
 
         let merge =
-            <@ fun (ndRange: Range1D) rows (firstRowPointers: ClArray<int>) (firstColumns: ClArray<int>) (firstValues: ClArray<'a>) (secondRowPointers: ClArray<int>) (secondColumns: ClArray<int>) (secondValues: ClArray<'b>) (allRows: ClArray<int>) (allColumns: ClArray<int>) (leftMergedValues: ClArray<'a>) (rightMergedValues: ClArray<'b>) (isEndOfRowBitmap: ClArray<int>) (isLeftBitmap: ClArray<int>) ->
+            <@ fun (ndRange: Range1D) (firstRowPointers: ClArray<int>) (firstColumns: ClArray<int>) (firstValues: ClArray<'a>) (secondRowPointers: ClArray<int>) (secondColumns: ClArray<int>) (secondValues: ClArray<'b>) (allRows: ClArray<int>) (allColumns: ClArray<int>) (leftMergedValues: ClArray<'a>) (rightMergedValues: ClArray<'b>) (isEndOfRowBitmap: ClArray<int>) (isLeftBitmap: ClArray<int>) ->
 
                 let globalID = ndRange.GlobalID0
                 let localID = ndRange.LocalID0
@@ -299,7 +298,6 @@ module internal Elementwise =
                     (fun () ->
                         kernel.KernelFunc
                             ndRange
-                            (matrixLeftRowPointers.Length - 1)
                             matrixLeftRowPointers
                             matrixLeftColumns
                             matrixLeftValues

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

@@ -1,4 +1,4 @@
-module GraphBLAS.FSharp.Backend.Matrix
+namespace GraphBLAS.FSharp.Backend.Matrix
 
 open Brahma.FSharp
 open GraphBLAS.FSharp.Backend.Common

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

@@ -21,12 +21,11 @@ module Elementwise =
                 let diagonalNumber = x
 
                 let mutable leftEdge = diagonalNumber + 1 - secondSide
-                if leftEdge < 0 then leftEdge <- 0
+                leftEdge <- max 0 leftEdge
 
                 let mutable rightEdge = firstSide - 1
 
-                if rightEdge > diagonalNumber then
-                    rightEdge <- diagonalNumber
+                rightEdge <- min rightEdge diagonalNumber
 
                 while leftEdge <= rightEdge do
                     let middleIdx = (leftEdge + rightEdge) / 2
@@ -76,8 +75,7 @@ module Elementwise =
 
                 let mutable rightEdge = firstLocalLength - 1
 
-                if rightEdge > localID then
-                    rightEdge <- localID
+                rightEdge <- min rightEdge localID
 
                 while leftEdge <= rightEdge do
                     let middleIdx = (leftEdge + rightEdge) / 2

tests/GraphBLAS-sharp.Tests/Program.fs

@@ -16,16 +16,14 @@ let matrixTests =
 let commonTests =
     testList
         "Common tests"
-          [
-        // [ Common.BitonicSort.tests
-        //   Common.PrefixSum.tests
-        //   Common.Scatter.tests
+        [ Common.BitonicSort.tests
+          Common.PrefixSum.tests
+          Common.Scatter.tests
           Common.RemoveDuplicates.tests
-          // Common.Copy.tests
-          // Common.Replicate.tests
-          // Common.Reduce.tests
-          // Common.Sum.tests ]
-        ]
+          Common.Copy.tests
+          Common.Replicate.tests
+          Common.Reduce.tests
+          Common.Sum.tests ]
     |> testSequenced
 
 let vectorTests =
@@ -55,10 +53,9 @@ let allTests =
     testList
         "All tests"
         [ commonTests
-          //matrixTests
-          //vectorTests
-          //algorithmsTests ]
-            ]
+          matrixTests
+          vectorTests
+          algorithmsTests ]
     |> testSequenced
 
 [<EntryPoint>]