Scalar is represented as DU, removed extractValue and createFromArray for scalar, added exportValue for scalar

Author: artemgl

src/GraphBLAS-sharp/Algorithms/TriangleCounting.fs

@@ -13,7 +13,5 @@ module TriangleCounting =
         let! result = (matrix', transposed) ||> Matrix.mxmWithMask AddMult.int lowerTriangularMask
         let! count = result |> Matrix.reduce Add.int
 
-        do! Scalar.synchronize count
-
-        return! (Scalar.extractValue count)
+        return! (Scalar.exportValue count)
     }

src/GraphBLAS-sharp/Methods/Scalar.fs

@@ -9,9 +9,7 @@ module Scalar =
         constructors
     *)
 
-    let internal createFromArray (value: 'a[]) : GraphblasEvaluation<Scalar<'a>> = graphblas { return Scalar.FromArray(value) }
-
-    let create (value: 'a) : GraphblasEvaluation<Scalar<'a>> = createFromArray [|value|]
+    let create (value: 'a) : GraphblasEvaluation<Scalar<'a>> = graphblas { return Scalar { Value = [|value|] } }
 
     (*
         methods
@@ -20,8 +18,9 @@ module Scalar =
     let copy (scalar: Scalar<'a>) : GraphblasEvaluation<Scalar<'a>> = failwith "Not Implemented yet"
 
     let synchronize (scalar: Scalar<'a>) : GraphblasEvaluation<unit> =
-        opencl {
-            let! _ = ToHost scalar.Value
+        match scalar with
+        | Scalar s -> opencl {
+            let! _ = ToHost s.Value
 
             return ()
         }
@@ -31,9 +30,12 @@ module Scalar =
         assignment and extraction
     *)
 
-    let extractValue (scalar: Scalar<'a>) : GraphblasEvaluation<'a> = graphblas { return scalar.Value.[0] }
-
-    let internal extractArray (scalar: Scalar<'a>) : GraphblasEvaluation<'a[]> = graphblas { return scalar.Value }
+    let exportValue (scalar: Scalar<'a>) : GraphblasEvaluation<'a> =
+        match scalar with
+        | Scalar s -> graphblas {
+            do! synchronize scalar
+            return s.Value.[0]
+        }
 
     let assignValue (scalar: Scalar<'a>) (target: Scalar<'a>) : GraphblasEvaluation<unit> =
         failwith "Not Implemented yet"

src/GraphBLAS-sharp/Methods/Vector.fs

@@ -99,7 +99,8 @@ module Vector =
             if t.Size <> s.Size then
                 invalidArg "source" <| sprintf "The size of source vector must be %A. Received: %A" t.Size s.Size
 
-            if mask.IsComplemented then failwith "Not Implemented yet" else
+            if mask.IsComplemented then failwith "Not Implemented yet"
+            else
                 graphblas {
                     let! resultIndices, resultValues = AssignSubVector.run t.Indices t.Values s.Indices s.Values mask.Indices |> EvalGB.fromCl
                     t.Indices <- resultIndices
@@ -115,13 +116,12 @@ module Vector =
         failwith "Not Implemented yet"
 
     /// vec.[mask] <- value
-    let fillSubVector (mask: Mask1D) (value: Scalar<'a>) (vector: Vector<'a>) : GraphblasEvaluation<unit> =
+    let fillSubVector (mask: Mask1D) ((Scalar scalar): Scalar<'a>) (vector: Vector<'a>) : GraphblasEvaluation<unit> =
         match vector with
         | VectorCOO v ->
             if mask.IsComplemented then failwith "Not Implemented yet" else
                 graphblas {
-                    let! s = Scalar.extractArray value
-                    let! resultIndices, resultValues = FillSubVector.run v.Indices v.Values mask.Indices s |> EvalGB.fromCl
+                    let! resultIndices, resultValues = FillSubVector.run v.Indices v.Values mask.Indices scalar.Value |> EvalGB.fromCl
                     v.Indices <- resultIndices
                     v.Values <- resultValues
                 }
@@ -147,7 +147,7 @@ module Vector =
                     }
                     |> EvalGB.fromCl
 
-                return! (Scalar.createFromArray result)
+                return Scalar {Value = result}
             }
 
     let vxmWithMask (semiring: ISemiring<'a>) (mask: Mask1D) (vector: Vector<'a>) (matrix: Matrix<'a>) : GraphblasEvaluation<Vector<'a>> = failwith "Not Implemented yet"

src/GraphBLAS-sharp/Objects/Scalar.fs

@@ -1,6 +1,9 @@
 namespace GraphBLAS.FSharp
 
 type Scalar<'a when 'a : struct> =
+    | Scalar of ArrayScalar<'a>
+
+and ArrayScalar<'a> =
     {
         Value: 'a[]
     }