Spgemm

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksBFS.fs

@@ -83,7 +83,7 @@ type BFSBenchmarks<'matrixT, 'elem when 'matrixT :> IDeviceMemObject and 'elem :
         (matrix :> IDeviceMemObject).Dispose this.Processor
 
     member this.ClearResult() =
-        this.ResultVector.Dispose this.Processor
+        this.ResultVector.FreeAndWait this.Processor
 
     member this.ReadMatrix() =
         let matrixReader = this.InputMatrixReader
@@ -103,7 +103,7 @@ type BFSBenchmarks<'matrixT, 'elem when 'matrixT :> IDeviceMemObject and 'elem :
 type BFSBenchmarksWithoutDataTransfer() =
 
     inherit BFSBenchmarks<ClMatrix.CSR<int>, int>(
-        (fun context wgSize -> BFS.singleSource context ArithmeticOperations.intSum ArithmeticOperations.intMul wgSize),
+        (fun context wgSize -> BFS.singleSource context ArithmeticOperations.intSumOption ArithmeticOperations.intMulOption wgSize),
         int,
         (fun _ -> Utils.nextInt (System.Random())),
         Matrix.ToBackendCSR)

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksEWiseAdd.fs

@@ -195,7 +195,7 @@ module M =
 type EWiseAddBenchmarks4Float32COOWithoutDataTransfer() =
 
     inherit EWiseAddBenchmarksWithoutDataTransfer<ClMatrix.COO<float32>,float32>(
-        (fun context wgSize -> COO.Matrix.map2 context ArithmeticOperations.float32Sum wgSize),
+        (fun context wgSize -> COO.Matrix.map2 context ArithmeticOperations.float32SumOption wgSize),
         float32,
         (fun _ -> Utils.nextSingle (System.Random())),
         Matrix.ToBackendCOO
@@ -207,7 +207,7 @@ type EWiseAddBenchmarks4Float32COOWithoutDataTransfer() =
 type EWiseAddBenchmarks4Float32COOWithDataTransfer() =
 
     inherit EWiseAddBenchmarksWithDataTransfer<ClMatrix.COO<float32>,float32>(
-        (fun context wgSize -> COO.Matrix.map2 context ArithmeticOperations.float32Sum wgSize),
+        (fun context wgSize -> COO.Matrix.map2 context ArithmeticOperations.float32SumOption wgSize),
         float32,
         (fun _ -> Utils.nextSingle (System.Random())),
         Matrix.ToBackendCOO<float32>,
@@ -234,7 +234,7 @@ type EWiseAddBenchmarks4BoolCOOWithoutDataTransfer() =
 type EWiseAddBenchmarks4Float32CSRWithoutDataTransfer() =
 
     inherit EWiseAddBenchmarksWithoutDataTransfer<ClMatrix.CSR<float32>,float32>(
-        (fun context wgSize -> CSR.Matrix.map2 context ArithmeticOperations.float32Sum wgSize),
+        (fun context wgSize -> CSR.Matrix.map2 context ArithmeticOperations.float32SumOption wgSize),
         float32,
         (fun _ -> Utils.nextSingle (System.Random())),
         Matrix.ToBackendCSR

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksMxm.fs

@@ -229,7 +229,7 @@ module Operations =
 type MxmBenchmarks4Float32MultiplicationOnly() =
 
     inherit MxmBenchmarksMultiplicationOnly<float32>(
-        (Matrix.mxm Operations.add Operations.mult),
+        (Matrix.SpGeMM.masked Operations.add Operations.mult),
         float32,
         (fun _ -> Utils.nextSingle (System.Random())),
         (fun context matrix -> ClMatrix.CSR (Matrix.ToBackendCSR context matrix))
@@ -241,7 +241,7 @@ type MxmBenchmarks4Float32MultiplicationOnly() =
 type MxmBenchmarks4Float32WithTransposing() =
 
     inherit MxmBenchmarksWithTransposing<float32>(
-        (Matrix.mxm Operations.add Operations.mult),
+        (Matrix.SpGeMM.masked Operations.add Operations.mult),
         float32,
         (fun _ -> Utils.nextSingle (System.Random())),
         (fun context matrix -> ClMatrix.CSR (Matrix.ToBackendCSR context matrix))
@@ -253,7 +253,7 @@ type MxmBenchmarks4Float32WithTransposing() =
 type MxmBenchmarks4BoolMultiplicationOnly() =
 
     inherit MxmBenchmarksMultiplicationOnly<bool>(
-        (Matrix.mxm Operations.logicalOr Operations.logicalAnd),
+        (Matrix.SpGeMM.masked Operations.logicalOr Operations.logicalAnd),
         (fun _ -> true),
         (fun _ -> true),
         (fun context matrix -> ClMatrix.CSR (Matrix.ToBackendCSR context matrix))
@@ -265,7 +265,7 @@ type MxmBenchmarks4BoolMultiplicationOnly() =
 type MxmBenchmarks4BoolWithTransposing() =
 
     inherit MxmBenchmarksWithTransposing<bool>(
-        (Matrix.mxm Operations.logicalOr Operations.logicalAnd),
+        (Matrix.SpGeMM.masked Operations.logicalOr Operations.logicalAnd),
         (fun _ -> true),
         (fun _ -> true),
         (fun context matrix -> ClMatrix.CSR (Matrix.ToBackendCSR context matrix))
@@ -277,7 +277,7 @@ type MxmBenchmarks4BoolWithTransposing() =
 type MxmBenchmarks4Float32MultiplicationOnlyWithZerosFilter() =
 
     inherit MxmBenchmarksMultiplicationOnly<float32>(
-        (Matrix.mxm Operations.addWithFilter Operations.mult),
+        (Matrix.SpGeMM.masked Operations.addWithFilter Operations.mult),
         float32,
         (fun _ -> Utils.nextSingle (System.Random())),
         (fun context matrix -> ClMatrix.CSR (Matrix.ToBackendCSR context matrix))
@@ -289,7 +289,7 @@ type MxmBenchmarks4Float32MultiplicationOnlyWithZerosFilter() =
 type MxmBenchmarks4Float32WithTransposingWithZerosFilter() =
 
     inherit MxmBenchmarksWithTransposing<float32>(
-        (Matrix.mxm Operations.addWithFilter Operations.mult),
+        (Matrix.SpGeMM.masked Operations.addWithFilter Operations.mult),
         float32,
         (fun _ -> Utils.nextSingle (System.Random())),
         (fun context matrix -> ClMatrix.CSR (Matrix.ToBackendCSR context matrix))

benchmarks/GraphBLAS-sharp.Benchmarks/VectorEWiseAddGen.fs

@@ -159,53 +159,53 @@ type VectorEWiseBenchmarksWithDataTransfer<'elem when 'elem : struct>(
 type VectorEWiseBenchmarks4FloatSparseWithoutDataTransfer() =
 
     inherit VectorEWiseBenchmarksWithoutDataTransfer<float>(
-        (fun context -> Vector.map2 context ArithmeticOperations.floatSum),
+        (fun context -> Vector.map2 context ArithmeticOperations.floatSumOption),
         VectorGenerator.floatPair Sparse)
 
 type VectorEWiseBenchmarks4Int32SparseWithoutDataTransfer() =
 
     inherit VectorEWiseBenchmarksWithoutDataTransfer<int32>(
-        (fun context -> Vector.map2 context ArithmeticOperations.intSum),
+        (fun context -> Vector.map2 context ArithmeticOperations.intSumOption),
         VectorGenerator.intPair Sparse)
 
 /// General
 
 type VectorEWiseGeneralBenchmarks4FloatSparseWithoutDataTransfer() =
 
     inherit VectorEWiseBenchmarksWithoutDataTransfer<float>(
-        (fun context -> Vector.map2 context ArithmeticOperations.floatSum),
+        (fun context -> Vector.map2 context ArithmeticOperations.floatSumOption),
         VectorGenerator.floatPair Sparse)
 
 type VectorEWiseGeneralBenchmarks4Int32SparseWithoutDataTransfer() =
 
     inherit VectorEWiseBenchmarksWithoutDataTransfer<int32>(
-        (fun context -> Vector.map2 context ArithmeticOperations.intSum),
+        (fun context -> Vector.map2 context ArithmeticOperations.intSumOption),
         VectorGenerator.intPair Sparse)
 
 /// With data transfer
 
 type VectorEWiseBenchmarks4FloatSparseWithDataTransfer() =
 
     inherit VectorEWiseBenchmarksWithDataTransfer<float>(
-        (fun context -> Vector.map2 context ArithmeticOperations.floatSum),
+        (fun context -> Vector.map2 context ArithmeticOperations.floatSumOption),
         VectorGenerator.floatPair Sparse)
 
 type VectorEWiseBenchmarks4Int32SparseWithDataTransfer() =
 
     inherit VectorEWiseBenchmarksWithDataTransfer<int32>(
-        (fun context -> Vector.map2 context ArithmeticOperations.intSum),
+        (fun context -> Vector.map2 context ArithmeticOperations.intSumOption),
         VectorGenerator.intPair Sparse)
 
 /// General with data transfer
 
 type VectorEWiseGeneralBenchmarks4FloatSparseWithDataTransfer() =
 
     inherit VectorEWiseBenchmarksWithDataTransfer<float>(
-        (fun context -> Vector.map2 context ArithmeticOperations.floatSum),
+        (fun context -> Vector.map2 context ArithmeticOperations.floatSumOption),
         VectorGenerator.floatPair Sparse)
 
 type VectorEWiseGeneralBenchmarks4Int32SparseWithDataTransfer() =
 
     inherit VectorEWiseBenchmarksWithDataTransfer<int32>(
-        (fun context -> Vector.map2 context ArithmeticOperations.intSum),
+        (fun context -> Vector.map2 context ArithmeticOperations.intSumOption),
         VectorGenerator.intPair Sparse)

src/GraphBLAS-sharp.Backend/Algorithms/BFS.fs

@@ -67,7 +67,7 @@ module BFS =
                         not
                         <| (containsNonZero queue front).ToHostAndFree queue
 
-                front.Dispose queue
+                front.Free queue
 
                 levels
             | _ -> failwith "Not implemented"