Skip to content

Commit c54ca14

Browse files
authored
Clean up executorch_print_configuration_summary (#7574)
Add missing EXECUTORCH_BUILD_ options. s/EXECUTORCH_BUILD_GTESTS/EXECUTORCH_BUILD_TESTS/ . Sort them. Run cmake-format.
1 parent e1c0bcf commit c54ca14

File tree

1 file changed

+43
-27
lines changed

1 file changed

+43
-27
lines changed

build/Utils.cmake

Lines changed: 43 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,20 @@ function(executorch_print_configuration_summary)
4646
message(STATUS " EXECUTORCH_BUILD_ARM_BAREMETAL : "
4747
"${EXECUTORCH_BUILD_ARM_BAREMETAL}"
4848
)
49+
message(STATUS " EXECUTORCH_BUILD_CADENCE : "
50+
"${EXECUTORCH_BUILD_CADENCE}"
51+
)
4952
message(
5053
STATUS
5154
" EXECUTORCH_BUILD_COREML : ${EXECUTORCH_BUILD_COREML}"
5255
)
53-
message(STATUS " EXECUTORCH_BUILD_KERNELS_CUSTOM : "
54-
"${EXECUTORCH_BUILD_KERNELS_CUSTOM}"
56+
message(
57+
STATUS
58+
" EXECUTORCH_BUILD_CPUINFO : ${EXECUTORCH_BUILD_CPUINFO}"
59+
)
60+
message(
61+
STATUS
62+
" EXECUTORCH_BUILD_DEVTOOLS : ${EXECUTORCH_BUILD_DEVTOOLS}"
5563
)
5664
message(STATUS " EXECUTORCH_BUILD_EXECUTOR_RUNNER : "
5765
"${EXECUTORCH_BUILD_EXECUTOR_RUNNER}"
@@ -68,7 +76,7 @@ function(executorch_print_configuration_summary)
6876
message(STATUS " EXECUTORCH_BUILD_EXTENSION_TENSOR : "
6977
"${EXECUTORCH_BUILD_EXTENSION_TENSOR}"
7078
)
71-
message(STATUS " EXECUTORCH_BUILD_EXTENSION_TRAINING : "
79+
message(STATUS " EXECUTORCH_BUILD_EXTENSION_TRAINING : "
7280
"${EXECUTORCH_BUILD_EXTENSION_TRAINING}"
7381
)
7482
message(
@@ -79,22 +87,14 @@ function(executorch_print_configuration_summary)
7987
STATUS
8088
" EXECUTORCH_BUILD_GFLAGS : ${EXECUTORCH_BUILD_GFLAGS}"
8189
)
82-
message(
83-
STATUS
84-
" EXECUTORCH_BUILD_GTESTS : ${EXECUTORCH_BUILD_GTESTS}"
85-
)
8690
message(STATUS " EXECUTORCH_BUILD_HOST_TARGETS : "
8791
"${EXECUTORCH_BUILD_HOST_TARGETS}"
8892
)
89-
message(
90-
STATUS " EXECUTORCH_BUILD_MPS : ${EXECUTORCH_BUILD_MPS}"
91-
)
92-
message(
93-
STATUS
94-
" EXECUTORCH_BUILD_PYBIND : ${EXECUTORCH_BUILD_PYBIND}"
93+
message(STATUS " EXECUTORCH_BUILD_KERNELS_CUSTOM : "
94+
"${EXECUTORCH_BUILD_KERNELS_CUSTOM}"
9595
)
96-
message(
97-
STATUS " EXECUTORCH_BUILD_QNN : ${EXECUTORCH_BUILD_QNN}"
96+
message(STATUS " EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT : "
97+
"${EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT}"
9898
)
9999
message(STATUS " EXECUTORCH_BUILD_KERNELS_OPTIMIZED : "
100100
"${EXECUTORCH_BUILD_KERNELS_OPTIMIZED}"
@@ -103,27 +103,38 @@ function(executorch_print_configuration_summary)
103103
"${EXECUTORCH_BUILD_KERNELS_QUANTIZED}"
104104
)
105105
message(
106-
STATUS " EXECUTORCH_BUILD_DEVTOOLS : ${EXECUTORCH_BUILD_DEVTOOLS}"
106+
STATUS " EXECUTORCH_BUILD_MPS : ${EXECUTORCH_BUILD_MPS}"
107107
)
108108
message(
109109
STATUS
110-
" EXECUTORCH_BUILD_SIZE_TEST : ${EXECUTORCH_BUILD_SIZE_TEST}"
110+
" EXECUTORCH_BUILD_NEURON : ${EXECUTORCH_BUILD_NEURON}"
111111
)
112112
message(
113113
STATUS
114-
" EXECUTORCH_BUILD_XNNPACK : ${EXECUTORCH_BUILD_XNNPACK}"
114+
" EXECUTORCH_BUILD_PTHREADPOOL : ${EXECUTORCH_BUILD_PTHREADPOOL}"
115115
)
116116
message(
117117
STATUS
118-
" EXECUTORCH_BUILD_VULKAN : ${EXECUTORCH_BUILD_VULKAN}"
118+
" EXECUTORCH_BUILD_PYBIND : ${EXECUTORCH_BUILD_PYBIND}"
119+
)
120+
message(
121+
STATUS " EXECUTORCH_BUILD_QNN : ${EXECUTORCH_BUILD_QNN}"
119122
)
120123
message(
121124
STATUS
122-
" EXECUTORCH_BUILD_PTHREADPOOL : ${EXECUTORCH_BUILD_PTHREADPOOL}"
125+
" EXECUTORCH_BUILD_SIZE_TEST : ${EXECUTORCH_BUILD_SIZE_TEST}"
123126
)
124127
message(
125128
STATUS
126-
" EXECUTORCH_BUILD_CPUINFO : ${EXECUTORCH_BUILD_CPUINFO}"
129+
" EXECUTORCH_BUILD_TESTS : ${EXECUTORCH_BUILD_TESTS}"
130+
)
131+
message(
132+
STATUS
133+
" EXECUTORCH_BUILD_VULKAN : ${EXECUTORCH_BUILD_VULKAN}"
134+
)
135+
message(
136+
STATUS
137+
" EXECUTORCH_BUILD_XNNPACK : ${EXECUTORCH_BUILD_XNNPACK}"
127138
)
128139

129140
endfunction()
@@ -193,7 +204,10 @@ function(extract_sources sources_file)
193204
elseif("${ANDROID_ABI}" STREQUAL "x86_64")
194205
set(target_platforms_arg "--target-platforms=shim//:android-x86_64")
195206
else()
196-
message(FATAL_ERROR "Unsupported ANDROID_ABI setting ${ANDROID_ABI}. Please add it here!")
207+
message(
208+
FATAL_ERROR
209+
"Unsupported ANDROID_ABI setting ${ANDROID_ABI}. Please add it here!"
210+
)
197211
endif()
198212
endif()
199213
execute_process(
@@ -269,18 +283,20 @@ function(resolve_buck2)
269283
endif()
270284
endif()
271285

272-
# Update the var in the parent scope. Note that this does not modify our
273-
# local $BUCK2 value.
274-
set(BUCK2 "${buck2}" PARENT_SCOPE)
286+
# Update the var in the parent scope. Note that this does not modify our local
287+
# $BUCK2 value.
288+
set(BUCK2
289+
"${buck2}"
290+
PARENT_SCOPE
291+
)
275292

276293
# The buck2 daemon can get stuck. Killing it can help.
277294
message(STATUS "Killing buck2 daemon")
278295
execute_process(
279296
# Note that we need to use the local buck2 variable. BUCK2 is only set in
280297
# the parent scope, and can still be empty in this scope.
281298
COMMAND "${buck2} killall"
282-
WORKING_DIRECTORY ${executorch_root}
283-
COMMAND_ECHO STDOUT
299+
WORKING_DIRECTORY ${executorch_root} COMMAND_ECHO STDOUT
284300
)
285301
endfunction()
286302

0 commit comments

Comments
 (0)