Option.map

Author: kirillgarbar

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

@@ -236,36 +236,40 @@ module SpMSpV =
             Reduce.ByKey.Option.segmentSequential add clContext workGroupSize
 
         fun (queue: MailboxProcessor<_>) (matrix: ClMatrix.CSR<'a>) (vector: ClVector.Sparse<'b>) ->
+            let result =
+                gather queue matrix vector
+                |> Option.map
+                    (fun (gatherRows, gatherIndices, gatherValues) ->
+                        sort queue gatherIndices gatherRows gatherValues
 
-            match gather queue matrix vector with
-            | None -> None
-            | Some (gatherRows, gatherIndices, gatherValues) ->
-                sort queue gatherIndices gatherRows gatherValues
+                        let sortedRows, sortedIndices, sortedValues = gatherRows, gatherIndices, gatherValues
 
-                let sortedRows, sortedIndices, sortedValues = gatherRows, gatherIndices, gatherValues
+                        let multipliedValues =
+                            multiplyScalar queue sortedRows sortedValues vector
 
-                let multipliedValues =
-                    multiplyScalar queue sortedRows sortedValues vector
+                        sortedValues.Free queue
+                        sortedRows.Free queue
 
-                sortedValues.Free queue
-                sortedRows.Free queue
+                        let result =
+                            segReduce queue DeviceOnly sortedIndices multipliedValues
+                            |> Option.map
+                                (fun (reducedValues, reducedKeys) ->
 
-                match segReduce queue DeviceOnly sortedIndices multipliedValues with
-                | Some (reducedValues, reducedKeys) ->
-                    multipliedValues.Free queue
-                    sortedIndices.Free queue
+                                    { Context = clContext
+                                      Indices = reducedKeys
+                                      Values = reducedValues
+                                      Size = matrix.ColumnCount })
 
-                    Some(
-                        { Context = clContext
-                          Indices = reducedKeys
-                          Values = reducedValues
-                          Size = matrix.ColumnCount }
-                    )
-                | None ->
-                    multipliedValues.Free queue
-                    sortedIndices.Free queue
+                        multipliedValues.Free queue
+                        sortedIndices.Free queue
+
+                        result)
+
+            //Unwrap 't option option to 't option
+            match result with
+            | Some result -> result
+            | None -> None
 
-                    None
 
     let runBoolStandard
         (add: Expr<'c option -> 'c option -> 'c option>)
@@ -286,22 +290,20 @@ module SpMSpV =
 
         fun (queue: MailboxProcessor<_>) (matrix: ClMatrix.CSR<'a>) (vector: ClVector.Sparse<'b>) ->
 
-            match gather queue matrix vector with
-            | None -> None
-            | Some (gatherRows, gatherIndices, gatherValues) ->
-                gatherRows.Free queue
-                gatherValues.Free queue
+            gather queue matrix vector
+            |> Option.map
+                (fun (gatherRows, gatherIndices, gatherValues) ->
+                    gatherRows.Free queue
+                    gatherValues.Free queue
 
-                let sortedIndices = sort queue gatherIndices
+                    let sortedIndices = sort queue gatherIndices
 
-                let resultIndices = removeDuplicates queue sortedIndices
+                    let resultIndices = removeDuplicates queue sortedIndices
 
-                gatherIndices.Free queue
-                sortedIndices.Free queue
+                    gatherIndices.Free queue
+                    sortedIndices.Free queue
 
-                Some(
                     { Context = clContext
                       Indices = resultIndices
                       Values = create queue DeviceOnly resultIndices.Length true
-                      Size = matrix.ColumnCount }
-                )
+                      Size = matrix.ColumnCount })

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

@@ -6,6 +6,7 @@ open Microsoft.FSharp.Control
 open GraphBLAS.FSharp.Backend.Objects
 open GraphBLAS.FSharp.Backend.Objects.ClVector
 open GraphBLAS.FSharp.Backend.Objects.ClContext
+open GraphBLAS.FSharp.Backend.Objects.ArraysExtensions
 open GraphBLAS.FSharp.Backend.Quotes
 
 module internal Map2 =
@@ -180,24 +181,20 @@ module internal Map2 =
             let bitmap, allValues, allIndices =
                 prepare processor leftVector.NNZ leftVector.Values leftVector.Indices rightVector
 
-            match setPositions processor allocationMode allValues allIndices bitmap with
-            | Some (resultValues, resultIndices) ->
-
-                processor.Post(Msg.CreateFreeMsg<_>(allIndices))
-                processor.Post(Msg.CreateFreeMsg<_>(allValues))
-                processor.Post(Msg.CreateFreeMsg<_>(bitmap))
-
-                Some(
-                    { Context = clContext
-                      Values = resultValues
-                      Indices = resultIndices
-                      Size = leftVector.Size }
-                )
-            | None ->
-                processor.Post(Msg.CreateFreeMsg<_>(allIndices))
-                processor.Post(Msg.CreateFreeMsg<_>(allValues))
-                processor.Post(Msg.CreateFreeMsg<_>(bitmap))
-                None
+            let result =
+                setPositions processor allocationMode allValues allIndices bitmap
+                |> Option.map
+                    (fun (resultValues, resultIndices) ->
+                        { Context = clContext
+                          Values = resultValues
+                          Indices = resultIndices
+                          Size = leftVector.Size })
+
+            allIndices.Free processor
+            allValues.Free processor
+            bitmap.Free processor
+
+            result
 
     let private preparePositionsAssignByMask<'a, 'b when 'a: struct and 'b: struct>
         op

tests/GraphBLAS-sharp.Tests/Backend/Algorithms/SSSP.fs

@@ -39,11 +39,7 @@ let testFixtures (testContext: TestContext) =
 
               let expected =
                   SSSP.runUndirected matrix (directedFromArray2D matrix 0) source
-                  |> Array.map
-                      (fun x ->
-                          match x with
-                          | Some x -> Some(int x)
-                          | None -> None)
+                  |> Array.map (Option.map int)
 
               let matrixHost =
                   Utils.createMatrixFromArray2D CSR matrix ((=) 0)