Skip to content
  •  
  •  
  •  
21 changes: 15 additions & 6 deletions Applications/bitonic_sort/bitonic_sort_vs2017.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
<RootNamespace>bitonic_sort_vs2017</RootNamespace>
<WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup>
<HIPVersionFileContents>$([System.IO.File]::ReadAllText('$(HIP_PATH)bin\.hipversion'))</HIPVersionFileContents>
<HIPVersionMajor>$(HIPVersionFileContents.Substring($([MSBuild]::Add($(HIPVersionFileContents.LastIndexOf("HIP_VERSION_MAJOR")),18)),2).Trim())</HIPVersionMajor>
<HIPVersionMinor>$(HIPVersionFileContents.Substring($([MSBuild]::Add($(HIPVersionFileContents.LastIndexOf("HIP_VERSION_MINOR")),18)),2).Trim())</HIPVersionMinor>
<HIPPathVersion>$(HIPVersionMajor).$(HIPVersionMinor)</HIPPathVersion>
</PropertyGroup>
<ItemGroup>
<ClCompile Include="main.hip" />
</ItemGroup>
Expand All @@ -28,13 +34,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>HIP clang 6.2</PlatformToolset>
<PlatformToolset>HIP clang $(HIPPathVersion)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>HIP clang 6.2</PlatformToolset>
<PlatformToolset>HIP clang $(HIPPathVersion)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformToolset.Contains(`HIP clang `))'">
Expand All @@ -56,6 +62,9 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Condition="'$(PlatformToolset)'!='HIP nvcc $(HIPPathVersion)' and '$(PlatformToolset)'!='HIP clang $(HIPPathVersion)'">
<ProjectExcludedFromBuild>true</ProjectExcludedFromBuild>
</PropertyGroup>
Comment on lines +65 to +67
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here and below: unrelated change which has to be i a separate PR.

