Skip to content

Commit 1b6ea1d

Browse files
ihhubihhub
authored
Make CUDA code compilable (#705)
Also, make it clear what version of VS is being used.
1 parent 7179f42 commit 1b6ea1d

File tree

3 files changed

+6
-136
lines changed

3 files changed

+6
-136
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
*.fatbin
6161
*.cu.deps
6262
*.cu.cache
63+
*.deps
6364

6465
# Build
6566
build/*

‎test/performance_tests/cuda/performance_tests_cuda.vcxproj renamed to ‎test/performance_tests/cuda/performance_tests_cuda-vs2019-cuda12.4.vcxproj

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Win32">
5-
<Configuration>Debug</Configuration>
6-
<Platform>Win32</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|x64">
95
<Configuration>Debug</Configuration>
106
<Platform>x64</Platform>
117
</ProjectConfiguration>
12-
<ProjectConfiguration Include="Release|Win32">
13-
<Configuration>Release</Configuration>
14-
<Platform>Win32</Platform>
15-
</ProjectConfiguration>
168
<ProjectConfiguration Include="Release|x64">
179
<Configuration>Release</Configuration>
1810
<Platform>x64</Platform>
@@ -23,25 +15,12 @@
2315
<RootNamespace>performance_tests_cuda</RootNamespace>
2416
</PropertyGroup>
2517
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
26-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
27-
<ConfigurationType>Application</ConfigurationType>
28-
<UseDebugLibraries>true</UseDebugLibraries>
29-
<CharacterSet>MultiByte</CharacterSet>
30-
<PlatformToolset>v142</PlatformToolset>
31-
</PropertyGroup>
3218
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3319
<ConfigurationType>Application</ConfigurationType>
3420
<UseDebugLibraries>true</UseDebugLibraries>
3521
<CharacterSet>MultiByte</CharacterSet>
3622
<PlatformToolset>v142</PlatformToolset>
3723
</PropertyGroup>
38-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
39-
<ConfigurationType>Application</ConfigurationType>
40-
<UseDebugLibraries>false</UseDebugLibraries>
41-
<WholeProgramOptimization>true</WholeProgramOptimization>
42-
<CharacterSet>MultiByte</CharacterSet>
43-
<PlatformToolset>v142</PlatformToolset>
44-
</PropertyGroup>
4524
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4625
<ConfigurationType>Application</ConfigurationType>
4726
<UseDebugLibraries>false</UseDebugLibraries>
@@ -51,43 +30,18 @@
5130
</PropertyGroup>
5231
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5332
<ImportGroup Label="ExtensionSettings">
54-
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 8.0.props" />
55-
</ImportGroup>
56-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
57-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
33+
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 12.4.props" />
5834
</ImportGroup>
5935
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6036
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6137
</ImportGroup>
62-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
63-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64-
</ImportGroup>
6538
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
6639
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6740
</ImportGroup>
6841
<PropertyGroup Label="UserMacros" />
69-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
70-
<LinkIncremental>true</LinkIncremental>
71-
</PropertyGroup>
7242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7343
<LinkIncremental>true</LinkIncremental>
7444
</PropertyGroup>
75-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
76-
<ClCompile>
77-
<WarningLevel>Level4</WarningLevel>
78-
<Optimization>Disabled</Optimization>
79-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
80-
</ClCompile>
81-
<Link>
82-
<GenerateDebugInformation>true</GenerateDebugInformation>
83-
<SubSystem>Console</SubSystem>
84-
<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
85-
</Link>
86-
<PostBuildEvent>
87-
<Command>echo copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
88-
copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
89-
</PostBuildEvent>
90-
</ItemDefinitionGroup>
9145
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9246
<ClCompile>
9347
<WarningLevel>Level4</WarningLevel>
@@ -107,26 +61,6 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
10761
<TargetMachinePlatform>64</TargetMachinePlatform>
10862
</CudaCompile>
10963
</ItemDefinitionGroup>
110-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
111-
<ClCompile>
112-
<WarningLevel>Level4</WarningLevel>
113-
<Optimization>MaxSpeed</Optimization>
114-
<FunctionLevelLinking>true</FunctionLevelLinking>
115-
<IntrinsicFunctions>true</IntrinsicFunctions>
116-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117-
</ClCompile>
118-
<Link>
119-
<GenerateDebugInformation>true</GenerateDebugInformation>
120-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
121-
<OptimizeReferences>true</OptimizeReferences>
122-
<SubSystem>Console</SubSystem>
123-
<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
124-
</Link>
125-
<PostBuildEvent>
126-
<Command>echo copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
127-
copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
128-
</PostBuildEvent>
129-
</ItemDefinitionGroup>
13064
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
13165
<ClCompile>
13266
<WarningLevel>Level4</WarningLevel>
@@ -184,6 +118,6 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
184118
</ItemGroup>
185119
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
186120
<ImportGroup Label="ExtensionTargets">
187-
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 8.0.targets" />
121+
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 12.4.targets" />
188122
</ImportGroup>
189123
</Project>

‎test/unit_tests/cuda/unit_tests_cuda.vcxproj renamed to ‎test/unit_tests/cuda/unit_tests_cuda-vs2019-cuda12.4.vcxproj

Lines changed: 3 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Win32">
5-
<Configuration>Debug</Configuration>
6-
<Platform>Win32</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|x64">
95
<Configuration>Debug</Configuration>
106
<Platform>x64</Platform>
117
</ProjectConfiguration>
12-
<ProjectConfiguration Include="Release|Win32">
13-
<Configuration>Release</Configuration>
14-
<Platform>Win32</Platform>
15-
</ProjectConfiguration>
168
<ProjectConfiguration Include="Release|x64">
179
<Configuration>Release</Configuration>
1810
<Platform>x64</Platform>
@@ -31,6 +23,7 @@
3123
<ClInclude Include="..\..\..\src\image_buffer.h" />
3224
<ClInclude Include="..\..\..\src\image_function.h" />
3325
<ClInclude Include="..\..\..\src\image_function_helper.h" />
26+
<ClInclude Include="..\..\..\src\memory\cpu_memory.h" />
3427
<ClInclude Include="..\..\..\src\memory\memory_allocator.h" />
3528
<ClInclude Include="..\..\..\src\parameter_validation.h" />
3629
<ClInclude Include="..\..\..\src\math\fft_base.h" />
@@ -60,25 +53,12 @@
6053
<RootNamespace>unit_tests_cuda</RootNamespace>
6154
</PropertyGroup>
6255
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
63-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
64-
<ConfigurationType>Application</ConfigurationType>
65-
<UseDebugLibraries>true</UseDebugLibraries>
66-
<CharacterSet>MultiByte</CharacterSet>
67-
<PlatformToolset>v142</PlatformToolset>
68-
</PropertyGroup>
6956
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7057
<ConfigurationType>Application</ConfigurationType>
7158
<UseDebugLibraries>true</UseDebugLibraries>
7259
<CharacterSet>MultiByte</CharacterSet>
7360
<PlatformToolset>v142</PlatformToolset>
7461
</PropertyGroup>
75-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
76-
<ConfigurationType>Application</ConfigurationType>
77-
<UseDebugLibraries>false</UseDebugLibraries>
78-
<WholeProgramOptimization>true</WholeProgramOptimization>
79-
<CharacterSet>MultiByte</CharacterSet>
80-
<PlatformToolset>v142</PlatformToolset>
81-
</PropertyGroup>
8262
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
8363
<ConfigurationType>Application</ConfigurationType>
8464
<UseDebugLibraries>false</UseDebugLibraries>
@@ -88,43 +68,18 @@
8868
</PropertyGroup>
8969
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
9070
<ImportGroup Label="ExtensionSettings">
91-
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 8.0.props" />
92-
</ImportGroup>
93-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
94-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
71+
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 12.4.props" />
9572
</ImportGroup>
9673
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9774
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
9875
</ImportGroup>
99-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
100-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
101-
</ImportGroup>
10276
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
10377
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
10478
</ImportGroup>
10579
<PropertyGroup Label="UserMacros" />
106-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
107-
<LinkIncremental>true</LinkIncremental>
108-
</PropertyGroup>
10980
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
11081
<LinkIncremental>true</LinkIncremental>
11182
</PropertyGroup>
112-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
113-
<ClCompile>
114-
<WarningLevel>Level4</WarningLevel>
115-
<Optimization>Disabled</Optimization>
116-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117-
</ClCompile>
118-
<Link>
119-
<GenerateDebugInformation>true</GenerateDebugInformation>
120-
<SubSystem>Console</SubSystem>
121-
<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
122-
</Link>
123-
<PostBuildEvent>
124-
<Command>echo copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
125-
copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
126-
</PostBuildEvent>
127-
</ItemDefinitionGroup>
12883
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
12984
<ClCompile>
13085
<WarningLevel>Level4</WarningLevel>
@@ -144,26 +99,6 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
14499
<TargetMachinePlatform>64</TargetMachinePlatform>
145100
</CudaCompile>
146101
</ItemDefinitionGroup>
147-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
148-
<ClCompile>
149-
<WarningLevel>Level4</WarningLevel>
150-
<Optimization>MaxSpeed</Optimization>
151-
<FunctionLevelLinking>true</FunctionLevelLinking>
152-
<IntrinsicFunctions>true</IntrinsicFunctions>
153-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
154-
</ClCompile>
155-
<Link>
156-
<GenerateDebugInformation>true</GenerateDebugInformation>
157-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
158-
<OptimizeReferences>true</OptimizeReferences>
159-
<SubSystem>Console</SubSystem>
160-
<AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
161-
</Link>
162-
<PostBuildEvent>
163-
<Command>echo copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
164-
copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
165-
</PostBuildEvent>
166-
</ItemDefinitionGroup>
167102
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
168103
<ClCompile>
169104
<WarningLevel>Level4</WarningLevel>
@@ -189,6 +124,6 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
189124
</ItemDefinitionGroup>
190125
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
191126
<ImportGroup Label="ExtensionTargets">
192-
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 8.0.targets" />
127+
<Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 12.4.targets" />
193128
</ImportGroup>
194129
</Project>

0 commit comments

Comments
 (0)