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

MKL: Switch to Intel Compiler 20

pull/697/head
Christoph Ruegg 6 years ago
parent
e757e0f187
commit
b3305125fa
4 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. 24
      src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
  2. 2
      src/Numerics.Tests/Numerics.Tests.CUDA.csproj
  3. 2
      src/Numerics.Tests/Numerics.Tests.MKL.csproj
  4. 2
      src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj

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

@ -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>

2
src/Numerics.Tests/Numerics.Tests.CUDA.csproj
View File

@ -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>

2
src/Numerics.Tests/Numerics.Tests.MKL.csproj
View File

@ -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>

2
src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj
View File

@ -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>

Write Preview
Loading…
Cancel
Save