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

MKL: switch from v141 (2017) to v142 (2019) platform toolset, drop old project file

uap-experimental
Christoph Ruegg 6 years ago
parent
0a936cba31
commit
2a774e61bf
5 changed files with 12 additions and 384 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      docs/content/Build.md
  2. 3
      src/FSharp/FSharp.fsproj
  3. 378
      src/NativeProviders/Windows/MKL/MKLWrapper.vcproj
  4. 4
      src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
  5. 5
      src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters

6
docs/content/Build.md
View File

@ -27,8 +27,8 @@ Instead of a compatible IDE you can also build the solutions directly with
the .NET Core SDK, with MsBuild or on Mono with XBuild. You may need to run `restore.cmd` or the .NET Core SDK, with MsBuild or on Mono with XBuild. You may need to run `restore.cmd` or
`restore.sh` before, once after every git checkout in order to restore the dependencies. `restore.sh` before, once after every git checkout in order to restore the dependencies.
restore.cmd (or restore.sh) # restore dependencies (once) restore.cmd (or restore.sh) # restore dependencies (once)
dotnet build MathNet.Numerics.sln # with .NET Core SDK dotnet build MathNet.Numerics.sln # with .NET Core SDK
msbuild MathNet.Numerics.sln # with MsBuild msbuild MathNet.Numerics.sln # with MsBuild
xbuild MathNet.Numerics.sln # with Mono xbuild MathNet.Numerics.sln # with Mono
@ -146,7 +146,7 @@ The build expects that either Intel Parallel Studio 2020 (with the Intel Compile
or Intel Math Kernel Library 2020 is installed. If you run into an error with `mkl_link_tool.exe` or Intel Math Kernel Library 2020 is installed. If you run into an error with `mkl_link_tool.exe`
you may need to patch a targets file, see [MKL 2020.1, VS2019 linking bug ](https://software.intel.com/en-us/forums/intel-math-kernel-library/topic/851578). you may need to patch a targets file, see [MKL 2020.1, VS2019 linking bug ](https://software.intel.com/en-us/forums/intel-math-kernel-library/topic/851578).
The build is targeting `Windows 10 SDK (10.0.17763.0)` and the `v141` platform toolset, The build is targeting `Windows 10 SDK (10.0.17763.0)` and the `v142` platform toolset,
both of which can be installed as individual components in the Visual Studio Installer, both of which can be installed as individual components in the Visual Studio Installer,
together with the `Desktop development with C++` workload. together with the `Desktop development with C++` workload.

3
src/FSharp/FSharp.fsproj
View File

@ -44,6 +44,7 @@ Build: no longer code-sign the assemblies with a code-signing certificate, since
<Compile Include="FindRoots.fs" /> <Compile Include="FindRoots.fs" />
<Compile Include="RandomVariable.fs" /> <Compile Include="RandomVariable.fs" />
<Compile Include="Quaternion.fs" /> <Compile Include="Quaternion.fs" />
<None Include="paket.references" />
</ItemGroup> </ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" /> <Import Project="..\..\.paket\Paket.Restore.targets" />
</Project> </Project>

378
src/NativeProviders/Windows/MKL/MKLWrapper.vcproj
View File

@ -1,378 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="MKLWrapper"
ProjectGUID="{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}"
RootNamespace="MKLWrapper"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;C:\source\mathnet-marcus\src\NativeWrappers\Common&quot;;&quot;C:\source\mathnet-marcus\src\NativeWrappers\MKL&quot;;&quot;C:\Program Files (x86)\Intel\Compiler\11.1\046\mkl\include&quot;"
PreprocessorDefinitions="_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="mkl_intel_c.lib mkl_intel_thread.lib mkl_core.lib libiomp5md.lib"
OutputFile="$(OutDir)\MathNET.Numerics.MKL.dll"
AdditionalLibraryDirectories="&quot;C:\Program Files (x86)\Intel\Compiler\11.1\046\lib\ia32&quot;;&quot;C:\Program Files (x86)\Intel\Compiler\11.1\046\mkl\ia32\lib&quot;"
GenerateDebugInformation="true"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="copy &quot;c:\Program Files (x86)\Intel\Compiler\11.1\046\bin\ia32\libiomp5md.dll&quot; $(OutDir)"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;C:\source\mathnet-marcus\src\NativeWrappers\Common&quot;;&quot;C:\source\mathnet-marcus\src\NativeWrappers\MKL&quot;;&quot;C:\Program Files (x86)\Intel\Compiler\11.1\046\mkl\include&quot;"
PreprocessorDefinitions="_WINDOWS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="mkl_intel_lp64.lib mkl_intel_thread.lib mkl_core.lib libiomp5md.lib"
OutputFile="$(OutDir)\MathNET.Numerics.MKL.dll"
AdditionalLibraryDirectories="&quot;C:\Program Files (x86)\Intel\Compiler\11.1\046\lib\intel64&quot;;&quot;C:\Program Files (x86)\Intel\Compiler\11.1\046\mkl\em64t\lib&quot;"
GenerateDebugInformation="true"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="copy &quot;c:\Program Files (x86)\Intel\Compiler\11.1\046\bin\intel64\libiomp5md.dll&quot; $(OutDir)"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;C:\Program Files (x86)\Intel\Compiler\11.1\060\mkl\include&quot;;&quot;C:\source\mathnet-marcus\src\NativeWrappers\Common&quot;;&quot;C:\source\mathnet-marcus\src\NativeWrappers\MKL&quot;"
PreprocessorDefinitions="_WINDOWS"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="mkl_intel_c.lib mkl_intel_thread.lib mkl_core.lib libiomp5md.lib"
OutputFile="$(OutDir)\MathNET.Numerics.MKL.dll"
AdditionalLibraryDirectories="&quot;C:\Program Files (x86)\Intel\Compiler\11.1\060\lib\ia32&quot;;&quot;C:\Program Files (x86)\Intel\Compiler\11.1\060\mkl\ia32\lib&quot;"
GenerateDebugInformation="true"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="copy &quot;c:\Program Files (x86)\Intel\Compiler\11.1\046\bin\ia32\libiomp5md.dll&quot; $(OutDir)"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;C:\source\mathnet-marcus\src\NativeWrappers\Common&quot;;&quot;C:\source\mathnet-marcus\src\NativeWrappers\MKL&quot;;&quot;C:\Program Files (x86)\Intel\Compiler\11.1\060\mkl\include&quot;"
PreprocessorDefinitions="_WINDOWS"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="mkl_intel_lp64.lib mkl_intel_thread.lib mkl_core.lib libiomp5md.lib"
OutputFile="$(OutDir)\MathNET.Numerics.MKL.dll"
AdditionalLibraryDirectories="&quot;C:\Program Files (x86)\Intel\Compiler\11.1\060\lib\intel64&quot;;&quot;C:\Program Files (x86)\Intel\Compiler\11.1\060\mkl\em64t\lib&quot;"
GenerateDebugInformation="true"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="copy &quot;c:\Program Files (x86)\Intel\Compiler\11.1\046\bin\intel64\libiomp5md.dll&quot; $(OutDir)"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\Common\blas.c"
>
</File>
<File
RelativePath=".\lapack.cpp"
>
</File>
<File
RelativePath=".\vector_functions.c"
>
</File>
<File
RelativePath="..\Common\WindowsDLL.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\blas.h"
>
</File>
<File
RelativePath="..\Common\common.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath="..\MKL\resource.rc"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

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

@ -25,7 +25,7 @@
<ProjectName>MKL</ProjectName> <ProjectName>MKL</ProjectName>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<TargetName>MathNet.Numerics.MKL</TargetName> <TargetName>MathNet.Numerics.MKL</TargetName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -210,4 +210,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

5
src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters
View File

@ -56,4 +56,9 @@
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)icon.png">
<Filter>Source Files\Resource Files</Filter>
</None>
</ItemGroup>
</Project> </Project>
Write Preview
Loading…
Cancel
Save