From d148fedce045689fe74e59bc47d8d029c077eb13 Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Thu, 8 Sep 2016 09:38:04 +0200
Subject: [PATCH] Release MKL Native Provider v2.1.0 (rev 10)

---
 RELEASENOTES-MKL.md                      |  3 ++
 build.fsx                                | 65 ++++++------------------
 src/NativeProviders/MKL/capabilities.cpp |  2 +-
 src/NativeProviders/MKL/resource.rc      |  8 +--
 4 files changed, 23 insertions(+), 55 deletions(-)

diff --git a/RELEASENOTES-MKL.md b/RELEASENOTES-MKL.md
index f72496f1..2b538c49 100644
--- a/RELEASENOTES-MKL.md
+++ b/RELEASENOTES-MKL.md
@@ -1,3 +1,6 @@
+### 2.1.0 - 2016-09-08
+* r10 with Intel MKL 2017
+
 ### 2.0.0 - 2015-09-26
 * r9 with Intel MKL 11.3
 * Linear Algebra v2.0: automatic work array/buffer handling (breaking change)
diff --git a/build.fsx b/build.fsx
index 32f4dedf..268e8c03 100644
--- a/build.fsx
+++ b/build.fsx
@@ -496,72 +496,37 @@ let test target =
     NUnit3 (fun p ->
         { p with
             ShadowCopy = false
+            Labels = LabelsLevel.Off
+            TimeOut = TimeSpan.FromMinutes 60. } |> quick) target
+
+let test32 target =
+    let quick p = if hasBuildParam "quick" then { p with Where="cat!=LongRunning" } else p
+    NUnit3 (fun p ->
+        { p with
+            Force32bit = true
+            ShadowCopy = false
+            Labels = LabelsLevel.Off
             TimeOut = TimeSpan.FromMinutes 60. } |> quick) target
 
 Target "Test" (fun _ -> test !! "out/test/**/*UnitTests*.dll")
 "Build" ?=> "Test"
 
-FinalTarget "CloseTestRunner" (fun _ ->
-    ProcessHelper.killProcess "nunit-agent.exe"
-    ProcessHelper.killProcess "nunit-agent-x86.exe"
-)
-
-Target "MklWin32Test" (fun _ ->
-    ActivateFinalTarget "CloseTestRunner"
-    !! "out/MKL/Windows/*UnitTests*.dll"
-    |> NUnit (fun p ->
-        { p with
-            ToolName = "nunit-console-x86.exe"
-            DisableShadowCopy = true
-            TimeOut = TimeSpan.FromMinutes 60.
-            OutputFile = "TestResults.xml" }))
-Target "MklWin64Test" (fun _ ->
-    ActivateFinalTarget "CloseTestRunner"
-    !! "out/MKL/Windows/*UnitTests*.dll"
-    |> NUnit (fun p ->
-        { p with
-            ToolName = "nunit-console.exe"
-            DisableShadowCopy = true
-            TimeOut = TimeSpan.FromMinutes 60.
-            OutputFile = "TestResults.xml" }))
+Target "MklWin32Test" (fun _ -> test32 !! "out/MKL/Windows/*UnitTests*.dll")
 "MklWin32Build" ?=> "MklWin32Test"
+Target "MklWin64Test" (fun _ -> test !! "out/MKL/Windows/*UnitTests*.dll")
 "MklWin64Build" ?=> "MklWin64Test"
 Target "MklWinTest" DoNothing
 "MklWin32Test" ==> "MklWinTest"
 "MklWin64Test" ==> "MklWinTest"
 
-Target "CudaWin64Test" (fun _ ->
-    ActivateFinalTarget "CloseTestRunner"
-    !! "out/CUDA/Windows/*UnitTests*.dll"
-    |> NUnit (fun p ->
-        { p with
-            ToolName = "nunit-console.exe"
-            DisableShadowCopy = true
-            TimeOut = TimeSpan.FromMinutes 60.
-            OutputFile = "TestResults.xml" }))
+Target "CudaWin64Test" (fun _ -> test !! "out/CUDA/Windows/*UnitTests*.dll")
 "CudaWin64Build" ?=> "CudaWin64Test"
 Target "CudaWinTest" DoNothing
 "CudaWin64Test" ==> "CudaWinTest"
 
-Target "OpenBlasWin32Test" (fun _ ->
-    ActivateFinalTarget "CloseTestRunner"
-    !! "out/OpenBLAS/Windows/*UnitTests*.dll"
-    |> NUnit (fun p ->
-        { p with
-            ToolName = "nunit-console-x86.exe"
-            DisableShadowCopy = true
-            TimeOut = TimeSpan.FromMinutes 60.
-            OutputFile = "TestResults.xml" }))
-Target "OpenBlasWin64Test" (fun _ ->
-    ActivateFinalTarget "CloseTestRunner"
-    !! "out/OpenBLAS/Windows/*UnitTests*.dll"
-    |> NUnit (fun p ->
-        { p with
-            ToolName = "nunit-console.exe"
-            DisableShadowCopy = true
-            TimeOut = TimeSpan.FromMinutes 60.
-            OutputFile = "TestResults.xml" }))
+Target "OpenBlasWin32Test" (fun _ -> test32 !! "out/OpenBLAS/Windows/*UnitTests*.dll")
 "OpenBlasWin32Build" ?=> "OpenBlasWin32Test"
+Target "OpenBlasWin64Test" (fun _ -> test !! "out/OpenBLAS/Windows/*UnitTests*.dll")
 "OpenBlasWin64Build" ?=> "OpenBlasWin64Test"
 Target "OpenBlasWinTest" DoNothing
 "OpenBlasWin32Test" ==> "OpenBlasWinTest"
diff --git a/src/NativeProviders/MKL/capabilities.cpp b/src/NativeProviders/MKL/capabilities.cpp
index 854a5b97..85a7ff64 100644
--- a/src/NativeProviders/MKL/capabilities.cpp
+++ b/src/NativeProviders/MKL/capabilities.cpp
@@ -41,7 +41,7 @@ extern "C" {
 #endif
 
 		// COMMON/SHARED
-		case 64: return 9; // revision
+		case 64: return 10; // 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 3708b549..23ecc4ed 100644
--- a/src/NativeProviders/MKL/resource.rc
+++ b/src/NativeProviders/MKL/resource.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,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.0.0.0"
+            VALUE "FileVersion", "2.1.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.0.0.0"
+            VALUE "ProductVersion", "2.1.0.0"
         END
     END
     BLOCK "VarFileInfo"