Skip to content

Commit 37f8e42

Browse files
Merge branch 'mathnet:master' into BigInteger
2 parents c247790 + 389a329 commit 37f8e42

47 files changed

Lines changed: 1440 additions & 1404 deletions

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: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
"paket"
99
]
1010
},
11-
"fake-cli": {
12-
"version": "5.20.4",
13-
"commands": [
14-
"fake"
15-
]
16-
},
1711
"fsharp.formatting.commandtool": {
1812
"version": "11.4.1",
1913
"commands": [

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ indent_style = space
88
indent_size = 4
99
insert_final_newline = true
1010
trim_trailing_whitespace = true
11+
tab_width=4
1112

1213
[*.md]
1314
trim_trailing_whitespace = false

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ on:
1111
jobs:
1212
analyze:
1313
name: Analyze
14-
runs-on: windows-latest
14+
runs-on: windows-2019
1515

1616
strategy:
1717
fail-fast: false
1818
matrix:
1919
language: [ 'csharp' ]
20-
dotnet: [ '5.0.100' ]
20+
dotnet: [ '6.0.100' ]
2121
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
2222

2323
steps:

Directory.Build.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<StrongName Condition="'$(StrongName)' == ''">False</StrongName>
1616
<PackageIdSuffix Condition="'$(PackageIdSuffix)' == ''"></PackageIdSuffix>
1717
<TitleSuffix Condition="'$(TitleSuffix)' == ''"></TitleSuffix>
18+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
19+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
20+
<Nullable>disable</Nullable>
21+
<EnableNETAnalyzers>True</EnableNETAnalyzers>
22+
<AnalysisLevel>5.0</AnalysisLevel>
1823
</PropertyGroup>
1924
<PropertyGroup Condition="'$(StrongName)'=='True'">
2025
<SignAssembly>true</SignAssembly>
@@ -28,9 +33,4 @@
2833
<ItemGroup>
2934
<None Include="$(MSBuildThisFileDirectory)build/icon.png" Pack="true" Visible="false" PackagePath="\" />
3035
</ItemGroup>
31-
<PropertyGroup>
32-
<FsDocsLogoSource>/logo.png</FsDocsLogoSource>
33-
<FsDocsLogoLink>https://numerics.mathdotnet.com/</FsDocsLogoLink>
34-
<FsDocsNavbarPosition>fixed-left</FsDocsNavbarPosition>
35-
</PropertyGroup>
3636
</Project>

MathNet.Numerics.sln

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.28729.10
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32112.339
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Readme", "Readme", "{C2F37492-38AE-4186-8A7F-17B0B080942C}"
77
ProjectSection(SolutionItems) = preProject
@@ -27,37 +27,36 @@ EndProject
2727
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B54A0B40-DE22-49FB-B1C0-6E5BDA3B0B2F}"
2828
ProjectSection(SolutionItems) = preProject
2929
appveyor.yml = appveyor.yml
30-
build.fsx = build.fsx
31-
global.json = global.json
32-
paket.dependencies = paket.dependencies
33-
paket.lock = paket.lock
3430
Directory.Build.props = Directory.Build.props
31+
global.json = global.json
3532
build\MathNet.Numerics.CUDA.Win.nuspec = build\MathNet.Numerics.CUDA.Win.nuspec
36-
build\MathNet.Numerics.MKL.Linux.nuspec = build\MathNet.Numerics.MKL.Linux.nuspec
3733
build\MathNet.Numerics.MKL.Linux-x64.nuspec = build\MathNet.Numerics.MKL.Linux-x64.nuspec
3834
build\MathNet.Numerics.MKL.Linux-x86.nuspec = build\MathNet.Numerics.MKL.Linux-x86.nuspec
39-
build\MathNet.Numerics.MKL.Win.nuspec = build\MathNet.Numerics.MKL.Win.nuspec
35+
build\MathNet.Numerics.MKL.Linux.nuspec = build\MathNet.Numerics.MKL.Linux.nuspec
4036
build\MathNet.Numerics.MKL.Win-x64.nuspec = build\MathNet.Numerics.MKL.Win-x64.nuspec
4137
build\MathNet.Numerics.MKL.Win-x86.nuspec = build\MathNet.Numerics.MKL.Win-x86.nuspec
38+
build\MathNet.Numerics.MKL.Win.nuspec = build\MathNet.Numerics.MKL.Win.nuspec
4239
build\MathNet.Numerics.OpenBLAS.Win.nuspec = build\MathNet.Numerics.OpenBLAS.Win.nuspec
4340
build\NativeProvider.targets = build\NativeProvider.targets
41+
paket.dependencies = paket.dependencies
42+
paket.lock = paket.lock
4443
EndProjectSection
4544
EndProject
4645
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestData", "src\TestData\TestData.csproj", "{AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}"
4746
EndProject
4847
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark", "src\Benchmark\Benchmark.csproj", "{82444930-9FD7-41B6-B476-CCE41A0C0A0B}"
4948
EndProject
50-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Providers.MKL", "src\Providers.MKL\Providers.MKL.csproj", "{0B5FAFAA-4286-4D92-B5AB-CBA75ADDA0BB}"
49+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Providers.MKL", "src\Providers.MKL\Providers.MKL.csproj", "{0B5FAFAA-4286-4D92-B5AB-CBA75ADDA0BB}"
5150
EndProject
52-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Providers.CUDA", "src\Providers.CUDA\Providers.CUDA.csproj", "{3C0D4A87-CC89-43B6-B028-4122099D692F}"
51+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Providers.CUDA", "src\Providers.CUDA\Providers.CUDA.csproj", "{3C0D4A87-CC89-43B6-B028-4122099D692F}"
5352
EndProject
54-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Providers.OpenBLAS", "src\Providers.OpenBLAS\Providers.OpenBLAS.csproj", "{FBE18DF3-EEC3-4812-9FB4-B9EA6EAEC029}"
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Providers.OpenBLAS", "src\Providers.OpenBLAS\Providers.OpenBLAS.csproj", "{FBE18DF3-EEC3-4812-9FB4-B9EA6EAEC029}"
5554
EndProject
56-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.Matlab", "src\Data.Matlab\Data.Matlab.csproj", "{2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}"
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data.Matlab", "src\Data.Matlab\Data.Matlab.csproj", "{2AA6CF31-96A1-4BB5-AD2E-7840167FE4DA}"
5756
EndProject
58-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.Text", "src\Data.Text\Data.Text.csproj", "{B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}"
57+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data.Text", "src\Data.Text\Data.Text.csproj", "{B626F8B8-51A5-4FB6-BE5A-E94B27B1A050}"
5958
EndProject
60-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data.Tests", "src\Data.Tests\Data.Tests.csproj", "{1FBB8988-3F40-4FCE-BEA8-2C705888804A}"
59+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data.Tests", "src\Data.Tests\Data.Tests.csproj", "{1FBB8988-3F40-4FCE-BEA8-2C705888804A}"
6160
EndProject
6261
Global
6362
GlobalSection(SolutionConfigurationPlatforms) = preSolution

RELEASENOTES.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
### 5.0.0-alpha08 - 2021-12-23
1+
### 5.0.0-alpha09 - 2022-02-13
22
* COMPATIBILITY: net5.0, net48 better supported with explicit builds
33
* COMPATIBILITY: netstandard1.x, net40, net45 no longer supported
44
* BREAKING: drop all which was marked as obsolete
55
* BREAKING: all native provider adapters moved out to separate NuGet packages
66
* BREAKING: switch many usages of tuples to value tuples (experimental)
77
* Distributions: Logistic *~Bobby Ingram*
88
* Distributions: Perf: Cauchy avoid duplicate evaluation *~Febin*
9+
* Random: NextBigIngegerSequence *~Silver-Fang*
10+
* Random: xoshiro256StarStar fix out of range exception *~Charlie Turndorf*
911
* Precision: Perf: pre-compute negative powers *~Febin*
1012
* Optimizations: Remove static properties in LevenbergMarquardtMinimizer *~Jong Hyun Kim*
1113
* Root Finding: Newton-Raphson better handling of zero-evaluations
1214
* Fit.Curve and FindMinimum extended to accept two more parameters
1315
* Fixed an index out of bounds issue when calculating BFGS minimizer with one variable *~Shiney*
14-
* Marcum-Q function *~CHUTORO*
16+
* Fixed Sparse COO NormalizeDuplicates *~Mohamed Moussa*
17+
* Marcum-Q and Log1p functions *~CHUTORO*
1518
* Series: stable series summation
1619
* Providers: binary names and loading changes to follow conventions and better x-plat
1720
* Providers: drop managed reference linear algebra provider

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ image: Visual Studio 2017
22
init:
33
- git config --global core.autocrlf true
44
install:
5-
# Download .NET Core SDK 5.0.100 and add to PATH
6-
- ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.100/dotnet-sdk-5.0.100-win-x64.zip"
5+
# Download .NET Core SDK 6.0.100 and add to PATH
6+
- ps: $urlCurrent = "https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip"
77
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
88
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
99
- ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName()

build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ if errorlevel 1 (
88
exit /b %errorlevel%
99
)
1010

11-
dotnet fake run build.fsx -t %*
11+
dotnet run --project ./build/build.fsproj -- -t %*

0 commit comments

Comments
 (0)