Skip to content

Commit 32820df

Browse files
committed
Merge branch 'net5'
2 parents 65de357 + 1b1f19b commit 32820df

103 files changed

Lines changed: 8117 additions & 3483 deletions

File tree

Some content is hidden

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

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"paket": {
18-
"version": "6.0.13",
18+
"version": "7.2.0",
1919
"commands": [
2020
"paket"
2121
]

.devcontainer/install-dotnets.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515
# Add additional versions if required
1616
DOTNET_VERSIONS=(
1717
# 'latest'
18-
'5.0.100'
18+
'7.0.x'
1919
)
2020
for version in ${DOTNET_VERSIONS[@]}; do
2121
echo "installing dotnet $version"

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ root = true
1111
insert_final_newline = true
1212
indent_style = space
1313
indent_size = 4
14+
end_of_line = lf
1415

1516
[*.{fs,fsi,fsx,config}]
1617
charset = utf-8

.github/workflows/build-on-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676

7777
- uses: actions/checkout@v1
7878

79-
- name: Setup .NET Core
79+
- name: Setup .NET
8080
uses: actions/setup-dotnet@v1
8181

8282
- name: Build

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,9 @@ coverage.*.xml
267267
.paket/.store
268268
.paket/paket
269269

270+
.fake
271+
.ionide
272+
270273
BenchmarkDotNet.Artifacts/
271274

272275
# Folder for datasets

GraphBLAS-sharp.sln

Lines changed: 44 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ACBEE43C
1111
EndProject
1212
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GraphBLAS-sharp.Tests", "tests\GraphBLAS-sharp.Tests\GraphBLAS-sharp.Tests.fsproj", "{1CA2E092-2320-451D-A4F0-9ED7C7C528CA}"
1313
EndProject
14-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{DEF656DE-BCED-4C49-B5ED-950D4A29B78B}"
14+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "docsTool", "docsTool\docsTool.fsproj", "{8855EC73-F6A1-43D3-AFBC-04A3E09F9BD9}"
1515
EndProject
16-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GraphBLAS-sharp.Benchmarks", "benchmarks\GraphBLAS-sharp.Benchmarks\GraphBLAS-sharp.Benchmarks.fsproj", "{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}"
16+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{40D2259D-991D-44C4-B45D-C88CE0710C23}"
1717
EndProject
18-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "docsTool", "docsTool\docsTool.fsproj", "{8855EC73-F6A1-43D3-AFBC-04A3E09F9BD9}"
18+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GraphBLAS-sharp.Backend", "src\GraphBLAS-sharp.Backend\GraphBLAS-sharp.Backend.fsproj", "{EB8BFB34-B257-4601-8366-189BD2B542B3}"
19+
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{83A88173-2AF7-4ED9-B97A-2D316A88399D}"
1921
EndProject
20-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GraphBLAS-sharp.Backend", "src\GraphBLAS-sharp.Backend\GraphBLAS-sharp.Backend.fsproj", "{1E68C381-1E5F-4038-96B9-5BE79D381562}"
22+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GraphBLAS-sharp.Benchmarks", "benchmarks\GraphBLAS-sharp.Benchmarks\GraphBLAS-sharp.Benchmarks.fsproj", "{6764938A-D576-4042-8951-D76EB7CA5C0C}"
2123
EndProject
2224
Global
2325
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -68,35 +70,47 @@ Global
6870
{8855EC73-F6A1-43D3-AFBC-04A3E09F9BD9}.Release|x64.Build.0 = Release|Any CPU
6971
{8855EC73-F6A1-43D3-AFBC-04A3E09F9BD9}.Release|x86.ActiveCfg = Release|Any CPU
7072
{8855EC73-F6A1-43D3-AFBC-04A3E09F9BD9}.Release|x86.Build.0 = Release|Any CPU
71-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
73-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|x64.ActiveCfg = Debug|Any CPU
74-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|x64.Build.0 = Debug|Any CPU
75-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|x86.ActiveCfg = Debug|Any CPU
76-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|x86.Build.0 = Debug|Any CPU
77-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
78-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|Any CPU.Build.0 = Release|Any CPU
79-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|x64.ActiveCfg = Release|Any CPU
80-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|x64.Build.0 = Release|Any CPU
81-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|x86.ActiveCfg = Release|Any CPU
82-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|x86.Build.0 = Release|Any CPU
83-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Debug|Any CPU.Build.0 = Debug|Any CPU
85-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Debug|x64.ActiveCfg = Debug|Any CPU
86-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Debug|x64.Build.0 = Debug|Any CPU
87-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Debug|x86.ActiveCfg = Debug|Any CPU
88-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Debug|x86.Build.0 = Debug|Any CPU
89-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Release|Any CPU.ActiveCfg = Release|Any CPU
90-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Release|Any CPU.Build.0 = Release|Any CPU
91-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Release|x64.ActiveCfg = Release|Any CPU
92-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Release|x64.Build.0 = Release|Any CPU
93-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Release|x86.ActiveCfg = Release|Any CPU
94-
{1E68C381-1E5F-4038-96B9-5BE79D381562}.Release|x86.Build.0 = Release|Any CPU
73+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
75+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|x64.ActiveCfg = Debug|Any CPU
76+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|x64.Build.0 = Debug|Any CPU
77+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|x86.ActiveCfg = Debug|Any CPU
78+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Debug|x86.Build.0 = Debug|Any CPU
79+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|Any CPU.Build.0 = Release|Any CPU
81+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x64.ActiveCfg = Release|Any CPU
82+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x64.Build.0 = Release|Any CPU
83+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x86.ActiveCfg = Release|Any CPU
84+
{40D2259D-991D-44C4-B45D-C88CE0710C23}.Release|x86.Build.0 = Release|Any CPU
85+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
86+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
87+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Debug|x64.ActiveCfg = Debug|Any CPU
88+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Debug|x64.Build.0 = Debug|Any CPU
89+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Debug|x86.ActiveCfg = Debug|Any CPU
90+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Debug|x86.Build.0 = Debug|Any CPU
91+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
92+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Release|Any CPU.Build.0 = Release|Any CPU
93+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Release|x64.ActiveCfg = Release|Any CPU
94+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Release|x64.Build.0 = Release|Any CPU
95+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Release|x86.ActiveCfg = Release|Any CPU
96+
{EB8BFB34-B257-4601-8366-189BD2B542B3}.Release|x86.Build.0 = Release|Any CPU
97+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
98+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
99+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Debug|x64.ActiveCfg = Debug|Any CPU
100+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Debug|x64.Build.0 = Debug|Any CPU
101+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Debug|x86.ActiveCfg = Debug|Any CPU
102+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Debug|x86.Build.0 = Debug|Any CPU
103+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
104+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Release|Any CPU.Build.0 = Release|Any CPU
105+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Release|x64.ActiveCfg = Release|Any CPU
106+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Release|x64.Build.0 = Release|Any CPU
107+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Release|x86.ActiveCfg = Release|Any CPU
108+
{6764938A-D576-4042-8951-D76EB7CA5C0C}.Release|x86.Build.0 = Release|Any CPU
95109
EndGlobalSection
96110
GlobalSection(NestedProjects) = preSolution
97111
{5D30E174-2538-47AC-8443-318C8C5DC2C9} = {C397A34C-84F1-49E7-AEBC-2F9F2B196216}
98112
{1CA2E092-2320-451D-A4F0-9ED7C7C528CA} = {ACBEE43C-7A88-4FB1-9B06-DB064D22B29F}
99-
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6} = {DEF656DE-BCED-4C49-B5ED-950D4A29B78B}
100-
{1E68C381-1E5F-4038-96B9-5BE79D381562} = {C397A34C-84F1-49E7-AEBC-2F9F2B196216}
113+
{EB8BFB34-B257-4601-8366-189BD2B542B3} = {C397A34C-84F1-49E7-AEBC-2F9F2B196216}
114+
{6764938A-D576-4042-8951-D76EB7CA5C0C} = {83A88173-2AF7-4ED9-B97A-2D316A88399D}
101115
EndGlobalSection
102116
EndGlobal

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksEWiseAdd.fs

