Skip to content

Commit 9d3fcc3

Browse files
gsvgitgsvgit
committed
Merge transpose to net5
2 parents a361ed6 + 184c488 commit 9d3fcc3

32 files changed

Lines changed: 2235 additions & 1419 deletions

‎.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

‎.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

‎README.md‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,7 @@ The bin of your library should look similar to:
5959
$ tree src/MyCoolNewLib/bin/
6060
src/MyCoolNewLib/bin/
6161
└── Debug
62-
├── net461
63-
│   ├── FSharp.Core.dll
64-
│   ├── MyCoolNewLib.dll
65-
│   ├── MyCoolNewLib.pdb
66-
│   ├── MyCoolNewLib.xml
67-
└── netstandard2.1
62+
└── net50
6863
├── MyCoolNewLib.deps.json
6964
├── MyCoolNewLib.dll
7065
├── MyCoolNewLib.pdb

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
3+
24
<PropertyGroup>
35
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net5.0</TargetFrameworks>
6+
<TargetFramework>net5.0</TargetFramework>
57
</PropertyGroup>
8+
69
<PropertyGroup Condition="'$(Configuration)'=='Release'">
710
<Optimize>true</Optimize>
811
<Tailcalls>true</Tailcalls>
@@ -23,4 +26,5 @@
2326
<Compile Include="Program.fs" />
2427
</ItemGroup>
2528
<Import Project="..\..\.paket\Paket.Restore.targets" />
29+
2630
</Project>

‎docsSrc/Tutorials/Getting_Started.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ let foo = ()
55
let myAge = 21
66
```
77

8-
## Here is the path to downloading
8+
## Here is the path to downloading
99

1010
[lang=bash]
1111
paket install GraphBLAS-sharp

‎docsSrc/content/style.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ table.pre td.lines {
106106

107107
body {
108108
font-family: 'Open Sans', serif;
109+
background-color: #BADA55;
109110
}
110111

111112
pre {

‎paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ nuget System.CodeDom >= 5.0
1616
nuget FSharp.Quotations.Evaluator 2.1.0
1717
nuget FSharpx.Collections 2.1.3
1818
nuget FSharpx.Text.StructuredFormat ~> 3.0.0
19-
nuget Brahma.FSharp >= 2.0.0-alpha9.6
19+
nuget Brahma.FSharp >= 2.0.1
2020
nuget BenchmarkDotNet
2121
nuget MathNet.Numerics.FSharp
2222
nuget MathNet.Numerics.MKL.Win-x64 2.5.0

0 commit comments

Comments
 (0)