Skip to content

Commit efa50f4

Browse files
committed
refactor: clean
1 parent 2972803 commit efa50f4

2 files changed

Lines changed: 6 additions & 70 deletions

File tree

benchmarks/GraphBLAS-sharp.Benchmarks/Columns.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ open BenchmarkDotNet.Reports
55
open BenchmarkDotNet.Running
66
open GraphBLAS.FSharp.IO
77

8-
type CommonColumn<'a>(benchmarkCaseConvert, columnName: string, getShape: 'a -> 'b) =
8+
type CommonColumn<'a>(benchmarkCaseConvert, columnName: string, getShape: 'a -> _) =
99
interface IColumn with
1010
member this.AlwaysShow = true
1111
member this.Category = ColumnCategory.Params

benchmarks/GraphBLAS-sharp.Benchmarks/Helpers.fs

Lines changed: 5 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,12 @@ module Utils =
108108
let queue = context.QueueProvider.CreateQueue()
109109

110110
{ ClContext = context; Queue = queue })
111-
let result =
112-
seq {
113-
for wgSize in workGroupSizes do
114-
for context in contexts do
115-
yield (context, wgSize)
116-
}
117-
118-
printfn "result length: %A" <| Seq.length result
111+
seq {
112+
for wgSize in workGroupSizes do
113+
for context in contexts do
114+
yield (context, wgSize)
115+
}
119116

120-
result
121117
let nextSingle (random: System.Random) =
122118
let buffer = Array.zeroCreate<byte> 4
123119
random.NextBytes buffer
@@ -155,63 +151,3 @@ module VectorGenerator =
155151
let createVector array = Utils.createVectorFromArray format array (fIsEqual 0.0)
156152

157153
pairOfVectorsOfEqualSize Utils.normalFloatGenerator createVector
158-
159-
160-
module MatrixGenerator =
161-
let private pairOfMatricesOfEqualSizeGenerator (valuesGenerator: Gen<'a>) createMatrix =
162-
gen {
163-
let! rowsCount, columnsCount = Generators.dimension2DGenerator
164-
let! matrixA = valuesGenerator |> Gen.array2DOfDim (rowsCount, columnsCount)
165-
let! matrixB = valuesGenerator |> Gen.array2DOfDim (rowsCount, columnsCount)
166-
return (createMatrix matrixA, createMatrix matrixB)
167-
}
168-
169-
let intPairOfEqualSizes format =
170-
fun array -> Utils.createMatrixFromArray2D format array ((=) 0)
171-
|> pairOfMatricesOfEqualSizeGenerator Arb.generate<int32>
172-
173-
let floatPairOfEqualSizes format =
174-
fun array -> Utils.createMatrixFromArray2D format array (Utils.fIsEqual 0.0)
175-
|> pairOfMatricesOfEqualSizeGenerator Utils.normalFloatGenerator
176-
177-
let private pairOfMatricesWithMaskOfEqualSizeGenerator (valuesGenerator: Gen<'a>) format createMatrix =
178-
gen {
179-
let! rowsCount, columnsCount = Generators.dimension2DGenerator
180-
let! matrixA = valuesGenerator |> Gen.array2DOfDim (rowsCount, columnsCount)
181-
let! matrixB = valuesGenerator |> Gen.array2DOfDim (rowsCount, columnsCount)
182-
let! mask = valuesGenerator |> Gen.array2DOfDim (rowsCount, columnsCount)
183-
184-
return (createMatrix format matrixA,
185-
createMatrix format matrixB,
186-
createMatrix COO mask)
187-
}
188-
189-
let intPairWithMaskOfEqualSizes format =
190-
fun format array -> Utils.createMatrixFromArray2D format array ((=) 0)
191-
|> pairOfMatricesWithMaskOfEqualSizeGenerator Arb.generate<int32> format
192-
193-
let floatPairWithMaskOfEqualSizes format =
194-
fun format array -> Utils.createMatrixFromArray2D format array (Utils.fIsEqual 0.0)
195-
|> pairOfMatricesWithMaskOfEqualSizeGenerator Utils.normalFloatGenerator format
196-
197-
module MatrixVectorGenerator =
198-
let private pairOfMatricesAndVectorGenerator (valuesGenerator: Gen<'a>) createVector createMatrix =
199-
gen {
200-
let! rowsCount, columnsCount = Generators.dimension2DGenerator
201-
let! matrixA = valuesGenerator |> Gen.array2DOfDim (rowsCount, columnsCount)
202-
let! vector = valuesGenerator |> Gen.arrayOfLength columnsCount
203-
204-
return (createMatrix matrixA, createVector vector)
205-
}
206-
207-
let intPairOfCompatibleSizes matrixFormat vectorFormat =
208-
let createVector array = Utils.createVectorFromArray vectorFormat array ((=) 0)
209-
let createMatrix array = Utils.createMatrixFromArray2D matrixFormat array ((=) 0)
210-
211-
pairOfMatricesAndVectorGenerator Arb.generate<int32> createVector createMatrix
212-
213-
let floatPairOfCompatibleSizes matrixFormat vectorFormat =
214-
let createVector array = Utils.createVectorFromArray vectorFormat array (Utils.floatIsEqual 0.0)
215-
let createMatrix array = Utils.createMatrixFromArray2D matrixFormat array (Utils.floatIsEqual 0.0)
216-
217-
pairOfMatricesAndVectorGenerator Utils.normalFloatGenerator createVector createMatrix

0 commit comments

Comments
 (0)