Skip to content

Commit 79a5d96

Browse files
committed
Add net461 for benchmarks; move float32 semiring
1 parent 8f135fa commit 79a5d96

5 files changed

Lines changed: 18 additions & 15 deletions

File tree

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksBFS.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ type BFSBenchmark4CSRMatrix() =
3131
/// Sequence of paths to files where data for benchmarking will be taken from
3232
static member GraphPaths = seq {
3333
// Gets all mtx files from following directory
34-
yield! Directory.EnumerateFiles(Path.Join [|"Datasets"; "1"|], "*.mtx")
34+
yield! Directory.EnumerateFiles(Path.Combine [|"Datasets"; "1"|], "*.mtx")
3535
}

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksEWiseAdd.fs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@ open Brahma.FSharp.OpenCL.WorkflowBuilder.Basic
1515
open Brahma.FSharp.OpenCL.WorkflowBuilder.Evaluation
1616
open OpenCL.Net
1717

18-
module Float32Monoid =
19-
let add: Monoid<float32> = {
20-
Zero = 0.f
21-
Append = BinaryOp <@ (+) @>
22-
}
23-
24-
module Float32Semiring =
25-
let addMult: Semiring<float32> = {
26-
PlusMonoid = Float32Monoid.add
27-
Times = BinaryOp <@ (*) @>
28-
}
29-
3018
type Config() =
3119
inherit ManualConfig()
3220

benchmarks/GraphBLAS-sharp.Benchmarks/GraphBLAS-sharp.Benchmarks.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
55
</PropertyGroup>
66
<PropertyGroup Condition="'$(Configuration)'=='Release'">
77
<Optimize>true</Optimize>

src/GraphBLAS-sharp/GraphBLAS-sharp.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.1;net461</TargetFrameworks>
5-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
65
</PropertyGroup>
76
<PropertyGroup Condition="'$(Configuration)'=='Release'">
87
<Optimize>true</Optimize>
@@ -23,6 +22,7 @@
2322
<Compile Include="Matrix.fs" />
2423
<Compile Include="Vector.fs" />
2524
<Compile Include="Predefined/Float.fs" />
25+
<Compile Include="Predefined/Float32.fs" />
2626
<Compile Include="Predefined/Integer.fs" />
2727
<Compile Include="Predefined/Boolean.fs" />
2828
<Compile Include="Algorithms/BFS.fs" />
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
namespace GraphBLAS.FSharp.Predefined
2+
3+
open GraphBLAS.FSharp
4+
5+
module Float32Monoid =
6+
let add: Monoid<float32> = {
7+
Zero = 0.f
8+
Append = BinaryOp <@ (+) @>
9+
}
10+
11+
module Float32Semiring =
12+
let addMult: Semiring<float32> = {
13+
PlusMonoid = Float32Monoid.add
14+
Times = BinaryOp <@ (*) @>
15+
}

0 commit comments

Comments
 (0)