diff --git a/.gitattributes b/.gitattributes index 0a57d140..f87fd463 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,5 @@ +* text=auto + *.cs text diff=csharp *.msbuild text *.config text @@ -7,7 +9,8 @@ *.xml text *.js text *.ps1 text -*.DotSettings text + +*.DotSettings text eol=lf *.sh text eol=lf *.csproj text merge=union @@ -24,5 +27,3 @@ *.DOCX diff=astextplain *.pdf diff=astextplain *.PDF diff=astextplain - -* text=auto diff --git a/MathNet.Numerics.Data.sln.DotSettings b/MathNet.Numerics.Data.sln.DotSettings index 104d6356..d2773d8b 100644 --- a/MathNet.Numerics.Data.sln.DotSettings +++ b/MathNet.Numerics.Data.sln.DotSettings @@ -77,6 +77,8 @@ OTHER DEALINGS IN THE SOFTWARE. SVD TFQMR WH + True True + True <data /> <data><IncludeFilters /><ExcludeFilters /></data> \ No newline at end of file diff --git a/MathNet.Numerics.Net35Only.sln.DotSettings b/MathNet.Numerics.Net35Only.sln.DotSettings index cd49821b..71ae4c46 100644 --- a/MathNet.Numerics.Net35Only.sln.DotSettings +++ b/MathNet.Numerics.Net35Only.sln.DotSettings @@ -66,6 +66,8 @@ OTHER DEALINGS IN THE SOFTWARE. SVD TFQMR WH + True True + True <data /> <data><IncludeFilters /><ExcludeFilters /></data> \ No newline at end of file diff --git a/docs/content/Packages.md b/docs/content/Packages.md index 114c8fe3..62a0f930 100644 --- a/docs/content/Packages.md +++ b/docs/content/Packages.md @@ -33,15 +33,19 @@ packages do not contain portable builds. Intel MKL Native Provider ------------------------- -Since v3.6.0 Math.NET Numerics can automatically choose the 64- or 32-bit version -of native providers depending on the operating system and process. But we do not -provide combined NuGet packages yet. If you intend to [maintain the native binaries -manually](MKL.html#Native-Binaries) it may be easier to download the combined Zip file in the release archive. +The new combined package includes both 32 and 64 bit binaries and can automatically +pick the right one at runtime. It is also MsBuild integrated, so there is no +more need to any manual file handling. But it is only supported by Math.NET Numerics +v3.6.0 and higher. + +If you intend to [maintain the native binaries manually](MKL.html#Native-Binaries) +it may be easier to download the Zip file in the release archive. [Intel MKL Native Provider Release Notes](ReleaseNotes-MKL.html) -- [**MathNet.Numerics.MKL.Win-x64**](https://www.nuget.org/packages/MathNet.Numerics.MKL.Win-x64/) - Windows 64-bit. -- [**MathNet.Numerics.MKL.Win-x86**](https://www.nuget.org/packages/MathNet.Numerics.MKL.Win-x86/) - Windows 32-bit. +- [**MathNet.Numerics.MKL.Win**](https://www.nuget.org/packages/MathNet.Numerics.MKL.Win/) - Windows (combined, MsBuild integrated). +- [**MathNet.Numerics.MKL.Win-x64**](https://www.nuget.org/packages/MathNet.Numerics.MKL.Win-x64/) - Windows 64-bit only. +- [**MathNet.Numerics.MKL.Win-x86**](https://www.nuget.org/packages/MathNet.Numerics.MKL.Win-x86/) - Windows 32-bit only. - [**MathNet.Numerics.MKL.Linux-x64**](https://www.nuget.org/packages/MathNet.Numerics.MKL.Linux-x64/) - Linux 64-bit. - [**MathNet.Numerics.MKL.Linux-x86**](https://www.nuget.org/packages/MathNet.Numerics.MKL.Linux-x86/) - Linux 32-bit. diff --git a/docs/content/Users.md b/docs/content/Users.md index dc166eb6..a93f010e 100644 --- a/docs/content/Users.md +++ b/docs/content/Users.md @@ -35,6 +35,8 @@ Closed Source * [SpectraFox](http://www.spectrafox.com/) STM / AFM spectroscopy analysis * [Colymp](http://colymp.com/) Color Management Software * [ILNumerics](http://ilnumerics.net/) +* [GazeSpeaker](http://www.gazespeaker.org) Free software to help people with disabilities +* [ModVal.org](http://www.modval.org) Quant model repository for regulatory and internal model validation. * At least half of the hearing aid market for their software to fit their hearing instruments to a patient's actual hearing loss.