Skip to content

Commit 5d900f5

Browse files
artemiipatovartemiipatov
committed
refactor: namespace/module names
1 parent 7ec498d commit 5d900f5

106 files changed

Lines changed: 621 additions & 1945 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎benchmarks/GraphBLAS-sharp.Benchmarks/Algorithms/BFS.fs‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
open System.IO
44
open BenchmarkDotNet.Attributes
5-
open GraphBLAS.FSharp
6-
open GraphBLAS.FSharp.Backend.Quotes
7-
open GraphBLAS.FSharp.IO
8-
open Brahma.FSharp
9-
open Backend.Algorithms.BFS
105
open Microsoft.FSharp.Core
11-
open GraphBLAS.FSharp.Backend.Objects.ArraysExtensions
6+
open Brahma.FSharp
7+
open GraphBLAS.FSharp.IO
8+
open GraphBLAS.FSharp.Algorithms
129
open GraphBLAS.FSharp.Benchmarks
13-
open GraphBLAS.FSharp.Backend.Objects
10+
open GraphBLAS.FSharp.Objects
11+
open GraphBLAS.FSharp.Objects.ArraysExtensions
12+
open GraphBLAS.FSharp.Backend.Quotes
1413

1514
[<AbstractClass>]
1615
[<IterationCount(100)>]
@@ -20,11 +19,12 @@ type Benchmarks<'elem when 'elem : struct>(
2019
buildFunToBenchmark,
2120
converter: string -> 'elem,
2221
binaryConverter,
23-
vertex: int)
22+
vertex: int,
23+
buildMatrix)
2424
=
2525

2626
let mutable funToBenchmark = None
27-
let mutable matrix = Unchecked.defaultof<ClMatrix.CSR<'elem>>
27+
let mutable matrix = Unchecked.defaultof<ClMatrix<'elem>>
2828
let mutable matrixHost = Unchecked.defaultof<_>
2929

3030
member val ResultLevels = Unchecked.defaultof<ClArray<'elem option>> with get,set
@@ -69,7 +69,7 @@ type Benchmarks<'elem when 'elem : struct>(
6969
this.ResultLevels <- this.FunToBenchmark this.Processor matrix vertex
7070

7171
member this.ClearInputMatrix() =
72-
(matrix :> IDeviceMemObject).Dispose this.Processor
72+
matrix.Dispose this.Processor
7373

7474
member this.ClearResult() = this.ResultLevels.FreeAndWait this.Processor
7575

@@ -82,7 +82,7 @@ type Benchmarks<'elem when 'elem : struct>(
8282
matrixHost <- this.InputMatrixReader.ReadMatrix converter
8383

8484
member this.LoadMatrixToGPU() =
85-
matrix <- matrixHost.ToCSR.ToDevice this.OclContext
85+
matrix <- buildMatrix this.OclContext matrixHost
8686

8787
abstract member GlobalSetup : unit -> unit
8888

@@ -96,13 +96,15 @@ type WithoutTransferBenchmark<'elem when 'elem : struct>(
9696
buildFunToBenchmark,
9797
converter: string -> 'elem,
9898
boolConverter,
99-
vertex) =
99+
vertex,
100+
buildMatrix) =
100101

101102
inherit Benchmarks<'elem>(
102103
buildFunToBenchmark,
103104
converter,
104105
boolConverter,
105-
vertex)
106+
vertex,
107+
buildMatrix)
106108

107109
[<GlobalSetup>]
108110
override this.GlobalSetup() =
@@ -125,10 +127,11 @@ type WithoutTransferBenchmark<'elem when 'elem : struct>(
125127
type BFSWithoutTransferBenchmarkInt32() =
126128

127129
inherit WithoutTransferBenchmark<int>(
128-
(singleSource ArithmeticOperations.intSumOption ArithmeticOperations.intMulOption),
130+
(singleSourceBFS ArithmeticOperations.intSumOption ArithmeticOperations.intMulOption),
129131
int32,
130132
(fun _ -> Utils.nextInt (System.Random())),
131-
0)
133+
0,
134+
(fun context matrix -> ClMatrix.CSR <| matrix.ToCSR.ToDevice context))
132135

133136
static member InputMatrixProvider =
134137
Benchmarks<_>.InputMatrixProviderBuilder "BFSBenchmarks.txt"
@@ -137,13 +140,15 @@ type WithTransferBenchmark<'elem when 'elem : struct>(
137140
buildFunToBenchmark,
138141
converter: string -> 'elem,
139142
boolConverter,
140-
vertex) =
143+
vertex,
144+
buildMatrix) =
141145

142146
inherit Benchmarks<'elem>(
143147
buildFunToBenchmark,
144148
converter,
145149
boolConverter,
146-
vertex)
150+
vertex,
151+
buildMatrix)
147152

