Skip to content

Commit 4324fd1

Browse files
jimmytweijimmytwei
authored
Update Windows samples (#1945)
* Updated Windows code samples project files to use 2024.0 compiler * Updated * Update #2 * Fix for ONSAM-1690 * update * Update oneTBB Windows samples and gamma-correction
1 parent a98465f commit 4324fd1

13 files changed

+33
-302
lines changed

‎Libraries/oneDPL/gamma-correction/gamma-correction.vcxproj

Lines changed: 6 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,16 @@
2929
<WindowsTargetPlatformVersion>$(WindowsSDKVersion.Replace("\",""))</WindowsTargetPlatformVersion>
3030
</PropertyGroup>
3131
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
32-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33-
<ConfigurationType>Application</ConfigurationType>
34-
<UseDebugLibraries>true</UseDebugLibraries>
35-
<PlatformToolset>oneAPI Data Parallel C++ Compiler</PlatformToolset>
36-
<CharacterSet>Unicode</CharacterSet>
37-
</PropertyGroup>
38-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
39-
<ConfigurationType>Application</ConfigurationType>
40-
<UseDebugLibraries>false</UseDebugLibraries>
41-
<PlatformToolset>oneAPI Data Parallel C++ Compiler</PlatformToolset>
42-
<WholeProgramOptimization>true</WholeProgramOptimization>
43-
<CharacterSet>Unicode</CharacterSet>
44-
</PropertyGroup>
4532
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4633
<ConfigurationType>Application</ConfigurationType>
4734
<UseDebugLibraries>true</UseDebugLibraries>
48-
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2023</PlatformToolset>
35+
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2024</PlatformToolset>
4936
<CharacterSet>Unicode</CharacterSet>
5037
</PropertyGroup>
5138
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5239
<ConfigurationType>Application</ConfigurationType>
5340
<UseDebugLibraries>false</UseDebugLibraries>
54-
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2023</PlatformToolset>
41+
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2024</PlatformToolset>
5542
<WholeProgramOptimization>true</WholeProgramOptimization>
5643
<CharacterSet>Unicode</CharacterSet>
5744
</PropertyGroup>
@@ -60,51 +47,25 @@
6047
</ImportGroup>
6148
<ImportGroup Label="Shared">
6249
</ImportGroup>
63-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
64-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65-
</ImportGroup>
66-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68-
</ImportGroup>
6950
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7051
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7152
</ImportGroup>
7253
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7354
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7455
</ImportGroup>
7556
<PropertyGroup Label="UserMacros" />
76-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
77-
<LinkIncremental>true</LinkIncremental>
78-
</PropertyGroup>
7957
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8058
<LinkIncremental>true</LinkIncremental>
8159
<ExecutablePath>C:\Program Files %28x86%29\inteloneapi\tbb\2021.1-beta02\redist\intel64\vc14;$(ExecutablePath)</ExecutablePath>
8260
<IncludePath>C:\Program Files %28x86%29\inteloneapi\tbb\2021.1-beta02\include;C:\Program Files %28x86%29\inteloneapi\compiler\2021.1-beta02\windows\include;$(IncludePath)</IncludePath>
8361
<LibraryPath>C:\Program Files %28x86%29\inteloneapi\tbb\2021.1-beta02\lib\intel64\vc14;$(LibraryPath)</LibraryPath>
8462
</PropertyGroup>
85-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
86-
<LinkIncremental>false</LinkIncremental>
87-
</PropertyGroup>
8863
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8964
<LinkIncremental>false</LinkIncremental>
9065
<IncludePath>C:\Program Files %28x86%29\inteloneapi\tbb\2021.1-beta02\include;C:\Program Files %28x86%29\inteloneapi\compiler\2021.1-beta02\windows\include;$(IncludePath)</IncludePath>
9166
<ExecutablePath>C:\Program Files %28x86%29\inteloneapi\tbb\2021.1-beta02\redist\intel64\vc14;$(ExecutablePath)</ExecutablePath>
9267
<LibraryPath>C:\Program Files %28x86%29\inteloneapi\tbb\2021.1-beta02\lib\intel64\vc14;$(LibraryPath)</LibraryPath>
9368
</PropertyGroup>
94-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
95-
<ClCompile>
96-
<PrecompiledHeader>Use</PrecompiledHeader>
97-
<WarningLevel>Level3</WarningLevel>
98-
<Optimization>Disabled</Optimization>
99-
<SDLCheck>true</SDLCheck>
100-
<ConformanceMode>true</ConformanceMode>
101-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
102-
</ClCompile>
103-
<Link>
104-
<SubSystem>Console</SubSystem>
105-
<GenerateDebugInformation>true</GenerateDebugInformation>
106-
</Link>
107-
</ItemDefinitionGroup>
10869
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
10970
<ClCompile>
11071
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -119,34 +80,16 @@
11980
<Link>
12081
<SubSystem>Console</SubSystem>
12182
<GenerateDebugInformation>true</GenerateDebugInformation>
122-
<AdditionalOptions>/link /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib/intel64/vc14" %(AdditionalOptions)</AdditionalOptions>
83+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
12384
<SpecifyDevCmplAdditionalOptions>/Od</SpecifyDevCmplAdditionalOptions>
12485
</Link>
12586
<PostBuildEvent>
126-
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\redist\intel64\vc14\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
87+
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
12788
</PostBuildEvent>
12889
<PostBuildEvent>
12990
<Message>copy tbb12_debug.dll to binary folder </Message>
13091
</PostBuildEvent>
13192
</ItemDefinitionGroup>
132-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
133-
<ClCompile>
134-
<PrecompiledHeader>Use</PrecompiledHeader>
135-
<WarningLevel>Level3</WarningLevel>
136-
<Optimization>MaxSpeed</Optimization>
137-
<FunctionLevelLinking>true</FunctionLevelLinking>
138-
<IntrinsicFunctions>true</IntrinsicFunctions>
139-
<SDLCheck>true</SDLCheck>
140-
<ConformanceMode>true</ConformanceMode>
141-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
142-
</ClCompile>
143-
<Link>
144-
<SubSystem>Console</SubSystem>
145-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
146-
<OptimizeReferences>true</OptimizeReferences>
147-
<GenerateDebugInformation>true</GenerateDebugInformation>
148-
</Link>
149-
</ItemDefinitionGroup>
15093
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
15194
<ClCompile>
15295
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -165,10 +108,10 @@
165108
<EnableCOMDATFolding>true</EnableCOMDATFolding>
166109
<OptimizeReferences>true</OptimizeReferences>
167110
<GenerateDebugInformation>true</GenerateDebugInformation>
168-
<AdditionalOptions>/link /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib/intel64/vc14" %(AdditionalOptions)</AdditionalOptions>
111+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
169112
</Link>
170113
<PostBuildEvent>
171-
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\redist\intel64\vc14\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
114+
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
172115
</PostBuildEvent>
173116
<PostBuildEvent>
174117
<Message>copy tbb12.dll to binary folder </Message>

‎Libraries/oneDPL/gamma-correction/gamma-correction.vcxproj.user

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Libraries/oneDPL/gamma-correction/sample.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"windows": [
2424
{
2525
"steps": [
26-
"MSBuild gamma-correction.sln /t:Rebuild /p:Configuration=\"Release\"",
26+
"MSBuild gamma-correction.sln /t:Rebuild /p:Configuration=Release",
2727
"cd x64\\Release",
2828
"gamma-correction.exe"
2929
]

‎Libraries/oneTBB/tbb-async-sycl/sample.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
}],
2121
"windows": [{
2222
"steps": [
23-
"MSBuild tbb-async-sycl.sln /t:Rebuild /p:Configuration=\"debug\"",
24-
"cd x64/Debug",
23+
"MSBuild tbb-async-sycl.sln /t:Rebuild /p:Configuration=Release",
24+
"cd x64\\Release",
2525
"tbb-async-sycl.exe"
2626
]
2727
}]

‎Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj

Lines changed: 6 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,16 @@
1818
<WindowsTargetPlatformVersion>$(WindowsSDKVersion.Replace("\",""))</WindowsTargetPlatformVersion>
1919
</PropertyGroup>
2020
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
21-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
22-
<ConfigurationType>Application</ConfigurationType>
23-
<UseDebugLibraries>true</UseDebugLibraries>
24-
<PlatformToolset>oneAPI Data Parallel C++ Compiler</PlatformToolset>
25-
<CharacterSet>Unicode</CharacterSet>
26-
</PropertyGroup>
27-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
28-
<ConfigurationType>Application</ConfigurationType>
29-
<UseDebugLibraries>false</UseDebugLibraries>
30-
<PlatformToolset>oneAPI Data Parallel C++ Compiler</PlatformToolset>
31-
<WholeProgramOptimization>true</WholeProgramOptimization>
32-
<CharacterSet>Unicode</CharacterSet>
33-
</PropertyGroup>
3421
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3522
<ConfigurationType>Application</ConfigurationType>
3623
<UseDebugLibraries>true</UseDebugLibraries>
37-
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2023</PlatformToolset>
24+
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2024</PlatformToolset>
3825
<CharacterSet>Unicode</CharacterSet>
3926
</PropertyGroup>
4027
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4128
<ConfigurationType>Application</ConfigurationType>
4229
<UseDebugLibraries>false</UseDebugLibraries>
43-
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2023</PlatformToolset>
30+
<PlatformToolset>Intel(R) oneAPI DPC++ Compiler 2024</PlatformToolset>
4431
<WholeProgramOptimization>true</WholeProgramOptimization>
4532
<CharacterSet>Unicode</CharacterSet>
4633
</PropertyGroup>
@@ -49,46 +36,19 @@
4936
</ImportGroup>
5037
<ImportGroup Label="Shared">
5138
</ImportGroup>
52-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
53-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54-
</ImportGroup>
55-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
56-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57-
</ImportGroup>
5839
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5940
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6041
</ImportGroup>
6142
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
6243
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6344
</ImportGroup>
6445
<PropertyGroup Label="UserMacros" />
65-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
66-
<LinkIncremental>true</LinkIncremental>
67-
</PropertyGroup>
6846
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6947
<LinkIncremental>true</LinkIncremental>
7048
</PropertyGroup>
71-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
72-
<LinkIncremental>false</LinkIncremental>
73-
</PropertyGroup>
7449
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7550
<LinkIncremental>false</LinkIncremental>
7651
</PropertyGroup>
77-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
78-
<ClCompile>
79-
<PrecompiledHeader>Use</PrecompiledHeader>
80-
<WarningLevel>Level3</WarningLevel>
81-
<Optimization>Disabled</Optimization>
82-
<SDLCheck>true</SDLCheck>
83-
<ConformanceMode>true</ConformanceMode>
84-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
85-
</ClCompile>
86-
<Link>
87-
<SubSystem>Console</SubSystem>
88-
<GenerateDebugInformation>true</GenerateDebugInformation>
89-
<SpecifyDevCmplAdditionalOptions>/Od</SpecifyDevCmplAdditionalOptions>
90-
</Link>
91-
</ItemDefinitionGroup>
9252
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9353
<ClCompile>
9454
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -106,31 +66,13 @@
10666
<SubSystem>Console</SubSystem>
10767
<GenerateDebugInformation>true</GenerateDebugInformation>
10868
<SYCLShowVerboseInformation>false</SYCLShowVerboseInformation>
109-
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib/intel64/vc14" %(AdditionalOptions)</AdditionalOptions>
69+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
11070
<SpecifyDevCmplAdditionalOptions>/Od</SpecifyDevCmplAdditionalOptions>
11171
</Link>
11272
<PostBuildEvent>
113-
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\redist\intel64\vc14\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
73+
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12_debug.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
11474
</PostBuildEvent>
11575
</ItemDefinitionGroup>
116-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
117-
<ClCompile>
118-
<PrecompiledHeader>Use</PrecompiledHeader>
119-
<WarningLevel>Level3</WarningLevel>
120-
<Optimization>MaxSpeed</Optimization>
121-
<FunctionLevelLinking>true</FunctionLevelLinking>
122-
<IntrinsicFunctions>true</IntrinsicFunctions>
123-
<SDLCheck>true</SDLCheck>
124-
<ConformanceMode>true</ConformanceMode>
125-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
126-
</ClCompile>
127-
<Link>
128-
<SubSystem>Console</SubSystem>
129-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
130-
<OptimizeReferences>true</OptimizeReferences>
131-
<GenerateDebugInformation>true</GenerateDebugInformation>
132-
</Link>
133-
</ItemDefinitionGroup>
13476
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
13577
<ClCompile>
13678
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -152,10 +94,10 @@
15294
<OptimizeReferences>true</OptimizeReferences>
15395
<GenerateDebugInformation>true</GenerateDebugInformation>
15496
<SYCLShowVerboseInformation>false</SYCLShowVerboseInformation>
155-
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/tbb/latest/lib/intel64/vc14" %(AdditionalOptions)</AdditionalOptions>
97+
<AdditionalOptions>/link tbb.lib /libpath:"$(ONEAPI_ROOT)/lib/vc_mt" %(AdditionalOptions)</AdditionalOptions>
15698
</Link>
15799
<PostBuildEvent>
158-
<Command>copy /y "$(ONEAPI_ROOT)\tbb\latest\redist\intel64\vc14\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
100+
<Command>copy /y "$(ONEAPI_ROOT)\bin\vc_mt\tbb12.dll" "$(SolutionDir)$(Platform)\$(Configuration)\"</Command>
159101
</PostBuildEvent>
160102
</ItemDefinitionGroup>
161103
<ItemGroup>

‎Libraries/oneTBB/tbb-async-sycl/tbb-async-sycl.vcxproj.user

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Libraries/oneTBB/tbb-resumable-tasks-sycl/sample.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
}],
2121
"windows": [{
2222
"steps": [
23-
"MSBuild tbb-resumable-tasks-sycl.sln /t:Rebuild /p:Configuration=\"debug\"",
24-
"cd x64/Debug",
23+
"MSBuild tbb-resumable-tasks-sycl.sln /t:Rebuild /p:Configuration=Release",
24+
"cd x64\\Release",
2525
"tbb-resumable-tasks-sycl.exe"
2626
]
2727
}]

0 commit comments

Comments
 (0)