Skip to content

Commit c342667

Browse files
RossBruntonRossBrunton
authored
[UR] Updates to source checks job (#17160)
The `check-generated` cmake target now only checks files generated from the specification. The LLVM code_formatter job is sufficient to check other files. As part of this, the source generation scripts now also run clang-format on their outputs. Generated .def files are also now considered C++ code, and formatted as well. In addition, the source checks job itself now no longer installs hwloc.
1 parent 17df762 commit c342667

File tree

7 files changed

+140
-78
lines changed

7 files changed

+140
-78
lines changed

‎.github/workflows/ur-source-checks.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,8 @@ jobs:
4343
Expand-Archive -Path "$WorkingDir\doxygen.zip"
4444
Add-Content $env:GITHUB_PATH "$WorkingDir\doxygen"
4545
46-
- name: "[Lin] Install hwloc"
47-
working-directory: ${{github.workspace}}/unified-runtime
48-
if: matrix.os == 'ubuntu-22.04'
49-
run: .github/scripts/install_hwloc.sh
50-
51-
- name: "[Win] Install hwloc"
52-
working-directory: ${{github.workspace}}/unified-runtime
53-
if: matrix.os == 'windows-2022'
54-
run: vcpkg install hwloc:x64-windows
55-
5646
- name: Configure Unified Runtime project
5747
working-directory: ${{github.workspace}}/unified-runtime
58-
env:
59-
VCPKG_PATH: "C:/vcpkg/packages/hwloc_x64-windows"
6048
run: >
6149
cmake
6250
-B${{github.workspace}}/build
@@ -65,6 +53,7 @@ jobs:
6553
-DCMAKE_BUILD_TYPE=Debug
6654
-DUR_BUILD_TESTS=OFF
6755
-DUR_FORMAT_CPP_STYLE=ON
56+
-DUMF_DISABLE_HWLOC=ON
6857
6958
# Verifying license should be enough on a single OS
7059
- name: Verify that each source file contains a license

‎unified-runtime/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,10 @@ if(UR_FORMAT_CPP_STYLE)
386386
--api-json ${API_JSON_FILE}
387387
--clang-format=${CLANG_FORMAT}
388388
$<$<BOOL:${UR_ENABLE_FAST_SPEC_MODE}>:--fast-mode>
389-
COMMAND ${Python3_EXECUTABLE} json2src.py --api-json ${API_JSON_FILE} ${PROJECT_SOURCE_DIR}
389+
COMMAND ${Python3_EXECUTABLE} json2src.py
390+
--api-json ${API_JSON_FILE}
391+
--clang-format=${CLANG_FORMAT}
392+
${PROJECT_SOURCE_DIR}
390393
)
391394

392395
# Generate and format source from the specification
@@ -399,7 +402,7 @@ if(UR_FORMAT_CPP_STYLE)
399402
add_custom_target(check-generated
400403
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
401404
COMMAND git diff --exit-code
402-
DEPENDS generate
405+
DEPENDS generate-code
403406
)
404407
else()
405408
message(STATUS " UR_FORMAT_CPP_STYLE not set. Targets: 'generate' and 'check-generated' are not available")

‎unified-runtime/include/ur_api_funcs.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
// Auto-generated file, do not edit.
18+
// Auto-generated file, do not edit.
1919

2020
_UR_API(urPlatformGet)
2121
_UR_API(urPlatformGetInfo)

‎unified-runtime/scripts/json2src.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ def add_argument(parser, name, help, default=False):
5959
default=sys.stdin,
6060
help="JSON file containing the API specification, by default read from stdin",
6161
)
62+
parser.add_argument(
63+
"--clang-format",
64+
type=str,
65+
default="clang-format",
66+
required=False,
67+
help="path to clang-format executable",
68+
)
6269
parser.add_argument("out_dir", type=str, help="Root of the loader repository.")
6370
args = parser.parse_args()
6471

@@ -154,6 +161,7 @@ def add_argument(parser, name, help, default=False):
154161
input["meta"],
155162
)
156163

164+
util.formatGeneratedFiles(args.clang_format)
157165
if args.debug:
158166
util.makoFileListWrite("generated.json")
159167

‎unified-runtime/scripts/run.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -232,17 +232,6 @@ def main():
232232
input["meta"],
233233
)
234234

