tsai
/
mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

MKL: upgrade to Intel Compiler 19

pull/599/head
Christoph Ruegg 8 years ago
parent
3ee12454f1
commit
e432437c8f
2 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/NativeProviders/Common/wrapper_common.h
  2. 28
      src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj

2
src/NativeProviders/Common/wrapper_common.h
View File

@ -2,7 +2,7 @@
#define WRAPPER_COMMON_H
#ifndef __MS_VC_INSTALL_PATH
#define __MS_VC_INSTALL_PATH C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Tools/MSVC/14.14.26428
#define __MS_VC_INSTALL_PATH C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Tools/MSVC/14.15.26726
#endif
#ifdef _WINDOWS

28
src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
View File

@ -30,7 +30,7 @@
<ProjectGuid>{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}</ProjectGuid>
<RootNamespace>MKLWrapper</RootNamespace>
<ProjectName>MKL</ProjectName>
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@ -99,43 +99,43 @@
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x86\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>MathNet.Numerics.MKL</TargetName>
<IncludePath>$(ICPP_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath)</IncludePath>
<LibraryPath>$(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\ia32_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\ia32_win;$(LibraryPath)</LibraryPath>
<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>
</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_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath)</IncludePath>
<LibraryPath>$(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\ia32_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\ia32_win;$(LibraryPath)</LibraryPath>
<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>
</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_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\intel64_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\intel64_win;$(LibraryPath)</LibraryPath>
<IncludePath>$(ICPP_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\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_COMPILER19)\mkl\include\;$(ICPP_COMPILER19)\mkl\include\fftw\;$(ICPP_COMPILER19)\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_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath)</IncludePath>
<LibraryPath>$(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\intel64_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\intel64_win;$(LibraryPath)</LibraryPath>
<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>
</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_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath)</IncludePath>
<LibraryPath>$(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\ia32_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\ia32_win;$(LibraryPath)</LibraryPath>
<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>
</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_COMPILER18)\mkl\include\;$(ICPP_COMPILER18)\mkl\include\fftw\;$(ICPP_COMPILER18)\compiler\include\;$(IncludePath)</IncludePath>
<LibraryPath>$(ICPP_COMPILER18)mkl\lib;$(ICPP_COMPILER18)mkl\lib\intel64_win;$(ICPP_COMPILER18)compiler\lib;$(ICPP_COMPILER18)compiler\lib\intel64_win;$(LibraryPath)</LibraryPath>
<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>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -321,4 +321,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
Write Preview
Loading…
Cancel
Save