Release MKL Native Provider v2.0.0 (rev 9, linear algebra v2.0)

RELEASENOTES-MKL.md

@@ -1,3 +1,7 @@
+### 2.0.0 - 2015-09-26
+* r9 with Intel MKL 11.3
+* Linear Algebra v2.0: automatic work array/buffer handling (breaking change)
+
 ### 1.8.0 - 2015-05-09
 * r8 with Intel MKL 11.2 Update 3
 * New combined NuGet package including both 32 and 64 bit builds and a proper build target (Win only)

build.fsx

@@ -206,7 +206,7 @@ let mklWinPack =
       Version = mklPackageVersion
       Title = "Math.NET Numerics - MKL Native Provider for Windows (x64 and x86)"
       Summary = ""
-      Description = "Intel MKL native libraries for Math.NET Numerics. Requires an Intel MKL license if redistributed."
+      Description = "Intel MKL native libraries for Math.NET Numerics on Windows."
       ReleaseNotes = mklReleaseNotes
       Tags = "math numeric statistics probability integration interpolation linear algebra matrix fft native mkl"
       Authors = [ "Christoph Ruegg"; "Marcus Cuda"; "Jurgen Van Gael" ]
@@ -223,38 +223,53 @@ let mklWin32Pack =
         Id = "MathNet.Numerics.MKL.Win-x86"
         Title = "Math.NET Numerics - MKL Native Provider for Windows (x86)"
         Files =
-          [ @"..\..\out\MKL\Windows\x86\libiomp5md.dll", Some "content", None;
+          [ @"..\..\build\NativeProvider.targets", Some "build\MathNet.Numerics.MKL.Win-x86.targets", None;
-            @"..\..\out\MKL\Windows\x86\MathNet.Numerics.MKL.dll", Some "content", None ] }
+            @"..\..\out\MKL\Windows\x86\libiomp5md.dll", Some @"build\x86", None;
+            @"..\..\out\MKL\Windows\x86\MathNet.Numerics.MKL.dll", Some @"build\x86", None ] }
 
 let mklWin64Pack =
     { mklWinPack with
         Id = "MathNet.Numerics.MKL.Win-x64"
         Title = "Math.NET Numerics - MKL Native Provider for Windows (x64)"
         Files =
-          [ @"..\..\out\MKL\Windows\x64\libiomp5md.dll", Some "content", None;
+          [ @"..\..\build\NativeProvider.targets", Some "build\MathNet.Numerics.MKL.Win-x64.targets", None;
-            @"..\..\out\MKL\Windows\x64\MathNet.Numerics.MKL.dll", Some "content", None ] }
+            @"..\..\out\MKL\Windows\x64\libiomp5md.dll", Some @"build\x64", None;
+            @"..\..\out\MKL\Windows\x64\MathNet.Numerics.MKL.dll", Some @"build\x64", None ] }
 
-let mklLinux32Pack =
+let mklLinuxPack =
-    { Id = "MathNet.Numerics.MKL.Linux-x86"
+    { Id = "MathNet.Numerics.MKL.Linux"
       Version = mklPackageVersion
-      Title = "Math.NET Numerics - MKL Native Provider for Linux (x86)"
+      Title = "Math.NET Numerics - MKL Native Provider for Linux (x64 and x86)"
       Summary = ""
-      Description = "Intel MKL native libraries for Math.NET Numerics. Requires an Intel MKL license if redistributed."
+      Description = "Intel MKL native libraries for Math.NET Numerics on Linux."
       ReleaseNotes = mklReleaseNotes
       Tags = "math numeric statistics probability integration interpolation linear algebra matrix fft native mkl"
       Authors = [ "Christoph Ruegg"; "Marcus Cuda"; "Jurgen Van Gael" ]
       Dependencies = []
       Files =
-        [ @"..\..\out\MKL\Linux\x86\libiomp5.so", Some "content", None;
+        [ @"..\..\build\NativeProvider.targets", Some "build\MathNet.Numerics.MKL.Linux.targets", None;
-          @"..\..\out\MKL\Linux\x86\MathNet.Numerics.MKL.dll", Some "content", None ] }
+          @"..\..\out\MKL\Linux\x64\libiomp5.so", Some @"build\x64", None;
+          @"..\..\out\MKL\Linux\x64\MathNet.Numerics.MKL.dll", Some @"build\x64", None;
+          @"..\..\out\MKL\Linux\x86\libiomp5.so", Some @"build\x86", None;
+          @"..\..\out\MKL\Linux\x86\MathNet.Numerics.MKL.dll", Some @"build\x86", None ] }
+
+let mklLinux32Pack =
+    { mklLinuxPack with
+        Id = "MathNet.Numerics.MKL.Linux-x86"
+        Title = "Math.NET Numerics - MKL Native Provider for Linux (x86)"
+        Files =
+          [ @"..\..\build\NativeProvider.targets", Some "build\MathNet.Numerics.MKL.Linux-x86.targets", None;
+            @"..\..\out\MKL\Linux\x86\libiomp5.so", Some @"build\x86", None;
+            @"..\..\out\MKL\Linux\x86\MathNet.Numerics.MKL.dll", Some @"build\x86", None ] }
 
 let mklLinux64Pack =
-    { mklLinux32Pack with
+    { mklLinuxPack with
         Id = "MathNet.Numerics.MKL.Linux-x64"
         Title = "Math.NET Numerics - MKL Native Provider for Linux (x64)"
         Files =
-          [ @"..\..\out\MKL\Linux\x64\libiomp5.so", Some "content", None;
+          [ @"..\..\build\NativeProvider.targets", Some "build\MathNet.Numerics.MKL.Linux-x64.targets", None;
-            @"..\..\out\MKL\Linux\x64\MathNet.Numerics.MKL.dll", Some "content", None ] }
+            @"..\..\out\MKL\Linux\x64\libiomp5.so", Some @"build\x64", None;
+            @"..\..\out\MKL\Linux\x64\MathNet.Numerics.MKL.dll", Some @"build\x64", None ] }
 
 let mklWinBundle =
     { Id = "MathNet.Numerics.MKL.Win"
@@ -270,7 +285,7 @@ let mklLinuxBundle =
       Title = "Math.NET Numerics MKL Native Provider for Linux"
       ReleaseNotesFile = "RELEASENOTES-MKL.md"
       FsLoader = false
-      Packages = [ mklLinux32Pack; mklLinux64Pack ] }
+      Packages = [ mklLinuxPack; mklLinux32Pack; mklLinux64Pack ] }
 
 
 // CUDA NATIVE PROVIDER PACKAGES

build/NativeProvider.targets

@@ -6,6 +6,7 @@
   -->
   <ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And HasTrailingSlash('$(MSBuildThisFileDirectory)')">
     <MathNetInteropFiles Include="$(MSBuildThisFileDirectory)**\*.dll" />
+    <MathNetInteropFiles Include="$(MSBuildThisFileDirectory)**\*.so" />
     <Content Include="@(MathNetInteropFiles)">
       <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/NativeProviders/MKL/resource.rc

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,0,0
+ FILEVERSION 2,0,0,0
- PRODUCTVERSION 1,8,0,0
+ PRODUCTVERSION 2,0,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", "1.8.0.0"
+            VALUE "FileVersion", "2.0.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", "1.8.0.0"
+            VALUE "ProductVersion", "2.0.0.0"
         END
     END
     BLOCK "VarFileInfo"