Lines changed: 18 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -195,60 +195,6 @@ type EWiseAddBenchmarksWithDataTransfer<'matrixT, 'elem when 'matrixT :> Backend
195195
this.Processor.PostAndReply Msg.MsgNotifyMe
196196

197197
module M =
198-
let inline buildCooMatrix (context:ClContext) matrix =
199-
match matrix with
200-
| MatrixCOO m ->
201-
let rows =
202-
context.CreateClArray (m.Rows, hostAccessMode = HostAccessMode.ReadOnly, deviceAccessMode = DeviceAccessMode.ReadOnly, allocationMode = AllocationMode.CopyHostPtr)
203-
204-
let cols =
205-
context.CreateClArray (m.Columns, hostAccessMode = HostAccessMode.ReadOnly, deviceAccessMode = DeviceAccessMode.ReadOnly, allocationMode = AllocationMode.CopyHostPtr)
206-
207-
let vals =
208-
context.CreateClArray (m.Values, hostAccessMode = HostAccessMode.ReadOnly, deviceAccessMode = DeviceAccessMode.ReadOnly, allocationMode = AllocationMode.CopyHostPtr)
209-
210-
{ Backend.COOMatrix.Context = context
211-
Backend.COOMatrix.RowCount = m.RowCount
212-
Backend.COOMatrix.ColumnCount = m.ColumnCount
213-
Backend.COOMatrix.Rows = rows
214-
Backend.COOMatrix.Columns = cols
215-
Backend.COOMatrix.Values = vals }
216-
217-
| x -> failwith "Unsupported matrix format: %A"
218-
219-
let inline buildCsrMatrix (context:ClContext) matrix =
220-
match matrix with
221-
| MatrixCOO m ->
222-
let rowPointers =
223-
context.CreateClArray(
224-
Utils.rowIndices2rowPointers m.Rows m.RowCount
225-
,hostAccessMode = HostAccessMode.ReadOnly
226-
,deviceAccessMode = DeviceAccessMode.ReadOnly
227-
,allocationMode = AllocationMode.CopyHostPtr)
228-
229-
let cols =
230-
context.CreateClArray (
231-
m.Columns
232-
,hostAccessMode = HostAccessMode.ReadOnly
233-
,deviceAccessMode = DeviceAccessMode.ReadOnly
234-
,allocationMode = AllocationMode.CopyHostPtr)
235-
236-
let vals =
237-
context.CreateClArray (
238-
m.Values
239-
,hostAccessMode = HostAccessMode.ReadOnly
240-
,deviceAccessMode = DeviceAccessMode.ReadOnly
241-
,allocationMode = AllocationMode.CopyHostPtr)
242-
243-
{ Backend.CSRMatrix.Context = context
244-
Backend.CSRMatrix.RowCount = m.RowCount
245-
Backend.CSRMatrix.ColumnCount = m.ColumnCount
246-
Backend.CSRMatrix.RowPointers = rowPointers
247-
Backend.CSRMatrix.Columns = cols
248-
Backend.CSRMatrix.Values = vals }
249-
250-
| x -> failwith "Unsupported matrix format: %A"
251-
252198
let resultToHostCOO (resultMatrix:Backend.COOMatrix<'a>) (procesor:MailboxProcessor<_>) =
253199
let cols =
254200
let a = Array.zeroCreate resultMatrix.ColumnCount
@@ -274,10 +220,10 @@ module M =
274220
type EWiseAddBenchmarks4Float32COOWithoutDataTransfer() =
275221

276222
inherit EWiseAddBenchmarksWithoutDataTransfer<Backend.COOMatrix<float32>,float32>(
277-
(fun context wgSize -> Backend.COOMatrix.eWiseAdd context Backend.Common.StandardOperations.float32Sum wgSize),
223+
(fun context wgSize -> Backend.COOMatrix.elementwise context Backend.Common.StandardOperations.float32Sum wgSize),
278224
float32,
279225
(fun _ -> Utils.nextSingle (System.Random())),
280-
M.buildCooMatrix
226+
COOMatrix<float32>.ToBackend
281227
)
282228

283229
static member InputMatricesProvider =
@@ -286,10 +232,10 @@ type EWiseAddBenchmarks4Float32COOWithoutDataTransfer() =
286232
type EWiseAddBenchmarks4Float32COOWithDataTransfer() =
287233

288234
inherit EWiseAddBenchmarksWithDataTransfer<Backend.COOMatrix<float32>,float32>(
289-
(fun context wgSize -> Backend.COOMatrix.eWiseAdd context Backend.Common.StandardOperations.float32Sum wgSize),
235+
(fun context wgSize -> Backend.COOMatrix.elementwise context Backend.Common.StandardOperations.float32Sum wgSize),
290236
float32,
291237
(fun _ -> Utils.nextSingle (System.Random())),
292-
M.buildCooMatrix,
238+
COOMatrix<float32>.ToBackend,
293239
M.resultToHostCOO
294240
)
295241

@@ -300,10 +246,10 @@ type EWiseAddBenchmarks4Float32COOWithDataTransfer() =
300246
type EWiseAddBenchmarks4BoolCOOWithoutDataTransfer() =
301247

302248
inherit EWiseAddBenchmarksWithoutDataTransfer<Backend.COOMatrix<bool>,bool>(
303-
(fun context wgSize -> Backend.COOMatrix.eWiseAdd context Backend.Common.StandardOperations.boolSum wgSize),
249+
(fun context wgSize -> Backend.COOMatrix.elementwise context Backend.Common.StandardOperations.boolSum wgSize),
304250
(fun _ -> true),
305251
(fun _ -> true),
306-
M.buildCooMatrix
252+
COOMatrix<bool>.ToBackend
307253
)
308254

309255
static member InputMatricesProvider =
@@ -313,10 +259,10 @@ type EWiseAddBenchmarks4BoolCOOWithoutDataTransfer() =
313259
type EWiseAddBenchmarks4Float32CSRWithoutDataTransfer() =
314260

315261
inherit EWiseAddBenchmarksWithoutDataTransfer<Backend.CSRMatrix<float32>,float32>(
316-
(fun context wgSize -> Backend.CSRMatrix.eWiseAdd context Backend.Common.StandardOperations.float32Sum wgSize),
262+
(fun context wgSize -> Backend.CSRMatrix.elementwise context Backend.Common.StandardOperations.float32Sum wgSize),
317263
float32,
318264
(fun _ -> Utils.nextSingle (System.Random())),
319-
M.buildCsrMatrix
265+
CSRMatrix<float32>.ToBackend
320266
)
321267

322268
static member InputMatricesProvider =
@@ -326,10 +272,10 @@ type EWiseAddBenchmarks4Float32CSRWithoutDataTransfer() =
326272
type EWiseAddBenchmarks4BoolCSRWithoutDataTransfer() =
327273

328274
inherit EWiseAddBenchmarksWithoutDataTransfer<Backend.CSRMatrix<bool>,bool>(
329-
(fun context wgSize -> Backend.CSRMatrix.eWiseAdd context Backend.Common.StandardOperations.boolSum wgSize),
275+
(fun context wgSize -> Backend.CSRMatrix.elementwise context Backend.Common.StandardOperations.boolSum wgSize),
330276
(fun _ -> true),
331277
(fun _ -> true),
332-
M.buildCsrMatrix
278+
CSRMatrix<bool>.ToBackend
333279
)
334280

335281
static member InputMatricesProvider =
@@ -340,10 +286,10 @@ type EWiseAddBenchmarks4BoolCSRWithoutDataTransfer() =
340286
type EWiseAddAtLeastOneBenchmarks4BoolCOOWithoutDataTransfer() =
341287

342288
inherit EWiseAddBenchmarksWithoutDataTransfer<Backend.COOMatrix<bool>,bool>(
343-
(fun context wgSize -> Backend.COOMatrix.eWiseAddAtLeastOne context Backend.Common.StandardOperations.boolSumAtLeastOne wgSize),
289+
(fun context wgSize -> Backend.COOMatrix.elementwiseAtLeastOne context Backend.Common.StandardOperations.boolSumAtLeastOne wgSize),
344290
(fun _ -> true),
345291
(fun _ -> true),
346-
M.buildCooMatrix
292+
COOMatrix<bool>.ToBackend
347293
)
348294

349295
static member InputMatricesProvider =
@@ -352,10 +298,10 @@ type EWiseAddAtLeastOneBenchmarks4BoolCOOWithoutDataTransfer() =
352298
type EWiseAddAtLeastOneBenchmarks4BoolCSRWithoutDataTransfer() =
353299

354300
inherit EWiseAddBenchmarksWithoutDataTransfer<Backend.CSRMatrix<bool>,bool>(
355-
(fun context wgSize -> Backend.CSRMatrix.eWiseAddAtLeastOne context Backend.Common.StandardOperations.boolSumAtLeastOne wgSize),
301+
(fun context wgSize -> Backend.CSRMatrix.elementwiseAtLeastOne context Backend.Common.StandardOperations.boolSumAtLeastOne wgSize),
356302
(fun _ -> true),
357303
(fun _ -> true),
358-
M.buildCsrMatrix
304+
CSRMatrix<bool>.ToBackend
359305
)
360306

361307
static member InputMatricesProvider =
@@ -364,10 +310,10 @@ type EWiseAddAtLeastOneBenchmarks4BoolCSRWithoutDataTransfer() =
364310
type EWiseAddAtLeastOneBenchmarks4Float32COOWithoutDataTransfer() =
365311

366312
inherit EWiseAddBenchmarksWithoutDataTransfer<Backend.COOMatrix<float32>,float32>(
367-
(fun context wgSize -> Backend.COOMatrix.eWiseAddAtLeastOne context Backend.Common.StandardOperations.float32SumAtLeastOne wgSize),
313+
(fun context wgSize -> Backend.COOMatrix.elementwiseAtLeastOne context Backend.Common.StandardOperations.float32SumAtLeastOne wgSize),
368314
float32,
369315
(fun _ -> Utils.nextSingle (System.Random())),
370-
M.buildCooMatrix
316+
COOMatrix<float32>.ToBackend
371317
)
372318

373319
static member InputMatricesProvider =
@@ -376,10 +322,10 @@ type EWiseAddAtLeastOneBenchmarks4Float32COOWithoutDataTransfer() =
376322
type EWiseAddAtLeastOneBenchmarks4Float32CSRWithoutDataTransfer() =
377323

378324
inherit EWiseAddBenchmarksWithoutDataTransfer<Backend.CSRMatrix<float32>,float32>(
379-
(fun context wgSize -> Backend.CSRMatrix.eWiseAddAtLeastOne context Backend.Common.StandardOperations.float32SumAtLeastOne wgSize),
325+
(fun context wgSize -> Backend.CSRMatrix.elementwiseAtLeastOne context Backend.Common.StandardOperations.float32SumAtLeastOne wgSize),
380326
float32,
381327
(fun _ -> Utils.nextSingle (System.Random())),
382-
M.buildCsrMatrix
328+
CSRMatrix<float32>.ToBackend
383329
)
384330

385331
static member InputMatricesProvider =

0 commit comments

Comments
 (0)