diff --git a/MathNet.Numerics.MKL.sln b/MathNet.Numerics.MKL.sln index 2f4bd736..dd93e281 100644 --- a/MathNet.Numerics.MKL.sln +++ b/MathNet.Numerics.MKL.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.1082 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30114.105 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{5A0892FF-82CE-40FC-BCE1-73810C615F52}" ProjectSection(SolutionItems) = preProject @@ -138,7 +138,9 @@ Global {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|Win32.ActiveCfg = Debug|Any CPU + {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|Win32.Build.0 = Debug|Any CPU {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|x64.ActiveCfg = Debug|Any CPU + {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Debug|x64.Build.0 = Debug|Any CPU {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|Any CPU.ActiveCfg = Release|Any CPU {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|Any CPU.Build.0 = Release|Any CPU {3515A344-AB5F-41C7-A14C-04A79B3FFAB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU @@ -166,7 +168,9 @@ Global {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Debug|Win32.ActiveCfg = Debug|Any CPU + {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Debug|Win32.Build.0 = Debug|Any CPU {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Debug|x64.ActiveCfg = Debug|Any CPU + {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Debug|x64.Build.0 = Debug|Any CPU {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Release|Any CPU.ActiveCfg = Release|Any CPU {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Release|Any CPU.Build.0 = Release|Any CPU {AF3253C9-4DB5-45A0-98CF-C105FDA9DA47}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU diff --git a/RELEASENOTES-MKL.md b/RELEASENOTES-MKL.md index 7d8b8af2..4ab46b1b 100644 --- a/RELEASENOTES-MKL.md +++ b/RELEASENOTES-MKL.md @@ -1,3 +1,6 @@ +### 2.4.0 - 2020-05-22 +* r13 with Intel MKL 2020.0 Update 1 + ### 2.3.0 - 2018-02-14 * r12 with Intel MKL 2018.0 Update 1 diff --git a/src/NativeProviders/MKL/capabilities.cpp b/src/NativeProviders/MKL/capabilities.cpp index a51e4eb1..025bd9fa 100644 --- a/src/NativeProviders/MKL/capabilities.cpp +++ b/src/NativeProviders/MKL/capabilities.cpp @@ -66,7 +66,7 @@ extern "C" { } // COMMON/SHARED - case 64: return 12; // revision + case 64: return 13; // revision case 65: return 1; // numerical consistency, precision and accuracy modes case 66: return 1; // threading control case 67: return 1; // memory management diff --git a/src/NativeProviders/MKL/resource.rc b/src/NativeProviders/MKL/resource.rc index 0ab0c10b..6255b6df 100644 --- a/src/NativeProviders/MKL/resource.rc +++ b/src/NativeProviders/MKL/resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,3,0,0 - PRODUCTVERSION 2,3,0,0 + FILEVERSION 2,4,0,0 + PRODUCTVERSION 2,4,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "http://numerics.mathdotnet.com/" VALUE "CompanyName", "Math.NET" VALUE "FileDescription", "MathNET Numerics MKL Native Provider" - VALUE "FileVersion", "2.3.0.0" + VALUE "FileVersion", "2.4.0.0" VALUE "InternalName", "Math.NET" VALUE "LegalCopyright", "Copyright (C) Math.NET 2009-2015" VALUE "OriginalFilename", "MathNet.Numerics.MKL" VALUE "ProductName", "Math.NET Numerics" - VALUE "ProductVersion", "2.3.0.0" + VALUE "ProductVersion", "2.4.0.0" END END BLOCK "VarFileInfo"