235-
# clang-format ur_api.h
236-
proc = subprocess.run(
237-
[args["clang_format"], "--style=file", "-i", "ur_api.h"],
238-
stderr=subprocess.PIPE,
239-
cwd=incpath,
240-
)
241-
if proc.returncode != 0:
242-
print("-- clang-format failed with non-zero return code. --")
243-
print(proc.stderr.decode())
244-
raise Exception("Failed to format ur_api.h")
245-
246235
if args["rst"]:
247236
generate_docs.generate_rst(
248237
docpath,
@@ -272,6 +261,8 @@ def main():
272261
print("\nBuild failed, stopping execution!")
273262
return
274263

264+
util.formatGeneratedFiles(args["clang_format"])
265+
275266
# phase 5: prep for publication of html or pdf
276267
if args["html"] or args["pdf"]:
277268
generate_docs.generate_common(

‎unified-runtime/scripts/util.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import glob
1515
import json
1616
import yaml
17+
import subprocess
1718
from mako.template import Template
1819
from mako import exceptions
1920

@@ -210,6 +211,21 @@ def makoFileListWrite(outpath):
210211
jsonWrite(outpath, makoFileList)
211212

212213

214+
def formatGeneratedFiles(clang_format):
215+
for file in makoFileList:
216+
if re.search(r"(\.h|\.hpp|\.c|\.cpp|\.def)$", file) is None:
217+
continue
218+
print("Formatting {}".format(file))
219+
proc = subprocess.run(
220+
[clang_format, "--style=file", "-i", file],
221+
stderr=subprocess.PIPE,
222+
)
223+
if proc.returncode != 0:
224+
print("-- clang-format failed with non-zero return code. --")
225+
print(proc.stderr.decode())
226+
raise Exception("Failed to format {}".format(file))
227+
228+
213229
def makeErrorCount():
214230
return len(makoErrorList)
215231

‎unified-runtime/source/common/stype_map_helpers.def

Lines changed: 107 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,161 @@
11

2-
// This file is autogenerated from the template at templates/stype_map_helpers.hpp.mako
2+
// This file is autogenerated from the template at
3+
// templates/stype_map_helpers.hpp.mako
34

45
template <>
5-
struct stype_map<ur_context_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_CONTEXT_PROPERTIES> {};
6+
struct stype_map<ur_context_properties_t>
7+
: stype_map_impl<UR_STRUCTURE_TYPE_CONTEXT_PROPERTIES> {};
68
template <>
7-
struct stype_map<ur_image_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_IMAGE_DESC> {};
9+
struct stype_map<ur_image_desc_t>
10+
: stype_map_impl<UR_STRUCTURE_TYPE_IMAGE_DESC> {};
811
template <>
9-
struct stype_map<ur_buffer_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_BUFFER_PROPERTIES> {};
12+
struct stype_map<ur_buffer_properties_t>
13+
: stype_map_impl<UR_STRUCTURE_TYPE_BUFFER_PROPERTIES> {};
1014
template <>
11-
struct stype_map<ur_buffer_region_t> : stype_map_impl<UR_STRUCTURE_TYPE_BUFFER_REGION> {};
15+
struct stype_map<ur_buffer_region_t>
16+
: stype_map_impl<UR_STRUCTURE_TYPE_BUFFER_REGION> {};
1217
template <>
13-
struct stype_map<ur_buffer_channel_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_BUFFER_CHANNEL_PROPERTIES> {};
18+
struct stype_map<ur_buffer_channel_properties_t>
19+
: stype_map_impl<UR_STRUCTURE_TYPE_BUFFER_CHANNEL_PROPERTIES> {};
1420
template <>
15-
struct stype_map<ur_buffer_alloc_location_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_BUFFER_ALLOC_LOCATION_PROPERTIES> {};
21+
struct stype_map<ur_buffer_alloc_location_properties_t>
22+
: stype_map_impl<UR_STRUCTURE_TYPE_BUFFER_ALLOC_LOCATION_PROPERTIES> {};
1623
template <>
17-
struct stype_map<ur_program_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_PROGRAM_PROPERTIES> {};
24+
struct stype_map<ur_program_properties_t>
25+
: stype_map_impl<UR_STRUCTURE_TYPE_PROGRAM_PROPERTIES> {};
1826
template <>
1927
struct stype_map<ur_usm_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_USM_DESC> {};
2028
template <>
21-
struct stype_map<ur_usm_host_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_USM_HOST_DESC> {};
29+
struct stype_map<ur_usm_host_desc_t>
30+
: stype_map_impl<UR_STRUCTURE_TYPE_USM_HOST_DESC> {};
2231
template <>
23-
struct stype_map<ur_usm_device_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_USM_DEVICE_DESC> {};
32+
struct stype_map<ur_usm_device_desc_t>
33+
: stype_map_impl<UR_STRUCTURE_TYPE_USM_DEVICE_DESC> {};
2434
template <>
25-
struct stype_map<ur_usm_pool_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_USM_POOL_DESC> {};
35+
struct stype_map<ur_usm_pool_desc_t>
36+
: stype_map_impl<UR_STRUCTURE_TYPE_USM_POOL_DESC> {};
2637
template <>
27-
struct stype_map<ur_usm_pool_limits_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_USM_POOL_LIMITS_DESC> {};
38+
struct stype_map<ur_usm_pool_limits_desc_t>
39+
: stype_map_impl<UR_STRUCTURE_TYPE_USM_POOL_LIMITS_DESC> {};
2840
template <>
29-
struct stype_map<ur_device_binary_t> : stype_map_impl<UR_STRUCTURE_TYPE_DEVICE_BINARY> {};
41+
struct stype_map<ur_device_binary_t>
42+
: stype_map_impl<UR_STRUCTURE_TYPE_DEVICE_BINARY> {};
3043
template <>
31-
struct stype_map<ur_sampler_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_SAMPLER_DESC> {};
44+
struct stype_map<ur_sampler_desc_t>
45+
: stype_map_impl<UR_STRUCTURE_TYPE_SAMPLER_DESC> {};
3246
template <>
33-
struct stype_map<ur_queue_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_QUEUE_PROPERTIES> {};
47+
struct stype_map<ur_queue_properties_t>
48+
: stype_map_impl<UR_STRUCTURE_TYPE_QUEUE_PROPERTIES> {};
3449
template <>
35-
struct stype_map<ur_queue_index_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_QUEUE_INDEX_PROPERTIES> {};
50+
struct stype_map<ur_queue_index_properties_t>
51+
: stype_map_impl<UR_STRUCTURE_TYPE_QUEUE_INDEX_PROPERTIES> {};
3652
template <>
37-
struct stype_map<ur_context_native_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_CONTEXT_NATIVE_PROPERTIES> {};
53+
struct stype_map<ur_context_native_properties_t>
54+
: stype_map_impl<UR_STRUCTURE_TYPE_CONTEXT_NATIVE_PROPERTIES> {};
3855
template <>
39-
struct stype_map<ur_kernel_native_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_NATIVE_PROPERTIES> {};
56+
struct stype_map<ur_kernel_native_properties_t>
57+
: stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_NATIVE_PROPERTIES> {};
4058
template <>
41-
struct stype_map<ur_queue_native_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_QUEUE_NATIVE_PROPERTIES> {};
59+
struct stype_map<ur_queue_native_properties_t>
60+
: stype_map_impl<UR_STRUCTURE_TYPE_QUEUE_NATIVE_PROPERTIES> {};
4261
template <>
43-
struct stype_map<ur_mem_native_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_MEM_NATIVE_PROPERTIES> {};
62+
struct stype_map<ur_mem_native_properties_t>
63+
: stype_map_impl<UR_STRUCTURE_TYPE_MEM_NATIVE_PROPERTIES> {};
4464
template <>
45-
struct stype_map<ur_event_native_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_EVENT_NATIVE_PROPERTIES> {};
65+
struct stype_map<ur_event_native_properties_t>
66+
: stype_map_impl<UR_STRUCTURE_TYPE_EVENT_NATIVE_PROPERTIES> {};
4667
template <>
47-
struct stype_map<ur_platform_native_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_PLATFORM_NATIVE_PROPERTIES> {};
68+
struct stype_map<ur_platform_native_properties_t>
69+
: stype_map_impl<UR_STRUCTURE_TYPE_PLATFORM_NATIVE_PROPERTIES> {};
4870
template <>
49-
struct stype_map<ur_device_native_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_DEVICE_NATIVE_PROPERTIES> {};
71+
struct stype_map<ur_device_native_properties_t>
72+
: stype_map_impl<UR_STRUCTURE_TYPE_DEVICE_NATIVE_PROPERTIES> {};
5073
template <>
51-
struct stype_map<ur_program_native_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_PROGRAM_NATIVE_PROPERTIES> {};
74+
struct stype_map<ur_program_native_properties_t>
75+
: stype_map_impl<UR_STRUCTURE_TYPE_PROGRAM_NATIVE_PROPERTIES> {};
5276
template <>
53-
struct stype_map<ur_sampler_native_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_SAMPLER_NATIVE_PROPERTIES> {};
77+
struct stype_map<ur_sampler_native_properties_t>
78+
: stype_map_impl<UR_STRUCTURE_TYPE_SAMPLER_NATIVE_PROPERTIES> {};
5479
template <>
55-
struct stype_map<ur_queue_native_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_QUEUE_NATIVE_DESC> {};
80+
struct stype_map<ur_queue_native_desc_t>
81+
: stype_map_impl<UR_STRUCTURE_TYPE_QUEUE_NATIVE_DESC> {};
5682
template <>
57-
struct stype_map<ur_device_partition_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_DEVICE_PARTITION_PROPERTIES> {};
83+
struct stype_map<ur_device_partition_properties_t>
84+
: stype_map_impl<UR_STRUCTURE_TYPE_DEVICE_PARTITION_PROPERTIES> {};
5885
template <>
59-
struct stype_map<ur_kernel_arg_mem_obj_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_ARG_MEM_OBJ_PROPERTIES> {};
86+
struct stype_map<ur_kernel_arg_mem_obj_properties_t>
87+
: stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_ARG_MEM_OBJ_PROPERTIES> {};
6088
template <>
61-
struct stype_map<ur_physical_mem_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_PHYSICAL_MEM_PROPERTIES> {};
89+
struct stype_map<ur_physical_mem_properties_t>
90+
: stype_map_impl<UR_STRUCTURE_TYPE_PHYSICAL_MEM_PROPERTIES> {};
6291
template <>
63-
struct stype_map<ur_kernel_arg_pointer_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_ARG_POINTER_PROPERTIES> {};
92+
struct stype_map<ur_kernel_arg_pointer_properties_t>
93+
: stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_ARG_POINTER_PROPERTIES> {};
6494
template <>
65-
struct stype_map<ur_kernel_arg_sampler_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_ARG_SAMPLER_PROPERTIES> {};
95+
struct stype_map<ur_kernel_arg_sampler_properties_t>
96+
: stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_ARG_SAMPLER_PROPERTIES> {};
6697
template <>
67-
struct stype_map<ur_kernel_exec_info_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_EXEC_INFO_PROPERTIES> {};
98+
struct stype_map<ur_kernel_exec_info_properties_t>
99+
: stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_EXEC_INFO_PROPERTIES> {};
68100
template <>
69-
struct stype_map<ur_kernel_arg_value_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_ARG_VALUE_PROPERTIES> {};
101+
struct stype_map<ur_kernel_arg_value_properties_t>
102+
: stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_ARG_VALUE_PROPERTIES> {};
70103
template <>
71-
struct stype_map<ur_kernel_arg_local_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_ARG_LOCAL_PROPERTIES> {};
104+
struct stype_map<ur_kernel_arg_local_properties_t>
105+
: stype_map_impl<UR_STRUCTURE_TYPE_KERNEL_ARG_LOCAL_PROPERTIES> {};
72106
template <>
73-
struct stype_map<ur_usm_alloc_location_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_USM_ALLOC_LOCATION_DESC> {};
107+
struct stype_map<ur_usm_alloc_location_desc_t>
108+
: stype_map_impl<UR_STRUCTURE_TYPE_USM_ALLOC_LOCATION_DESC> {};
74109
template <>
75-
struct stype_map<ur_exp_command_buffer_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_DESC> {};
110+
struct stype_map<ur_exp_command_buffer_desc_t>
111+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_DESC> {};
76112
template <>
77-
struct stype_map<ur_exp_command_buffer_update_kernel_launch_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_UPDATE_KERNEL_LAUNCH_DESC> {};
113+
struct stype_map<ur_exp_command_buffer_update_kernel_launch_desc_t>
114+
: stype_map_impl<
115+
UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_UPDATE_KERNEL_LAUNCH_DESC> {};
78116
template <>
79-
struct stype_map<ur_exp_command_buffer_update_memobj_arg_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_UPDATE_MEMOBJ_ARG_DESC> {};
117+
struct stype_map<ur_exp_command_buffer_update_memobj_arg_desc_t>
118+
: stype_map_impl<
119+
UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_UPDATE_MEMOBJ_ARG_DESC> {};
80120
template <>
81-
struct stype_map<ur_exp_command_buffer_update_pointer_arg_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_UPDATE_POINTER_ARG_DESC> {};
121+
struct stype_map<ur_exp_command_buffer_update_pointer_arg_desc_t>
122+
: stype_map_impl<
123+
UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_UPDATE_POINTER_ARG_DESC> {};
82124
template <>
83-
struct stype_map<ur_exp_command_buffer_update_value_arg_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_UPDATE_VALUE_ARG_DESC> {};
125+
struct stype_map<ur_exp_command_buffer_update_value_arg_desc_t>
126+
: stype_map_impl<
127+
UR_STRUCTURE_TYPE_EXP_COMMAND_BUFFER_UPDATE_VALUE_ARG_DESC> {};
84128
template <>
85-
struct stype_map<ur_exp_sampler_mip_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_SAMPLER_MIP_PROPERTIES> {};
129+
struct stype_map<ur_exp_sampler_mip_properties_t>
130+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_SAMPLER_MIP_PROPERTIES> {};
86131
template <>
87-
struct stype_map<ur_exp_external_mem_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_EXTERNAL_MEM_DESC> {};
132+
struct stype_map<ur_exp_external_mem_desc_t>
133+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_EXTERNAL_MEM_DESC> {};
88134
template <>
89-
struct stype_map<ur_exp_external_semaphore_desc_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_EXTERNAL_SEMAPHORE_DESC> {};
135+
struct stype_map<ur_exp_external_semaphore_desc_t>
136+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_EXTERNAL_SEMAPHORE_DESC> {};
90137
template <>
91-
struct stype_map<ur_exp_file_descriptor_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_FILE_DESCRIPTOR> {};
138+
struct stype_map<ur_exp_file_descriptor_t>
139+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_FILE_DESCRIPTOR> {};
92140
template <>
93-
struct stype_map<ur_exp_win32_handle_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_WIN32_HANDLE> {};
141+
struct stype_map<ur_exp_win32_handle_t>
142+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_WIN32_HANDLE> {};
94143
template <>
95-
struct stype_map<ur_exp_sampler_addr_modes_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_SAMPLER_ADDR_MODES> {};
144+
struct stype_map<ur_exp_sampler_addr_modes_t>
145+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_SAMPLER_ADDR_MODES> {};
96146
template <>
97-
struct stype_map<ur_exp_sampler_cubemap_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_SAMPLER_CUBEMAP_PROPERTIES> {};
147+
struct stype_map<ur_exp_sampler_cubemap_properties_t>
148+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_SAMPLER_CUBEMAP_PROPERTIES> {};
98149
template <>
99-
struct stype_map<ur_exp_image_copy_region_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_IMAGE_COPY_REGION> {};
150+
struct stype_map<ur_exp_image_copy_region_t>
151+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_IMAGE_COPY_REGION> {};
100152
template <>
101-
struct stype_map<ur_exp_async_usm_alloc_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_ASYNC_USM_ALLOC_PROPERTIES> {};
153+
struct stype_map<ur_exp_async_usm_alloc_properties_t>
154+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_ASYNC_USM_ALLOC_PROPERTIES> {};
102155
template <>
103-
struct stype_map<ur_exp_enqueue_native_command_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_ENQUEUE_NATIVE_COMMAND_PROPERTIES> {};
156+
struct stype_map<ur_exp_enqueue_native_command_properties_t>
157+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_ENQUEUE_NATIVE_COMMAND_PROPERTIES> {
158+
};
104159
template <>
105-
struct stype_map<ur_exp_enqueue_ext_properties_t> : stype_map_impl<UR_STRUCTURE_TYPE_EXP_ENQUEUE_EXT_PROPERTIES> {};
106-
160+
struct stype_map<ur_exp_enqueue_ext_properties_t>
161+
: stype_map_impl<UR_STRUCTURE_TYPE_EXP_ENQUEUE_EXT_PROPERTIES> {};

0 commit comments

Comments
 (0)