Skip to content

Commit d3da6e6

Browse files
cdrnetcdrnet
committed
Tooling: upgrade native provider projects to tooling version 14 (VS2015). Fix MKL Test project.
1 parent 53dc96e commit d3da6e6

File tree

5 files changed

+26
-22
lines changed

5 files changed

+26
-22
lines changed

‎src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -28,26 +28,26 @@
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>DynamicLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v120</PlatformToolset>
31+
<PlatformToolset>v140</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3535
<ConfigurationType>DynamicLibrary</ConfigurationType>
3636
<UseDebugLibraries>true</UseDebugLibraries>
37-
<PlatformToolset>v120</PlatformToolset>
37+
<PlatformToolset>v140</PlatformToolset>
3838
<CharacterSet>Unicode</CharacterSet>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4141
<ConfigurationType>DynamicLibrary</ConfigurationType>
4242
<UseDebugLibraries>false</UseDebugLibraries>
43-
<PlatformToolset>v120</PlatformToolset>
43+
<PlatformToolset>v140</PlatformToolset>
4444
<WholeProgramOptimization>true</WholeProgramOptimization>
4545
<CharacterSet>Unicode</CharacterSet>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4848
<ConfigurationType>DynamicLibrary</ConfigurationType>
4949
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v120</PlatformToolset>
50+
<PlatformToolset>v140</PlatformToolset>
5151
<WholeProgramOptimization>true</WholeProgramOptimization>
5252
<CharacterSet>Unicode</CharacterSet>
5353
</PropertyGroup>

‎src/NativeProviders/Windows/CUDA/CUDAWrapper.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -39,26 +39,26 @@
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4040
<ConfigurationType>DynamicLibrary</ConfigurationType>
4141
<UseDebugLibraries>true</UseDebugLibraries>
42-
<PlatformToolset>v120</PlatformToolset>
42+
<PlatformToolset>v140</PlatformToolset>
4343
<CharacterSet>MultiByte</CharacterSet>
4444
</PropertyGroup>
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4646
<ConfigurationType>DynamicLibrary</ConfigurationType>
4747
<UseDebugLibraries>true</UseDebugLibraries>
48-
<PlatformToolset>v120</PlatformToolset>
48+
<PlatformToolset>v140</PlatformToolset>
4949
<CharacterSet>MultiByte</CharacterSet>
5050
</PropertyGroup>
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5252
<ConfigurationType>DynamicLibrary</ConfigurationType>
5353
<UseDebugLibraries>false</UseDebugLibraries>
54-
<PlatformToolset>v120</PlatformToolset>
54+
<PlatformToolset>v140</PlatformToolset>
5555
<WholeProgramOptimization>true</WholeProgramOptimization>
5656
<CharacterSet>MultiByte</CharacterSet>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5959
<ConfigurationType>DynamicLibrary</ConfigurationType>
6060
<UseDebugLibraries>false</UseDebugLibraries>
61-
<PlatformToolset>v120</PlatformToolset>
61+
<PlatformToolset>v140</PlatformToolset>
6262
<WholeProgramOptimization>true</WholeProgramOptimization>
6363
<CharacterSet>MultiByte</CharacterSet>
6464
</PropertyGroup>

‎src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -34,39 +34,39 @@
3434
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
37-
<PlatformToolset>v120</PlatformToolset>
37+
<PlatformToolset>v140</PlatformToolset>
3838
<CharacterSet>MultiByte</CharacterSet>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<UseIntelMKL>Parallel</UseIntelMKL>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
44-
<PlatformToolset>v120</PlatformToolset>
44+
<PlatformToolset>v140</PlatformToolset>
4545
<CharacterSet>MultiByte</CharacterSet>
4646
<UseIntelMKL>Parallel</UseIntelMKL>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Intel_SSA|Win32'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
50-
<PlatformToolset>v120</PlatformToolset>
50+
<PlatformToolset>v140</PlatformToolset>
5151
<CharacterSet>MultiByte</CharacterSet>
5252
<UseIntelMKL>Parallel</UseIntelMKL>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5555
<ConfigurationType>DynamicLibrary</ConfigurationType>
56-
<PlatformToolset>v120</PlatformToolset>
56+
<PlatformToolset>v140</PlatformToolset>
5757
<CharacterSet>MultiByte</CharacterSet>
5858
<WholeProgramOptimization>true</WholeProgramOptimization>
5959
<UseIntelMKL>Parallel</UseIntelMKL>
6060
</PropertyGroup>
6161
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
6262
<ConfigurationType>DynamicLibrary</ConfigurationType>
63-
<PlatformToolset>v120</PlatformToolset>
63+
<PlatformToolset>v140</PlatformToolset>
6464
<CharacterSet>MultiByte</CharacterSet>
6565
<UseIntelMKL>Parallel</UseIntelMKL>
6666
</PropertyGroup>
6767
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Intel_SSA|x64'" Label="Configuration">
6868
<ConfigurationType>DynamicLibrary</ConfigurationType>
69-
<PlatformToolset>v120</PlatformToolset>
69+
<PlatformToolset>v140</PlatformToolset>
7070
<CharacterSet>MultiByte</CharacterSet>
7171
<UseIntelMKL>Parallel</UseIntelMKL>
7272
</PropertyGroup>

‎src/NativeProviders/Windows/OpenBLAS/OpenBLASWrapper.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -26,24 +26,24 @@
2626
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2828
<ConfigurationType>DynamicLibrary</ConfigurationType>
29-
<PlatformToolset>v120</PlatformToolset>
29+
<PlatformToolset>v140</PlatformToolset>
3030
<CharacterSet>MultiByte</CharacterSet>
3131
<WholeProgramOptimization>true</WholeProgramOptimization>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3434
<ConfigurationType>DynamicLibrary</ConfigurationType>
35-
<PlatformToolset>v120</PlatformToolset>
35+
<PlatformToolset>v140</PlatformToolset>
3636
<CharacterSet>MultiByte</CharacterSet>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3939
<ConfigurationType>DynamicLibrary</ConfigurationType>
40-
<PlatformToolset>v120</PlatformToolset>
40+
<PlatformToolset>v140</PlatformToolset>
4141
<CharacterSet>MultiByte</CharacterSet>
4242
<WholeProgramOptimization>true</WholeProgramOptimization>
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4545
<ConfigurationType>DynamicLibrary</ConfigurationType>
46-
<PlatformToolset>v120</PlatformToolset>
46+
<PlatformToolset>v140</PlatformToolset>
4747
<CharacterSet>MultiByte</CharacterSet>
4848
</PropertyGroup>
4949
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎src/UnitTests/UnitTests-MKL.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,10 @@
336336
<Project>{b7cae5f4-a23f-4438-b5be-41226618b695}</Project>
337337
<Name>Numerics</Name>
338338
</ProjectReference>
339+
<ProjectReference Include="..\TestData\TestData.csproj">
340+
<Project>{af3253c9-4db5-45a0-98cf-c105fda9da47}</Project>
341+
<Name>TestData</Name>
342+
</ProjectReference>
339343
</ItemGroup>
340344
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
341345
<ItemGroup>

0 commit comments

Comments
 (0)