<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
Expand All @@ -70,7 +79,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and '$(PlatformToolset)'=='HIP clang $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and $(PlatformToolset.Contains('HIP clang'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<PreprocessorDefinitions>__clang__;__HIP__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -83,7 +92,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and '$(PlatformToolset)'=='HIP nvcc $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and $(PlatformToolset.Contains('HIP nvcc'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<PreprocessorDefinitions>__CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -96,7 +105,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and '$(PlatformToolset)'=='HIP clang $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and $(PlatformToolset.Contains('HIP clang'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand All @@ -111,7 +120,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and '$(PlatformToolset)'=='HIP nvcc $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and $(PlatformToolset.Contains('HIP nvcc'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<WholeProgramOptimization>true</WholeProgramOptimization>
Expand Down
21 changes: 15 additions & 6 deletions Applications/bitonic_sort/bitonic_sort_vs2019.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
<RootNamespace>bitonic_sort_vs2019</RootNamespace>
<WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup>
<HIPVersionFileContents>$([System.IO.File]::ReadAllText('$(HIP_PATH)bin\.hipversion'))</HIPVersionFileContents>
<HIPVersionMajor>$(HIPVersionFileContents.Substring($([MSBuild]::Add($(HIPVersionFileContents.LastIndexOf("HIP_VERSION_MAJOR")),18)),2).Trim())</HIPVersionMajor>
<HIPVersionMinor>$(HIPVersionFileContents.Substring($([MSBuild]::Add($(HIPVersionFileContents.LastIndexOf("HIP_VERSION_MINOR")),18)),2).Trim())</HIPVersionMinor>
<HIPPathVersion>$(HIPVersionMajor).$(HIPVersionMinor)</HIPPathVersion>
Comment on lines +21 to +24
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This solution is to discuss with HIP-VS team.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, let's discuss this offline at a later point in time.

</PropertyGroup>
<ItemGroup>
<ClCompile Include="main.hip" />
</ItemGroup>
Expand All @@ -28,13 +34,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>HIP clang 6.2</PlatformToolset>
<PlatformToolset>HIP clang $(HIPPathVersion)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>HIP clang 6.2</PlatformToolset>
<PlatformToolset>HIP clang $(HIPPathVersion)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformToolset.Contains(`HIP clang `))'">
Expand All @@ -56,6 +62,9 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Condition="'$(PlatformToolset)'!='HIP nvcc $(HIPPathVersion)' and '$(PlatformToolset)'!='HIP clang $(HIPPathVersion)'">
<ProjectExcludedFromBuild>true</ProjectExcludedFromBuild>
</PropertyGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
Expand All @@ -70,7 +79,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and '$(PlatformToolset)'=='HIP clang $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and $(PlatformToolset.Contains('HIP clang'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<PreprocessorDefinitions>__clang__;__HIP__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -83,7 +92,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and '$(PlatformToolset)'=='HIP nvcc $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and $(PlatformToolset.Contains('HIP nvcc'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<PreprocessorDefinitions>__CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -96,7 +105,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and '$(PlatformToolset)'=='HIP clang $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and $(PlatformToolset.Contains('HIP clang'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand All @@ -111,7 +120,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and '$(PlatformToolset)'=='HIP nvcc $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and $(PlatformToolset.Contains('HIP nvcc'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<WholeProgramOptimization>true</WholeProgramOptimization>
Expand Down
21 changes: 15 additions & 6 deletions Applications/bitonic_sort/bitonic_sort_vs2022.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
<RootNamespace>bitonic_sort_vs2022</RootNamespace>
<WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup>
<HIPVersionFileContents>$([System.IO.File]::ReadAllText('$(HIP_PATH)bin\.hipversion'))</HIPVersionFileContents>
<HIPVersionMajor>$(HIPVersionFileContents.Substring($([MSBuild]::Add($(HIPVersionFileContents.LastIndexOf("HIP_VERSION_MAJOR")),18)),2).Trim())</HIPVersionMajor>
<HIPVersionMinor>$(HIPVersionFileContents.Substring($([MSBuild]::Add($(HIPVersionFileContents.LastIndexOf("HIP_VERSION_MINOR")),18)),2).Trim())</HIPVersionMinor>
<HIPPathVersion>$(HIPVersionMajor).$(HIPVersionMinor)</HIPPathVersion>
</PropertyGroup>
<ItemGroup>
<ClCompile Include="main.hip" />
</ItemGroup>
Expand All @@ -28,13 +34,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>HIP clang 6.2</PlatformToolset>
<PlatformToolset>HIP clang $(HIPPathVersion)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>HIP clang 6.2</PlatformToolset>
<PlatformToolset>HIP clang $(HIPPathVersion)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformToolset.Contains(`HIP clang `))'">
Expand All @@ -56,6 +62,9 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Condition="'$(PlatformToolset)'!='HIP nvcc $(HIPPathVersion)' and '$(PlatformToolset)'!='HIP clang $(HIPPathVersion)'">
<ProjectExcludedFromBuild>true</ProjectExcludedFromBuild>
</PropertyGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
Expand All @@ -70,7 +79,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and '$(PlatformToolset)'=='HIP clang $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and $(PlatformToolset.Contains('HIP clang'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<PreprocessorDefinitions>__clang__;__HIP__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -83,7 +92,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and '$(PlatformToolset)'=='HIP nvcc $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and $(PlatformToolset.Contains('HIP nvcc'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<PreprocessorDefinitions>__CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -96,7 +105,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and '$(PlatformToolset)'=='HIP clang $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and $(PlatformToolset.Contains('HIP clang'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand All @@ -111,7 +120,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and '$(PlatformToolset)'=='HIP nvcc $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and $(PlatformToolset.Contains('HIP nvcc'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<WholeProgramOptimization>true</WholeProgramOptimization>
Expand Down
21 changes: 15 additions & 6 deletions Applications/convolution/convolution_vs2017.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
<RootNamespace>convolution_vs2017</RootNamespace>
<WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup>
<HIPVersionFileContents>$([System.IO.File]::ReadAllText('$(HIP_PATH)bin\.hipversion'))</HIPVersionFileContents>
<HIPVersionMajor>$(HIPVersionFileContents.Substring($([MSBuild]::Add($(HIPVersionFileContents.LastIndexOf("HIP_VERSION_MAJOR")),18)),2).Trim())</HIPVersionMajor>
<HIPVersionMinor>$(HIPVersionFileContents.Substring($([MSBuild]::Add($(HIPVersionFileContents.LastIndexOf("HIP_VERSION_MINOR")),18)),2).Trim())</HIPVersionMinor>
<HIPPathVersion>$(HIPVersionMajor).$(HIPVersionMinor)</HIPPathVersion>
</PropertyGroup>
<ItemGroup>
<ClCompile Include="main.hip" />
</ItemGroup>
Expand All @@ -28,13 +34,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>HIP clang 6.2</PlatformToolset>
<PlatformToolset>HIP clang $(HIPPathVersion)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>HIP clang 6.2</PlatformToolset>
<PlatformToolset>HIP clang $(HIPPathVersion)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformToolset.Contains(`HIP clang `))'">
Expand All @@ -56,6 +62,9 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Condition="'$(PlatformToolset)'!='HIP nvcc $(HIPPathVersion)' and '$(PlatformToolset)'!='HIP clang $(HIPPathVersion)'">
<ProjectExcludedFromBuild>true</ProjectExcludedFromBuild>
</PropertyGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
Expand All @@ -70,7 +79,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and '$(PlatformToolset)'=='HIP clang $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and $(PlatformToolset.Contains('HIP clang'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<PreprocessorDefinitions>__clang__;__HIP__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -83,7 +92,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and '$(PlatformToolset)'=='HIP nvcc $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64' and $(PlatformToolset.Contains('HIP nvcc'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<PreprocessorDefinitions>__CUDACC__;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand All @@ -96,7 +105,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and '$(PlatformToolset)'=='HIP clang $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and $(PlatformToolset.Contains('HIP clang'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand All @@ -111,7 +120,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and '$(PlatformToolset)'=='HIP nvcc $(HIPVersion)'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64' and $(PlatformToolset.Contains('HIP nvcc'))">
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<WholeProgramOptimization>true</WholeProgramOptimization>
Expand Down
Loading
Loading