Skip to content

Commit e7caeb5

Browse files
committed
Add OpenCL drivers config
1 parent 489cdc7 commit e7caeb5

3 files changed

Lines changed: 25 additions & 14 deletions

File tree

benchmarks/GraphBLAS-sharp.Benchmarks/EWiseAddBenchmark.fs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ open Brahma.FSharp.OpenCL.WorkflowBuilder.Evaluation
1616
open Brahma.FSharp.OpenCL.Extensions
1717
open OpenCL.Net
1818

19-
type COOFormat<'a> =
20-
{ Rows: int []
21-
Columns: int []
22-
Values: 'a []
23-
RowCount: int
24-
ColumnCount: int }
19+
type COOFormat<'a> = {
20+
Rows: int []
21+
Columns: int []
22+
Values: 'a []
23+
RowCount: int
24+
ColumnCount: int
25+
}
2526

2627
[<MinColumn; MaxColumn>]
2728
[<Config(typeof<Config>)>]
@@ -42,8 +43,8 @@ type EWiseAddBenchmarks() =
4243
let mutable firstGraph = Unchecked.defaultof<COOFormat<float>>
4344
let mutable secondGraph = Unchecked.defaultof<COOFormat<float>>
4445

45-
let contextCPU = OpenCLEvaluationContext("*", DeviceType.Cpu)
46-
let contextGPU = OpenCLEvaluationContext("*", DeviceType.Gpu)
46+
let contextN = OpenCLEvaluationContext("NVIDIA*", DeviceType.Gpu)
47+
let contextA = OpenCLEvaluationContext("AMD*", DeviceType.Gpu)
4748

4849
[<ParamsSource("GraphPaths")>]
4950
member val PathToGraphPair = Unchecked.defaultof<string * string> with get, set
@@ -90,7 +91,7 @@ type EWiseAddBenchmarks() =
9091
firstGraph <- fst this.PathToGraphPair |> getFullPathToGraph |> getCOO
9192
secondGraph <- snd this.PathToGraphPair |> getFullPathToGraph |> getCOO
9293

93-
[<IterationSetup(Targets=[|"CpuEWiseAdditionCOO"; "GpuEWiseAdditionCOO"|])>]
94+
[<IterationSetup(Targets=[|"NEWiseAdditionCOO"; "AEWiseAdditionCOO"|])>]
9495
member this.BuildCOO() =
9596
leftCOO <-
9697
Matrix.Build<float>(
@@ -149,14 +150,14 @@ type EWiseAddBenchmarks() =
149150
(List.ofArray <| Array.zip3 secondGraph.Rows secondGraph.Columns secondGraph.Values)
150151

151152
[<Benchmark>]
152-
member this.CpuEWiseAdditionCOO() =
153+
member this.NEWiseAdditionCOO() =
153154
leftCOO.EWiseAdd rightCOO None FloatSemiring.addMult
154-
|> contextCPU.RunSync
155+
|> contextN.RunSync
155156

156157
[<Benchmark>]
157-
member this.GpuEWiseAdditionCOO() =
158+
member this.AEWiseAdditionCOO() =
158159
leftCOO.EWiseAdd rightCOO None FloatSemiring.addMult
159-
|> contextGPU.RunSync
160+
|> contextA.RunSync
160161

161162
[<Benchmark>]
162163
member this.EWiseAdditionCSR() =

src/GraphBLAS-sharp/GraphBLAS-sharp.fsproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,10 @@
2727
<Compile Include="Algorithms/SSSP.fs" />
2828
<Compile Include="Algorithms/TriangleCounting.fs" />
2929
</ItemGroup>
30+
<ItemGroup>
31+
<Content Include="YC.OpenCL.NET.dll.config">
32+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
33+
</Content>
34+
</ItemGroup>
3035
<Import Project="..\..\.paket\Paket.Restore.targets" />
31-
</Project>
36+
</Project>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
4+
<dllmap os="linux" dll="opencl.dll" target="/usr/lib/x86_64-linux-gnu/libOpenCL.so.1.0.0"/>
5+
</configuration>

0 commit comments

Comments
 (0)