148153
[<GlobalSetup>]
149154
override this.GlobalSetup() =
@@ -168,10 +173,11 @@ type WithTransferBenchmark<'elem when 'elem : struct>(
168173
type BFSWithTransferBenchmarkInt32() =
169174

170175
inherit WithTransferBenchmark<int>(
171-
(singleSource ArithmeticOperations.intSumOption ArithmeticOperations.intMulOption),
176+
(singleSourceBFS ArithmeticOperations.intSumOption ArithmeticOperations.intMulOption),
172177
int32,
173178
(fun _ -> Utils.nextInt (System.Random())),
174-
0)
179+
0,
180+
(fun context matrix -> ClMatrix.CSR <| matrix.ToCSR.ToDevice context))
175181

176182
static member InputMatrixProvider =
177183
Benchmarks<_>.InputMatrixProviderBuilder "BFSBenchmarks.txt"

‎benchmarks/GraphBLAS-sharp.Benchmarks/Helpers.fs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ namespace GraphBLAS.FSharp.Benchmarks
55
open Brahma.FSharp
66
open Brahma.FSharp.OpenCL.Translator
77
open Brahma.FSharp.OpenCL.Translator.QuotationTransformers
8-
open GraphBLAS.FSharp.Backend.Objects
98
open OpenCL.Net
109
open System.IO
1110
open System.Text.RegularExpressions
1211
open GraphBLAS.FSharp.Tests
1312
open FsCheck
1413
open Expecto
15-
open GraphBLAS.FSharp.Test
1614

1715
module Utils =
1816
type BenchmarkContext =

‎benchmarks/GraphBLAS-sharp.Benchmarks/Matrix/Map2/Map2.fs‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
namespace GraphBLAS.FSharp.Benchmarks.Matrix.Map2
22

33
open System.IO
4-
open GraphBLAS.FSharp.Backend.Quotes
5-
open GraphBLAS.FSharp.IO
64
open BenchmarkDotNet.Attributes
75
open Brahma.FSharp
6+
open GraphBLAS.FSharp.IO
7+
open GraphBLAS.FSharp.Operations
88
open GraphBLAS.FSharp.Objects
9-
open GraphBLAS.FSharp.Backend.Objects
109
open GraphBLAS.FSharp.Objects.MatrixExtensions
11-
open GraphBLAS.FSharp.Backend.Objects.ClContextExtensions
12-
open GraphBLAS.FSharp.Backend.Matrix
10+
open GraphBLAS.FSharp.Objects.ClContextExtensions
11+
open GraphBLAS.FSharp.Backend.Quotes
1312
open GraphBLAS.FSharp.Benchmarks
1413

1514
[<AbstractClass>]
@@ -20,7 +19,7 @@ type Benchmarks<'matrixT, 'elem when 'matrixT :> IDeviceMemObject and 'elem : st
2019
buildFunToBenchmark,
2120
converter: string -> 'elem,
2221
converterBool,
23-
buildMatrix: Primitives.COO<_> -> Matrix<_>) =
22+
buildMatrix: Matrix.COO<_> -> Matrix<_>) =
2423

2524
let mutable funToBenchmark = None
2625
let mutable firstMatrix = Unchecked.defaultof<ClMatrix<'elem>>
@@ -138,10 +137,10 @@ module WithoutTransfer =
138137
type Float32() =
139138

140139
inherit Benchmark<ClMatrix.COO<float32>,float32>(
141-
(Primitives.map2 ArithmeticOperations.float32SumOption),
140+
(Matrix.map2 ArithmeticOperations.float32SumOption),
142141
float32,
143142
(fun _ -> Utils.nextSingle (System.Random())),
144-
Primitives.COO
143+
Matrix.COO
145144
)
146145

147146
static member InputMatricesProvider =
@@ -150,10 +149,10 @@ module WithoutTransfer =
150149
type Bool() =
151150

152151
inherit Benchmark<ClMatrix.COO<bool>,bool>(
153-
(Primitives.map2 ArithmeticOperations.boolSumOption),
152+
(Matrix.map2 ArithmeticOperations.boolSumOption),
154153
(fun _ -> true),
155154
(fun _ -> true),
156-
Primitives.COO
155+
Matrix.COO
157156
)
158157

159158
static member InputMatricesProvider =
@@ -163,10 +162,10 @@ module WithoutTransfer =
163162
type Float32() =
164163

165164
inherit Benchmark<ClMatrix.CSR<float32>,float32>(
166-
(Primitives.map2 ArithmeticOperations.float32SumOption),
165+
(Matrix.map2 ArithmeticOperations.float32SumOption),
167166
float32,
168167
(fun _ -> Utils.nextSingle (System.Random())),
169-
(fun matrix -> Primitives.CSR matrix.ToCSR)
168+
(fun matrix -> Matrix.CSR matrix.ToCSR)
170169
)
171170

172171
static member InputMatricesProvider =
@@ -175,10 +174,10 @@ module WithoutTransfer =
175174
type Bool() =
176175

177176
inherit Benchmark<ClMatrix.CSR<bool>,bool>(
178-
(Primitives.map2 ArithmeticOperations.boolSumOption),
177+
(Matrix.map2 ArithmeticOperations.boolSumOption),
179178
(fun _ -> true),
180179
(fun _ -> true),
181-
(fun matrix -> Primitives.CSR matrix.ToCSR)
180+
(fun matrix -> Matrix.CSR matrix.ToCSR)
182181
)
183182

