Merge branch 'dev' into vector

Author: IgorErin

benchmarks/GraphBLAS-sharp.Benchmarks/Helpers.fs

@@ -14,6 +14,7 @@ open BenchmarkDotNet.Jobs
 open GraphBLAS.FSharp.Tests
 open FsCheck
 open Expecto
+open GraphBLAS.FSharp.Test
 
 type CommonConfig() =
     inherit ManualConfig()
@@ -258,7 +259,7 @@ module Utils =
 module VectorGenerator =
     let private pairOfVectorsOfEqualSize (valuesGenerator: Gen<'a>) createVector =
         gen {
-            let! length = Gen.sized <| fun size -> Gen.constant size
+            let! length = Gen.sized <| Gen.constant
 
             let! leftArray = Gen.arrayOfLength length valuesGenerator
 

docsTool/templates/nav.fs

@@ -48,17 +48,16 @@ let navItemIconOnly link ariaLabel inner =
     ]
 
 let dropDownNavMenu text items =
-            li [ Class "nav-item dropdown" ][
-                a [
-                    Id (sprintf "navbarDropdown-%s"  text)
-                    Href "#"
-                    DataToggle "dropdown"
-                    AriaHasPopup true
-                    AriaExpanded false
-                    Class "nav-link dropdown-toggle" ]
-                    [ normalizeStr text ]
-                ul [    HTMLAttr.Custom ("aria-labelledby", "dropdownMenu1")
-                        Class "dropdown-menu border-0 shadow" ] items ]
+    li [ Class "nav-item dropdown" ] [
+        a [ Id (sprintf "navbarDropdown-%s"  text)
+            Href "#"
+            DataToggle "dropdown"
+            AriaHasPopup true
+            AriaExpanded false
+            Class "nav-link dropdown-toggle" ]
+            [ normalizeStr text ]
+        ul [ HTMLAttr.Custom ("aria-labelledby", "dropdownMenu1")
+             Class "dropdown-menu border-0 shadow" ] items ]
 
 let dropDownNavItem text link =
     li [

paket.lock

@@ -1,7 +1,5 @@
 namespace GraphBLAS.FSharp.Backend.Common
 
-open Brahma.FSharp
-
 module internal Utils =
     let defaultWorkGroupSize = 32
 

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

@@ -42,5 +42,3 @@ module Common =
             valuesScatter processor positions allValues resultValues
 
             resultRows, resultColumns, resultValues, resultLength
-
-

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

@@ -23,4 +23,3 @@ module Convert =
             match rightItem with
             | Some _ -> (%op) leftItem None
             | None -> (%op) leftItem (Some value) @>
-

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

@@ -35,4 +35,3 @@ module SubSum =
         sumGeneral<'a> <| sequentialAccess<'a> opAdd
 
     let treeSum<'a> opAdd = sumGeneral<'a> <| treeAccess<'a> opAdd
-

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

@@ -22,4 +22,3 @@ module ClVectorExtensions =
                      Values = values
                      Size = this.Size }
             | ClVector.Dense vector -> Vector.Dense <| vector.ToHost q
-

src/GraphBLAS-sharp/Objects/VectorExtensions.fs

@@ -16,7 +16,7 @@ let testFixtures (testContext: TestContext) =
     [ let config = Utils.undirectedAlgoConfig
       let context = testContext.ClContext
       let queue = testContext.Queue
-      let workGroupSize = 32
+      let workGroupSize = Utils.defaultWorkGroupSize
 
       let testName =
           sprintf "Test on %A" testContext.ClContext
@@ -40,7 +40,7 @@ let testFixtures (testContext: TestContext) =
                   |> Utils.createArrayFromDictionary (Array2D.length1 matrix) 0
 
               let matrixHost =
-                  Utils.createMatrixFromArray2D CSR matrix (fun x -> x = 0)
+                  Utils.createMatrixFromArray2D CSR matrix ((=) 0)
 
               let matrix = matrixHost.ToDevice context
 

tests/GraphBLAS-sharp.Tests/Algorithms/BFS.fs

@@ -5,82 +5,81 @@ open Expecto.Logging
 open Expecto.Logging.Message
 open GraphBLAS.FSharp.Backend.Common
 open Brahma.FSharp
-open GraphBLAS.FSharp.Tests.Utils
+open GraphBLAS.FSharp.Tests
 open GraphBLAS.FSharp.Tests.Context
 
 let logger = Log.create "BitonicSort.Tests"
 
 let context = defaultContext.ClContext
-let config = { defaultConfig with endSize = 1000000 }
 
-let wgSize = 32
+let config =
+    { Utils.defaultConfig with
+          endSize = 1000000 }
+
+let wgSize = Utils.defaultWorkGroupSize
+
 let q = defaultContext.Queue
 
 let makeTest sort (array: ('n * 'n * 'a) []) =
     if array.Length > 0 then
-        let projection (row: 'n) (col: 'n) (v: 'a) = row, col
+        let projection (row: 'n) (col: 'n) (_: 'a) = row, col
 
         logger.debug (
             eventX "Initial size is {size}"
-            >> setField "size" (sprintf "%A" array.Length)
+            >> setField "size" $"%A{array.Length}"
         )
 
         let rows, cols, vals = Array.unzip3 array
 
         use clRows = context.CreateClArray rows
-        use clCols = context.CreateClArray cols
-        use clVals = context.CreateClArray vals
+        use clColumns = context.CreateClArray cols
+        use clValues = context.CreateClArray vals
 
-        let actualRows, actualCols, actualVals =
-            sort q clRows clCols clVals
+        let actualRows, actualCols, actualValues =
+            sort q clRows clColumns clValues
 
             let rows = Array.zeroCreate<'n> clRows.Length
-            let cols = Array.zeroCreate<'n> clCols.Length
-            let vals = Array.zeroCreate<'a> clVals.Length
+            let columns = Array.zeroCreate<'n> clColumns.Length
+            let values = Array.zeroCreate<'a> clValues.Length
 
             q.Post(Msg.CreateToHostMsg(clRows, rows))
-            q.Post(Msg.CreateToHostMsg(clCols, cols))
+            q.Post(Msg.CreateToHostMsg(clColumns, columns))
 
-            q.PostAndReply(fun ch -> Msg.CreateToHostMsg(clVals, vals, ch))
+            q.PostAndReply(fun ch -> Msg.CreateToHostMsg(clValues, values, ch))
             |> ignore
 
-            rows, cols, vals
+            rows, columns, values
 
-        let expectedRows, expectedCols, expectedVals =
+        let expectedRows, expectedCols, expectedValues =
             (rows, cols, vals)
             |||> Array.zip3
             |> Array.sortBy ((<|||) projection)
             |> Array.unzip3
 
-        (sprintf "Row arrays should be equal. Actual is \n%A, expected \n%A, input is \n%A" actualRows expectedRows rows)
-        |> compareArrays (=) actualRows expectedRows
+        $"Row arrays should be equal. Actual is \n%A{actualRows}, expected \n%A{expectedRows}, input is \n%A{rows}"
+        |> Utils.compareArrays (=) actualRows expectedRows
 
-        (sprintf
-            "Column arrays should be equal. Actual is \n%A, expected \n%A, input is \n%A"
-            actualCols
-            expectedCols
-            cols)
-        |> compareArrays (=) actualCols expectedCols
+        $"Column arrays should be equal. Actual is \n%A{actualCols}, expected \n%A{expectedCols}, input is \n%A{cols}"
+        |> Utils.compareArrays (=) actualCols expectedCols
 
-        (sprintf
-            "Value arrays should be equal. Actual is \n%A, expected \n%A, input is \n%A"
-            actualVals
-            expectedVals
-            vals)
-        |> compareArrays (=) actualVals expectedVals
+        $"Value arrays should be equal. Actual is \n%A{actualValues}, expected \n%A{expectedValues}, input is \n%A{vals}"
+        |> Utils.compareArrays (=) actualValues expectedValues
 
 let testFixtures<'a when 'a: equality> =
-    let sort =
-        BitonicSort.sortKeyValuesInplace<int, 'a> context wgSize
-
-    makeTest sort
-    |> testPropertyWithConfig config (sprintf "Correctness on %A" typeof<'a>)
+    BitonicSort.sortKeyValuesInplace<int, 'a> context wgSize
+    |> makeTest
+    |> testPropertyWithConfig config $"Correctness on %A{typeof<'a>}"
 
 let tests =
     q.Error.Add(fun e -> failwithf "%A" e)
 
     [ testFixtures<int>
-      testFixtures<float>
+
+      if Utils.isFloat64Available context.ClDevice then
+          testFixtures<float>
+
+      testFixtures<float32>
+
       testFixtures<byte>
       testFixtures<bool> ]
     |> testList "Backend.Common.BitonicSort tests"