Skip to content

Commit 4d388b8

Browse files
gsvgitgsvgit
authored
Merge pull request #23 from YaccConstructor/dev
Synchronize master and dev branches
2 parents bb8fa6d + 86c5614 commit 4d388b8

109 files changed

Lines changed: 7644 additions & 685 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.

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ indent_size = 2
2323
[*.paket.references]
2424
trim_trailing_whitespace = true
2525
indent_size = 2
26+
27+
[*.yml]
28+
trim_trailing_whitespace = true
29+
indent_size = 2

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ jobs:
4444
- name: Build
4545
run: ./build.cmd
4646
env:
47-
CI: true
47+
CI: true

‎.gitignore‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,5 +267,7 @@ coverage.*.xml
267267
.paket/.store
268268
.paket/paket
269269

270-
.fake
271-
.ionide
270+
BenchmarkDotNet.Artifacts/
271+
272+
# Folder for datasets
273+
benchmarks/GraphBLAS-sharp.Benchmarks/Datasets

‎.vscode/launch.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
// Используйте IntelliSense, чтобы узнать о возможных атрибутах.
3+
// Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.
4+
// Для получения дополнительной информации посетите: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": ".NET Core Launch (console)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
"program": "${workspaceFolder}/tests/GraphBLAS-sharp.Tests/bin/Debug/netcoreapp3.1/GraphBLAS-sharp.Tests.dll",
13+
"args": [],
14+
"cwd": "${workspaceFolder}",
15+
"stopAtEntry": false,
16+
"console": "internalConsole"
17+
}
18+
]
19+
}

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"FSharp.enableAnalyzers": true,
44
"FSharp.analyzersPath": [
55
"./packages/analyzers"
6-
]
6+
],
7+
"FSharp.suggestSdkScripts": false,
78
}

‎.vscode/tasks.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "build",
8+
"command": "dotnet",
9+
"type": "shell",
10+
"args": [
11+
"build",
12+
// Ask dotnet build to generate full paths for file names.
13+
"/property:GenerateFullPaths=true",
14+
// Do not generate summary otherwise it leads to duplicate errors in Problems panel
15+
"/consoleloggerparameters:NoSummary"
16+
],
17+
"group": "build",
18+
"presentation": {
19+
"reveal": "silent"
20+
},
21+
"problemMatcher": "$msCompile"
22+
}
23+
]
24+
}

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
<Authors>YaccConstructor</Authors>
1010
<RepositoryUrl>https://github.com/YaccConstructor/GraphBLAS-sharp</RepositoryUrl>
1111
<!-- owners is not supported in MSBuild -->
12+
<DisableFody>true</DisableFody>
1213
</PropertyGroup>
1314
</Project>

‎GraphBLAS-sharp.sln‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ 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}"
15+
EndProject
16+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GraphBLAS-sharp.Benchmarks", "benchmarks\GraphBLAS-sharp.Benchmarks\GraphBLAS-sharp.Benchmarks.fsproj", "{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}"
17+
EndProject
1418
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "docsTool", "docsTool\docsTool.fsproj", "{8855EC73-F6A1-43D3-AFBC-04A3E09F9BD9}"
1519
EndProject
1620
Global
@@ -62,9 +66,22 @@ Global
6266
{8855EC73-F6A1-43D3-AFBC-04A3E09F9BD9}.Release|x64.Build.0 = Release|Any CPU
6367
{8855EC73-F6A1-43D3-AFBC-04A3E09F9BD9}.Release|x86.ActiveCfg = Release|Any CPU
6468
{8855EC73-F6A1-43D3-AFBC-04A3E09F9BD9}.Release|x86.Build.0 = Release|Any CPU
69+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
71+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|x64.ActiveCfg = Debug|Any CPU
72+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|x64.Build.0 = Debug|Any CPU
73+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|x86.ActiveCfg = Debug|Any CPU
74+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Debug|x86.Build.0 = Debug|Any CPU
75+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
76+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|Any CPU.Build.0 = Release|Any CPU
77+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|x64.ActiveCfg = Release|Any CPU
78+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|x64.Build.0 = Release|Any CPU
79+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|x86.ActiveCfg = Release|Any CPU
80+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6}.Release|x86.Build.0 = Release|Any CPU
6581
EndGlobalSection
6682
GlobalSection(NestedProjects) = preSolution
6783
{5D30E174-2538-47AC-8443-318C8C5DC2C9} = {C397A34C-84F1-49E7-AEBC-2F9F2B196216}
6884
{1CA2E092-2320-451D-A4F0-9ED7C7C528CA} = {ACBEE43C-7A88-4FB1-9B06-DB064D22B29F}
85+
{4C6EB3D0-B6BF-4FF5-BC77-CC7CB3F307E6} = {DEF656DE-BCED-4C49-B5ED-950D4A29B78B}
6986
EndGlobalSection
7087
EndGlobal

‎benchmarks/Directory.Build.props‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
3+
<PropertyGroup>
4+
<IsPackable>false</IsPackable>
5+
<IsTestProject>false</IsTestProject>
6+
</PropertyGroup>
7+
</Project>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Auto-Generated by FAKE; do not edit
2+
namespace System
3+
open System.Reflection
4+
5+
[<assembly: AssemblyTitleAttribute("GraphBLAS-sharp.Benchmarks")>]
6+
[<assembly: AssemblyProductAttribute("GraphBLAS-sharp")>]
7+
[<assembly: AssemblyVersionAttribute("0.1.0")>]
8+
[<assembly: AssemblyMetadataAttribute("ReleaseDate","2017-03-17T00:00:00.0000000")>]
9+
[<assembly: AssemblyFileVersionAttribute("0.1.0")>]
10+
[<assembly: AssemblyInformationalVersionAttribute("0.1.0")>]
11+
[<assembly: AssemblyMetadataAttribute("ReleaseChannel","release")>]
12+
[<assembly: AssemblyMetadataAttribute("GitHash","bb8964b54bee133e9af64d316dc2cfee16df7f72")>]
13+
do ()
14+
15+
module internal AssemblyVersionInformation =
16+
let [<Literal>] AssemblyTitle = "GraphBLAS-sharp.Benchmarks"
17+
let [<Literal>] AssemblyProduct = "GraphBLAS-sharp"
18+
let [<Literal>] AssemblyVersion = "0.1.0"
19+
let [<Literal>] AssemblyMetadata_ReleaseDate = "2017-03-17T00:00:00.0000000"
20+
let [<Literal>] AssemblyFileVersion = "0.1.0"
21+
let [<Literal>] AssemblyInformationalVersion = "0.1.0"
22+
let [<Literal>] AssemblyMetadata_ReleaseChannel = "release"
23+
let [<Literal>] AssemblyMetadata_GitHash = "bb8964b54bee133e9af64d316dc2cfee16df7f72"

0 commit comments

Comments
 (0)