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

MKL: attempt to support both parallel studio with intel compiler and standalone MKL installations

pull/697/head
Christoph Ruegg 7 years ago
parent
2e3509e83d
commit
8c9a8011d5
1 changed files with 29 additions and 23 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. 52
      src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj

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

@ -27,8 +27,6 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<TargetName>MathNet.Numerics.MKL</TargetName>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<INTEL_DEV_REDIST Condition="'$(INTEL_DEV_REDIST)' == ''">$(MKLProductDir)</INTEL_DEV_REDIST>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@ -51,30 +49,38 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<PropertyGroup>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<IntelRedistDir>$(INTEL_DEV_REDIST)</IntelRedistDir>
<IntelRedistDir Condition="'$(IntelRedistDir)' == ''">$(MKLProductDir)</IntelRedistDir>
<IntelIncludePaths>$(MKLIncludeDir);$(ICPP_COMPILER20)\mkl\include\;$(ICPP_COMPILER20)\mkl\include\fftw\;$(ICPP_COMPILER20)\compiler\include\</IntelIncludePaths>
<IntelLib32Paths>$(MKLLibDir)\;$(OmpLibDir)\;$(ICPP_COMPILER20)mkl\lib;$(ICPP_COMPILER20)mkl\lib\ia32_win;$(ICPP_COMPILER20)compiler\lib;$(ICPP_COMPILER20)compiler\lib\ia32_win</IntelLib32Paths>
<IntelLib64Paths>$(MKLLibDir)\;$(OmpLibDir)\;$(ICPP_COMPILER20)mkl\lib;$(ICPP_COMPILER20)mkl\lib\intel64_win;$(ICPP_COMPILER20)compiler\lib;$(ICPP_COMPILER20)compiler\lib\intel64_win</IntelLib64Paths>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x86\</OutDir>
<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>
<IncludePath>$(ProjectDir)..\..\Common;$(ProjectDir)..\..\MKL;$(IntelIncludePaths);$(IncludePath)</IncludePath>
<LibraryPath>$(IntelLib32Paths);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x64\</OutDir>
<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>
<IncludePath>$(ProjectDir)..\..\Common;$(ProjectDir)..\..\MKL;$(IntelIncludePaths);$(IncludePath)</IncludePath>
<LibraryPath>$(IntelLib64Paths);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x86\</OutDir>
<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>
<IncludePath>$(ProjectDir)..\..\Common;$(ProjectDir)..\..\MKL;$(IntelIncludePaths);$(IncludePath)</IncludePath>
<LibraryPath>$(IntelLib32Paths);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x64\</OutDir>
<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>
<IncludePath>$(ProjectDir)..\..\Common;$(ProjectDir)..\..\MKL;$(IntelIncludePaths);$(IncludePath)</IncludePath>
<LibraryPath>$(IntelLib64Paths);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Common;$(ProjectDir)..\..\MKL;$(MKLIncludeDir);$(IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -86,13 +92,13 @@
<Link>
<AdditionalDependencies>libiomp5md.lib;mkl_intel_c.lib;mkl_intel_thread.lib;mkl_core.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(OmpLibDir)\;$(MKLLibDir)\;$(LibraryPath)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(LibraryPath)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
</Link>
<PostBuildEvent>
<Command>copy "$(INTEL_DEV_REDIST)redist\ia32_win\compiler\libiomp5md.dll" $(OutputPath)</Command>
<Command>copy "$(IntelRedistDir)redist\ia32_win\compiler\libiomp5md.dll" $(OutputPath)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -101,7 +107,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Common;$(ProjectDir)..\..\MKL;$(MKLIncludeDir);$(IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -113,20 +119,20 @@
<Link>
<AdditionalDependencies>libiomp5md.lib;mkl_intel_lp64.lib;mkl_intel_thread.lib;mkl_core.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(OmpLibDir)\;$(MKLLibDir)\;$(LibraryPath)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(LibraryPath)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
</Link>
<PostBuildEvent>
<Command>copy "$(INTEL_DEV_REDIST)redist\intel64_win\compiler\libiomp5md.dll" $(OutputPath)</Command>
<Command>copy "$(IntelRedistDir)redist\intel64_win\compiler\libiomp5md.dll" $(OutputPath)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Common;$(ProjectDir)..\..\MKL;$(MKLIncludeDir);$(IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@ -140,7 +146,7 @@
<Link>
<AdditionalDependencies>libiomp5md.lib;mkl_intel_c.lib;mkl_intel_thread.lib;mkl_core.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(OmpLibDir)\;$(MKLLibDir)\;$(LibraryPath)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(LibraryPath)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -148,7 +154,7 @@
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
</Link>
<PostBuildEvent>
<Command>copy "$(INTEL_DEV_REDIST)redist\ia32_win\compiler\libiomp5md.dll" $(OutputPath)</Command>
<Command>copy "$(IntelRedistDir)redist\ia32_win\compiler\libiomp5md.dll" $(OutputPath)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -158,7 +164,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\Common;$(ProjectDir)..\..\MKL;$(MKLIncludeDir);$(IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@ -172,7 +178,7 @@
<Link>
<AdditionalDependencies>libiomp5md.lib;mkl_intel_lp64.lib;mkl_intel_thread.lib;mkl_core.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>$(OmpLibDir)\;$(MKLLibDir)\;$(LibraryPath)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(LibraryPath)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -180,7 +186,7 @@
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
</Link>
<PostBuildEvent>
<Command>copy "$(INTEL_DEV_REDIST)redist\intel64_win\compiler\libiomp5md.dll" $(OutputPath)</Command>
<Command>copy "$(IntelRedistDir)redist\intel64_win\compiler\libiomp5md.dll" $(OutputPath)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@ -204,4 +210,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

Write Preview
Loading…
Cancel
Save