From cd39e69572d34554bbaa93e8c51f3e41dbdd324c Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Wed, 14 Feb 2018 20:58:35 +0100
Subject: [PATCH] Release MKL Provider v2.3.0 (r12 with Intel MKL 2018.0 Update
 1)

---
 RELEASENOTES-MKL.md                      |  3 +++
 src/Benchmark/Providers.cs               | 11 ++++-------
 src/Benchmark/Transforms/FFT.cs          |  2 +-
 src/NativeProviders/MKL/capabilities.cpp |  2 +-
 src/NativeProviders/MKL/resource.rc      |  8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/RELEASENOTES-MKL.md b/RELEASENOTES-MKL.md
index a496cc38..7d8b8af2 100644
--- a/RELEASENOTES-MKL.md
+++ b/RELEASENOTES-MKL.md
@@ -1,3 +1,6 @@
+### 2.3.0 - 2018-02-14
+* r12 with Intel MKL 2018.0 Update 1
+
 ### 2.2.0 - 2016-10-30
 * r11 with Intel MKL 2017.0
 * Vector Functions v0.1: vector power
diff --git a/src/Benchmark/Providers.cs b/src/Benchmark/Providers.cs
index 53ea6889..bf399a9e 100644
--- a/src/Benchmark/Providers.cs
+++ b/src/Benchmark/Providers.cs
@@ -1,6 +1,5 @@
 using System;
 using MathNet.Numerics;
-
 #if !NETCOREAPP1_1
 using MathNet.Numerics.Providers.Common.Mkl;
 #endif
@@ -14,15 +13,13 @@ namespace Benchmark
         NativeMKLAutoLow = 2,
         NativeMKLAvx2High = 3,
         NativeMKLAvx2Low = 4,
-        NativeOpenBLAS = 5
+        //NativeOpenBLAS = 5
     }
 
     public static class Providers
     {
         public static void ForceProvider(Provider provider)
         {
-            //Control.NativeProviderPath = @"..\..\..\..\out\MKL\Windows\";
-
             switch (provider)
             {
                 case Provider.Managed:
@@ -40,9 +37,9 @@ namespace Benchmark
                 case Provider.NativeMKLAvx2Low:
                     Control.UseNativeMKL(MklConsistency.AVX2, MklPrecision.Double, MklAccuracy.Low);
                     break;
-                case Provider.NativeOpenBLAS:
-                    Control.UseNativeOpenBLAS();
-                    break;
+                //case Provider.NativeOpenBLAS:
+                //    Control.UseNativeOpenBLAS();
+                //    break;
                 default:
                     throw new NotSupportedException($"Provider {provider} not supported.");
             }
diff --git a/src/Benchmark/Transforms/FFT.cs b/src/Benchmark/Transforms/FFT.cs
index 9bee8a14..4586c605 100644
--- a/src/Benchmark/Transforms/FFT.cs
+++ b/src/Benchmark/Transforms/FFT.cs
@@ -33,7 +33,7 @@ namespace Benchmark.Transforms
             }
         }
 
-        [Params(32)] //, 128, 64, 1024, 8192, 65536)]
+        [Params(32, 128, 1024)] // 32, 64, 128, 1024, 8192, 65536
         public int N { get; set; }
 
         [Params(Provider.Managed, Provider.NativeMKLAutoHigh)]
diff --git a/src/NativeProviders/MKL/capabilities.cpp b/src/NativeProviders/MKL/capabilities.cpp
index 270e1521..a51e4eb1 100644
--- a/src/NativeProviders/MKL/capabilities.cpp
+++ b/src/NativeProviders/MKL/capabilities.cpp
@@ -66,7 +66,7 @@ extern "C" {
 			}
 
 		// COMMON/SHARED
-		case 64: return 11; // revision
+		case 64: return 12; // 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 f6773856..0ab0c10b 100644
--- a/src/NativeProviders/MKL/resource.rc
+++ b/src/NativeProviders/MKL/resource.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,0,0
- PRODUCTVERSION 2,2,0,0
+ FILEVERSION 2,3,0,0
+ PRODUCTVERSION 2,3,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.2.0.0"
+            VALUE "FileVersion", "2.3.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.2.0.0"
+            VALUE "ProductVersion", "2.3.0.0"
         END
     END
     BLOCK "VarFileInfo"