184183
static member InputMatricesProvider =
@@ -189,10 +188,10 @@ module WithoutTransfer =
189188
type Bool() =
190189

191190
inherit Benchmark<ClMatrix.COO<bool>,bool>(
192-
(Primitives.map2AtLeastOne ArithmeticOperations.boolSumAtLeastOne),
191+
(Matrix.map2AtLeastOne ArithmeticOperations.boolSumAtLeastOne),
193192
(fun _ -> true),
194193
(fun _ -> true),
195-
Primitives.COO
194+
Matrix.COO
196195
)
197196

198197
static member InputMatricesProvider =
@@ -201,10 +200,10 @@ module WithoutTransfer =
201200
type Float32() =
202201

203202
inherit Benchmark<ClMatrix.COO<float32>,float32>(
204-
(Primitives.map2AtLeastOne ArithmeticOperations.float32SumAtLeastOne),
203+
(Matrix.map2AtLeastOne ArithmeticOperations.float32SumAtLeastOne),
205204
float32,
206205
(fun _ -> Utils.nextSingle (System.Random())),
207-
Primitives.COO
206+
Matrix.COO
208207
)
209208

210209
static member InputMatricesProvider =
@@ -214,10 +213,10 @@ module WithoutTransfer =
214213
type Bool() =
215214

216215
inherit Benchmark<ClMatrix.CSR<bool>,bool>(
217-
(Primitives.map2AtLeastOne ArithmeticOperations.boolSumAtLeastOne),
216+
(Matrix.map2AtLeastOne ArithmeticOperations.boolSumAtLeastOne),
218217
(fun _ -> true),
219218
(fun _ -> true),
220-
(fun matrix -> Primitives.CSR matrix.ToCSR)
219+
(fun matrix -> Matrix.CSR matrix.ToCSR)
221220
)
222221

223222
static member InputMatricesProvider =
@@ -226,10 +225,10 @@ module WithoutTransfer =
226225
type Float32() =
227226

228227
inherit Benchmark<ClMatrix.CSR<float32>,float32>(
229-
(Primitives.map2AtLeastOne ArithmeticOperations.float32SumAtLeastOne),
228+
(Matrix.map2AtLeastOne ArithmeticOperations.float32SumAtLeastOne),
230229
float32,
231230
(fun _ -> Utils.nextSingle (System.Random())),
232-
(fun matrix -> Primitives.CSR matrix.ToCSR)
231+
(fun matrix -> Matrix.CSR matrix.ToCSR)
233232
)
234233

235234
static member InputMatricesProvider =
@@ -273,10 +272,10 @@ module WithTransfer =
273272
type Float32() =
274273

275274
inherit Benchmark<ClMatrix.COO<float32>,float32>(
276-
(Primitives.map2 ArithmeticOperations.float32SumOption),
275+
(Matrix.map2 ArithmeticOperations.float32SumOption),
277276
float32,
278277
(fun _ -> Utils.nextSingle (System.Random())),
279-
Primitives.COO,
278+
Matrix.COO,
280279
(fun matrix -> matrix.ToHost)
281280
)
282281

‎benchmarks/GraphBLAS-sharp.Benchmarks/Matrix/SpGeMM/Expand.fs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
module GraphBLAS.FSharp.Benchmarks.Matrix.SpGeMM.Expand
22

33
open System.IO
4-
open GraphBLAS.FSharp.Backend.Quotes
5-
open GraphBLAS.FSharp.IO
64
open BenchmarkDotNet.Attributes
75
open Brahma.FSharp
6+
open GraphBLAS.FSharp.IO
7+
open GraphBLAS.FSharp.Operations
8+
open GraphBLAS.FSharp.Backend.Quotes
89
open GraphBLAS.FSharp.Objects
9-
open GraphBLAS.FSharp.Backend.Objects
10-
open GraphBLAS.FSharp.Backend.Matrix
11-
open GraphBLAS.FSharp.Backend.Objects.ClContextExtensions
10+
open GraphBLAS.FSharp.Objects.ClContextExtensions
1211
open GraphBLAS.FSharp.Benchmarks
13-
open GraphBLAS.FSharp.Backend
1412

1513
[<AbstractClass>]
1614
[<IterationCount(100)>]
@@ -139,7 +137,7 @@ module WithoutTransfer =
139137
type Float32() =
140138

141139
inherit Benchmark<float32>(
142-
Primitives.SpGeMM.expand (fst ArithmeticOperations.float32Add) (fst ArithmeticOperations.float32Mul),
140+
SpGeMM.expand (fst ArithmeticOperations.float32Add) (fst ArithmeticOperations.float32Mul),
143141
float32,
144142
(fun _ -> Utils.nextSingle (System.Random())),
145143
(fun context matrix -> ClMatrix.CSR <| matrix.ToCSR.ToDevice context)

0 commit comments

Comments
 (0)