From b3305125faa8decb617c02dcb4be90b035caff94 Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Sat, 18 Apr 2020 20:09:12 +0200
Subject: [PATCH] MKL: Switch to Intel Compiler 20

---
 .../Windows/MKL/MKLWrapper.vcxproj            | 24 +++++++++----------
 src/Numerics.Tests/Numerics.Tests.CUDA.csproj |  2 +-
 src/Numerics.Tests/Numerics.Tests.MKL.csproj  |  2 +-
 .../Numerics.Tests.OpenBLAS.csproj            |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
index 8cee97e4..88e16344 100644
--- a/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
+++ b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
@@ -99,43 +99,43 @@
     <OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x86\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <TargetName>MathNet.Numerics.MKL</TargetName>
-    <IncludePath>$(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\ia32_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\ia32_win;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ICPP_COMPILER20)\mkl\include\;$(ICPP_COMPILER20)\mkl\include\fftw\;$(ICPP_COMPILER20)\compiler\include\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ICPP_COMPILER20)mkl\lib;$(ICPP_COMPILER20)mkl\lib\ia32_win;$(ICPP_COMPILER20)compiler\lib;$(ICPP_COMPILER20)compiler\lib\ia32_win;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Intel_SSA|Win32'">
     <OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x86\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <TargetName>MathNet.Numerics.MKL</TargetName>
-    <IncludePath>$(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\ia32_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\ia32_win;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ICPP_COMPILER20)\mkl\include\;$(ICPP_COMPILER20)\mkl\include\fftw\;$(ICPP_COMPILER20)\compiler\include\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ICPP_COMPILER20)mkl\lib;$(ICPP_COMPILER20)mkl\lib\ia32_win;$(ICPP_COMPILER20)compiler\lib;$(ICPP_COMPILER20)compiler\lib\ia32_win;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x64\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <TargetName>MathNet.Numerics.MKL</TargetName>
-    <LibraryPath>$(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\intel64_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\intel64_win;$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ICPP_COMPILER20)mkl\lib;$(ICPP_COMPILER20)mkl\lib\intel64_win;$(ICPP_COMPILER20)compiler\lib;$(ICPP_COMPILER20)compiler\lib\intel64_win;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ICPP_COMPILER20)\mkl\include\;$(ICPP_COMPILER20)\mkl\include\fftw\;$(ICPP_COMPILER20)\compiler\include\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Intel_SSA|x64'">
     <OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x64\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <TargetName>MathNet.Numerics.MKL</TargetName>
-    <IncludePath>$(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\intel64_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\intel64_win;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ICPP_COMPILER20)\mkl\include\;$(ICPP_COMPILER20)\mkl\include\fftw\;$(ICPP_COMPILER20)\compiler\include\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ICPP_COMPILER20)mkl\lib;$(ICPP_COMPILER20)mkl\lib\intel64_win;$(ICPP_COMPILER20)compiler\lib;$(ICPP_COMPILER20)compiler\lib\intel64_win;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x86\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <TargetName>MathNet.Numerics.MKL</TargetName>
-    <IncludePath>$(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\ia32_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\ia32_win;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ICPP_COMPILER20)\mkl\include\;$(ICPP_COMPILER20)\mkl\include\fftw\;$(ICPP_COMPILER20)\compiler\include\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ICPP_COMPILER20)mkl\lib;$(ICPP_COMPILER20)mkl\lib\ia32_win;$(ICPP_COMPILER20)compiler\lib;$(ICPP_COMPILER20)compiler\lib\ia32_win;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x64\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <TargetName>MathNet.Numerics.MKL</TargetName>
-    <IncludePath>$(ICPP_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\compiler\include\;$(IncludePath)</IncludePath>
-    <LibraryPath>$(ICPP_COMPILER19)mkl\lib;$(ICPP_COMPILER19)mkl\lib\intel64_win;$(ICPP_COMPILER19)compiler\lib;$(ICPP_COMPILER19)compiler\lib\intel64_win;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ICPP_COMPILER20)\mkl\include\;$(ICPP_COMPILER20)\mkl\include\fftw\;$(ICPP_COMPILER20)\compiler\include\;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ICPP_COMPILER20)mkl\lib;$(ICPP_COMPILER20)mkl\lib\intel64_win;$(ICPP_COMPILER20)compiler\lib;$(ICPP_COMPILER20)compiler\lib\intel64_win;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/src/Numerics.Tests/Numerics.Tests.CUDA.csproj b/src/Numerics.Tests/Numerics.Tests.CUDA.csproj
index 910455a2..e729f710 100644
--- a/src/Numerics.Tests/Numerics.Tests.CUDA.csproj
+++ b/src/Numerics.Tests/Numerics.Tests.CUDA.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <GenerateProgramFile>false</GenerateProgramFile>
-    <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>MathNet.Numerics.Tests.CUDA</AssemblyName>
     <RootNamespace>MathNet.Numerics.Tests</RootNamespace>
diff --git a/src/Numerics.Tests/Numerics.Tests.MKL.csproj b/src/Numerics.Tests/Numerics.Tests.MKL.csproj
index 5bbe1ebd..a6e8f3d9 100644
--- a/src/Numerics.Tests/Numerics.Tests.MKL.csproj
+++ b/src/Numerics.Tests/Numerics.Tests.MKL.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <GenerateProgramFile>false</GenerateProgramFile>
-    <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>MathNet.Numerics.Tests.MKL</AssemblyName>
     <RootNamespace>MathNet.Numerics.Tests</RootNamespace>
diff --git a/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj b/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
index a662f740..5f79f184 100644
--- a/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
+++ b/src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <GenerateProgramFile>false</GenerateProgramFile>
-    <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyName>MathNet.Numerics.Tests.OpenBLAS</AssemblyName>
     <RootNamespace>MathNet.Numerics.Tests</RootNamespace>