Skip to content

Commit 56d39b9

Browse files
committed
Format CMakeLists.txt files about to be changed in EXPORT PR
ghstack-source-id: 5341006 ghstack-comment-id: 3071038265 Pull-Request: #12463
1 parent e557856 commit 56d39b9

File tree

13 files changed

+154
-120
lines changed

13 files changed

+154
-120
lines changed

backends/apple/coreml/CMakeLists.txt

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ if(APPLE)
104104
endif()
105105

106106
add_library(coreml_util ${UTIL_SOURCES})
107-
target_include_directories(coreml_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util)
107+
target_include_directories(
108+
coreml_util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/util
109+
)
108110
if(APPLE)
109111
target_link_libraries(coreml_util PRIVATE ${FOUNDATION_FRAMEWORK})
110112
endif()
@@ -119,21 +121,25 @@ install(
119121

120122
# CoreML inmemoryfs
121123

122-
set(
123-
INMEMORYFS_SOURCES
124-
runtime/inmemoryfs/inmemory_filesystem.cpp
125-
runtime/inmemoryfs/memory_buffer.cpp
126-
runtime/inmemoryfs/memory_stream.cpp
127-
runtime/inmemoryfs/reversed_memory_stream.cpp
124+
set(INMEMORYFS_SOURCES
125+
runtime/inmemoryfs/inmemory_filesystem.cpp
126+
runtime/inmemoryfs/memory_buffer.cpp runtime/inmemoryfs/memory_stream.cpp
127+
runtime/inmemoryfs/reversed_memory_stream.cpp
128128
)
129129
if(APPLE)
130-
list(APPEND INMEMORYFS_SOURCES runtime/inmemoryfs/inmemory_filesystem_utils.mm)
130+
list(APPEND INMEMORYFS_SOURCES
131+
runtime/inmemoryfs/inmemory_filesystem_utils.mm
132+
)
131133
endif()
132134

133135
add_library(coreml_inmemoryfs ${INMEMORYFS_SOURCES})
134-
target_include_directories(coreml_inmemoryfs PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs)
136+
target_include_directories(
137+
coreml_inmemoryfs PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inmemoryfs
138+
)
135139
if(APPLE)
136-
target_link_libraries(coreml_inmemoryfs PRIVATE coreml_util ${FOUNDATION_FRAMEWORK})
140+
target_link_libraries(
141+
coreml_inmemoryfs PRIVATE coreml_util ${FOUNDATION_FRAMEWORK}
142+
)
137143
endif()
138144
target_compile_options(coreml_inmemoryfs PUBLIC -fPIC)
139145

@@ -148,17 +154,12 @@ install(
148154

149155
if(EXECUTORCH_BUILD_PYBIND)
150156
pybind11_add_module(
151-
executorchcoreml
152-
SHARED
153-
runtime/inmemoryfs/inmemory_filesystem_py.cpp
154-
runtime/inmemoryfs/inmemory_filesystem_utils.cpp
157+
executorchcoreml SHARED runtime/inmemoryfs/inmemory_filesystem_py.cpp
158+
runtime/inmemoryfs/inmemory_filesystem_utils.cpp
155159
)
156160
target_link_libraries(
157-
executorchcoreml
158-
PRIVATE
159-
coreml_util
160-
coreml_inmemoryfs
161-
nlohmann_json::nlohmann_json
161+
executorchcoreml PRIVATE coreml_util coreml_inmemoryfs
162+
nlohmann_json::nlohmann_json
162163
)
163164
target_compile_options(executorchcoreml PUBLIC -fPIC)
164165
endif()
@@ -179,8 +180,12 @@ if(APPLE)
179180
coremldelegate PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/delegate
180181
)
181182
target_include_directories(coremldelegate PRIVATE ${PROJECT_SOURCE_DIR}/..)
182-
target_include_directories(coremldelegate PRIVATE ${PROJECT_SOURCE_DIR}/runtime/core/portable_type/c10)
183-
target_compile_definitions(coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS)
183+
target_include_directories(
184+
coremldelegate PRIVATE ${PROJECT_SOURCE_DIR}/runtime/core/portable_type/c10
185+
)
186+
target_compile_definitions(
187+
coremldelegate PRIVATE C10_USING_CUSTOM_GENERATED_MACROS
188+
)
184189

185190
if(EXECUTORCH_BUILD_DEVTOOLS)
186191
target_sources(coremldelegate PRIVATE ${SDK_SOURCES} ${PROTOBUF_SOURCES})
@@ -200,13 +205,9 @@ if(APPLE)
200205

201206
target_link_libraries(
202207
coremldelegate
203-
PUBLIC coreml_util
204-
coreml_inmemoryfs
205-
PRIVATE executorch_core
206-
${ACCELERATE_FRAMEWORK}
207-
${COREML_FRAMEWORK}
208-
${FOUNDATION_FRAMEWORK}
209-
${SQLITE_LIBRARY}
208+
PUBLIC coreml_util coreml_inmemoryfs
209+
PRIVATE executorch_core ${ACCELERATE_FRAMEWORK} ${COREML_FRAMEWORK}
210+
${FOUNDATION_FRAMEWORK} ${SQLITE_LIBRARY}
210211
)
211212

212213
target_link_options_shared_lib(coremldelegate)
@@ -218,13 +219,8 @@ if(APPLE)
218219
endif()
219220

220221
target_compile_options(
221-
coremldelegate
222-
PRIVATE
223-
-fobjc-arc
224-
-fno-exceptions
225-
-x objective-c++
226-
-Wno-null-character
227-
-Wno-receiver-expr
222+
coremldelegate PRIVATE -fobjc-arc -fno-exceptions -x objective-c++
223+
-Wno-null-character -Wno-receiver-expr
228224
)
229225

230226
if(EXECUTORCH_BUILD_DEVTOOLS)

backends/mediatek/CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,9 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/runtime/include)
2424
# targets
2525
add_library(neuron_backend SHARED)
2626
target_compile_options(neuron_backend PRIVATE "-frtti" "-fexceptions")
27-
target_link_libraries(neuron_backend
28-
PRIVATE
29-
executorch_core
30-
portable_ops_lib
31-
portable_kernels
32-
android
33-
log
27+
target_link_libraries(
28+
neuron_backend PRIVATE executorch_core portable_ops_lib portable_kernels
29+
android log
3430
)
3531
target_sources(
3632
neuron_backend

backends/qualcomm/CMakeLists.txt

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
6969
endif()
7070

7171
include_directories(
72-
BEFORE ${_common_include_directories} ${QNN_SDK_ROOT}/include/QNN
72+
BEFORE
73+
${_common_include_directories}
74+
${QNN_SDK_ROOT}/include/QNN
7375
${QNN_SDK_ROOT}/share/QNN/converter/jni
7476
${EXECUTORCH_SOURCE_DIR}/third-party/flatbuffers/include
7577
${EXECUTORCH_SOURCE_DIR}/runtime/core/portable_type/c10
7678
)
7779

78-
set(_qnn_schema__srcs
79-
backends/qualcomm/serialization/qc_compiler_spec.fbs
80-
)
80+
set(_qnn_schema__srcs backends/qualcomm/serialization/qc_compiler_spec.fbs)
8181
set(_qnn_schema__include_dir "${CMAKE_BINARY_DIR}/schema/include")
8282
# Paths to headers generated from the .fbs files.
8383
set(_qnn_schema__outputs)
@@ -145,22 +145,24 @@ add_library(utils STATIC)
145145
target_link_libraries(qcir_utils PRIVATE qcir)
146146
target_link_libraries(wrappers PRIVATE qnn_executorch_logging)
147147
target_link_libraries(
148-
qnn_implementation PRIVATE qnn_function_interface qnn_executorch_logging ${CMAKE_DL_LIBS}
148+
qnn_implementation PRIVATE qnn_function_interface qnn_executorch_logging
149+
${CMAKE_DL_LIBS}
149150
)
150151
target_link_libraries(
151-
qnn_sys_implementation PRIVATE qnn_sys_function_interface qnn_executorch_logging ${CMAKE_DL_LIBS}
152+
qnn_sys_implementation PRIVATE qnn_sys_function_interface
153+
qnn_executorch_logging ${CMAKE_DL_LIBS}
152154
)
153155
target_link_libraries(qnn_executorch_logging PRIVATE qnn_schema)
154156
target_link_libraries(qnn_profiler PRIVATE qnn_executorch_logging)
155157
target_link_libraries(qnn_logger PRIVATE qnn_implementation ${android_log})
156-
target_link_libraries(qnn_backend PRIVATE qnn_implementation qnn_logger qnn_op_package_manager)
157-
target_link_libraries(qnn_custom_protocol PRIVATE qnn_logger)
158158
target_link_libraries(
159-
qnn_device PRIVATE qnn_executorch_logging qnn_implementation qnn_logger
159+
qnn_backend PRIVATE qnn_implementation qnn_logger qnn_op_package_manager
160160
)
161+
target_link_libraries(qnn_custom_protocol PRIVATE qnn_logger)
161162
target_link_libraries(
162-
qnn_backend_cache PRIVATE qnn_sys_implementation
163+
qnn_device PRIVATE qnn_executorch_logging qnn_implementation qnn_logger
163164
)
165+
target_link_libraries(qnn_backend_cache PRIVATE qnn_sys_implementation)
164166
target_link_libraries(
165167
qnn_context PRIVATE qnn_implementation qnn_logger qnn_backend qnn_device
166168
qnn_backend_cache
@@ -174,14 +176,24 @@ target_link_libraries(
174176
)
175177

176178
target_link_libraries(
177-
qnn_factory PRIVATE qnn_schema qnn_backend qnn_device qnn_context qnn_graph
178-
qnn_mem_manager qnn_custom_protocol
179+
qnn_factory
180+
PRIVATE qnn_schema
181+
qnn_backend
182+
qnn_device
183+
qnn_context
184+
qnn_graph
185+
qnn_mem_manager
186+
qnn_custom_protocol
179187
)
180188

181-
target_link_libraries(qnn_dlc_manager PRIVATE qnn_factory qnn_backend qnn_device qnn_context qnn_graph qnn_mem_manager)
189+
target_link_libraries(
190+
qnn_dlc_manager PRIVATE qnn_factory qnn_backend qnn_device qnn_context
191+
qnn_graph qnn_mem_manager
192+
)
182193

183194
target_link_libraries(
184-
qnn_manager PRIVATE qnn_factory wrappers qnn_schema utils shared_buffer qnn_dlc_manager
195+
qnn_manager PRIVATE qnn_factory wrappers qnn_schema utils shared_buffer
196+
qnn_dlc_manager
185197
)
186198
target_link_libraries(
187199
qnn_executorch_backend PRIVATE qnn_executorch_header qnn_schema qnn_manager

backends/vulkan/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ add_custom_command(
8282
OUTPUT ${GENERATED_HEADER}
8383
COMMAND
8484
flatc --cpp --cpp-std c++11 --scoped-enums -o
85-
"${SCHEMA_INCLUDE_DIR}/executorch/backends/vulkan/serialization/" ${_vulkan_schema__srcs}
85+
"${SCHEMA_INCLUDE_DIR}/executorch/backends/vulkan/serialization/"
86+
${_vulkan_schema__srcs}
8687
WORKING_DIRECTORY ${EXECUTORCH_ROOT}
8788
DEPENDS flatc
8889
COMMENT "Generating vulkan_schema headers"

configurations/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
4444

4545
# optimized_native_cpu_ops_lib: Register optimized op kernels into the runtime
4646
if(TARGET optimized_portable_kernels)
47-
set(_optimized_native_cpu_ops_lib_portable_kernels_lib optimized_portable_kernels)
47+
set(_optimized_native_cpu_ops_lib_portable_kernels_lib
48+
optimized_portable_kernels
49+
)
4850
else()
4951
set(_optimized_native_cpu_ops_lib_portable_kernels_lib portable_kernels)
5052
endif()

extension/llm/custom_ops/CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@ target_include_directories(
7878
)
7979
target_link_libraries(custom_ops PUBLIC ${custom_ops_libs} executorch_core)
8080

81-
target_compile_options(
82-
custom_ops PUBLIC ${_common_compile_options}
83-
)
81+
target_compile_options(custom_ops PUBLIC ${_common_compile_options})
8482

8583
install(TARGETS custom_ops DESTINATION lib)
8684

@@ -117,7 +115,9 @@ if(EXECUTORCH_BUILD_KERNELS_LLM_AOT)
117115
else()
118116
# If no portable_lib, custom_ops_aot_lib still gives the ability to use the
119117
# ops in PyTorch
120-
target_link_libraries(custom_ops_aot_lib PUBLIC executorch_core kernels_util_all_deps)
118+
target_link_libraries(
119+
custom_ops_aot_lib PUBLIC executorch_core kernels_util_all_deps
120+
)
121121
endif()
122122

123123
target_link_libraries(
@@ -130,9 +130,8 @@ if(EXECUTORCH_BUILD_KERNELS_LLM_AOT)
130130
target_link_libraries(custom_ops_aot_lib PUBLIC pthreadpool cpuinfo)
131131
endif()
132132
target_compile_options(
133-
custom_ops_aot_lib
134-
PUBLIC -Wno-deprecated-declarations -fPIC -frtti -fexceptions
135-
${_common_compile_options}
133+
custom_ops_aot_lib PUBLIC -Wno-deprecated-declarations -fPIC -frtti
134+
-fexceptions ${_common_compile_options}
136135
)
137136

138137
install(TARGETS custom_ops_aot_lib

extension/module/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ if(CMAKE_TOOLCHAIN_IOS
2727
else()
2828
add_library(extension_module SHARED ${_extension_module__srcs})
2929
endif()
30-
target_link_libraries(extension_module PRIVATE executorch_core extension_data_loader extension_flat_tensor)
30+
target_link_libraries(
31+
extension_module PRIVATE executorch_core extension_data_loader
32+
extension_flat_tensor
33+
)
3134
target_include_directories(extension_module PUBLIC ${EXECUTORCH_ROOT}/..)
3235
target_compile_options(
3336
extension_module PUBLIC -Wno-deprecated-declarations -fPIC
@@ -37,7 +40,8 @@ target_compile_options(
3740
# after cleaning up CMake targets.
3841
add_library(extension_module_static STATIC ${_extension_module__srcs})
3942
target_link_libraries(
40-
extension_module_static PRIVATE executorch_core extension_data_loader extension_flat_tensor
43+
extension_module_static PRIVATE executorch_core extension_data_loader
44+
extension_flat_tensor
4145
)
4246
target_include_directories(extension_module_static PUBLIC ${EXECUTORCH_ROOT}/..)
4347
target_compile_options(

kernels/optimized/CMakeLists.txt

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,30 @@ gen_selected_ops(LIB_NAME "optimized_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
5252

5353
generate_bindings_for_kernels(
5454
LIB_NAME "optimized_ops_lib" FUNCTIONS_YAML
55-
${CMAKE_CURRENT_SOURCE_DIR}/optimized.yaml
56-
ADD_EXCEPTION_BOUNDARY
55+
${CMAKE_CURRENT_SOURCE_DIR}/optimized.yaml ADD_EXCEPTION_BOUNDARY
5756
)
5857
message("Generated files ${gen_command_sources}")
5958

6059
list(TRANSFORM _optimized_kernels__srcs PREPEND "${EXECUTORCH_ROOT}/")
6160
add_library(optimized_kernels ${_optimized_kernels__srcs})
62-
target_include_directories(optimized_kernels PRIVATE ${TORCH_INCLUDE_DIRS} "${EXECUTORCH_ROOT}/third-party/pocketfft")
63-
target_compile_definitions(optimized_kernels PRIVATE "ET_USE_PYTORCH_HEADERS=ET_HAS_EXCEPTIONS")
61+
target_include_directories(
62+
optimized_kernels PRIVATE ${TORCH_INCLUDE_DIRS}
63+
"${EXECUTORCH_ROOT}/third-party/pocketfft"
64+
)
65+
target_compile_definitions(
66+
optimized_kernels PRIVATE "ET_USE_PYTORCH_HEADERS=ET_HAS_EXCEPTIONS"
67+
)
6468
target_link_libraries(
65-
optimized_kernels PUBLIC executorch_core cpublas extension_threadpool kernels_util_all_deps
69+
optimized_kernels PUBLIC executorch_core cpublas extension_threadpool
70+
kernels_util_all_deps
6671
)
6772
target_compile_options(optimized_kernels PUBLIC ${_common_compile_options})
6873
# Build a library for _optimized_kernels_srcs
6974
#
7075
# optimized_ops_lib: Register optimized ops kernels into Executorch runtime
7176
gen_operators_lib(
72-
LIB_NAME "optimized_ops_lib" KERNEL_LIBS optimized_kernels DEPS executorch_core
77+
LIB_NAME "optimized_ops_lib" KERNEL_LIBS optimized_kernels DEPS
78+
executorch_core
7379
)
7480

7581
install(

kernels/portable/CMakeLists.txt

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ message("Generated files ${gen_command_sources}")
4848
# Focused on portability and understandability rather than speed.
4949
#
5050
add_library(portable_kernels ${_portable_kernels__srcs})
51-
target_link_libraries(portable_kernels PRIVATE executorch_core kernels_util_all_deps)
51+
target_link_libraries(
52+
portable_kernels PRIVATE executorch_core kernels_util_all_deps
53+
)
5254
target_compile_options(portable_kernels PUBLIC ${_common_compile_options})
5355

5456
# Build a library for _portable_kernels__srcs
@@ -59,26 +61,35 @@ gen_operators_lib(
5961
LIB_NAME "portable_ops_lib" KERNEL_LIBS portable_kernels DEPS executorch_core
6062
)
6163

62-
# Portable kernels support optional parallelization (and, in the
63-
# future, perhaps other performance features). If support is present,
64-
# produce an optimized version.
64+
# Portable kernels support optional parallelization (and, in the future, perhaps
65+
# other performance features). If support is present, produce an optimized
66+
# version.
6567
if(EXECUTORCH_BUILD_PTHREADPOOL AND EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
6668
add_library(optimized_portable_kernels ${_portable_kernels__srcs})
6769
target_link_libraries(optimized_portable_kernels PRIVATE executorch_core)
6870
target_link_libraries(optimized_portable_kernels PUBLIC extension_threadpool)
69-
target_compile_options(optimized_portable_kernels PUBLIC ${_common_compile_options})
70-
target_include_directories(optimized_portable_kernels PRIVATE ${TORCH_INCLUDE_DIRS})
71-
target_compile_definitions(optimized_portable_kernels PRIVATE "ET_USE_PYTORCH_HEADERS=ET_HAS_EXCEPTIONS")
72-
gen_selected_ops(LIB_NAME "optimized_portable_ops_lib" OPS_SCHEMA_YAML "${_yaml}")
71+
target_compile_options(
72+
optimized_portable_kernels PUBLIC ${_common_compile_options}
73+
)
74+
target_include_directories(
75+
optimized_portable_kernels PRIVATE ${TORCH_INCLUDE_DIRS}
76+
)
77+
target_compile_definitions(
78+
optimized_portable_kernels
79+
PRIVATE "ET_USE_PYTORCH_HEADERS=ET_HAS_EXCEPTIONS"
80+
)
81+
gen_selected_ops(
82+
LIB_NAME "optimized_portable_ops_lib" OPS_SCHEMA_YAML "${_yaml}"
83+
)
7384
generate_bindings_for_kernels(
7485
LIB_NAME "optimized_portable_ops_lib" FUNCTIONS_YAML "${_yaml}"
7586
)
7687
gen_operators_lib(
77-
LIB_NAME "optimized_portable_ops_lib" KERNEL_LIBS optimized_portable_kernels DEPS executorch_core
88+
LIB_NAME "optimized_portable_ops_lib" KERNEL_LIBS
89+
optimized_portable_kernels DEPS executorch_core
7890
)
79-
install(
80-
TARGETS optimized_portable_kernels optimized_portable_ops_lib
81-
DESTINATION lib
91+
install(TARGETS optimized_portable_kernels optimized_portable_ops_lib
92+
DESTINATION lib
8293
)
8394
endif()
8495

kernels/portable/cpu/util/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ set(_common_compile_options -Wno-deprecated-declarations)
2525

2626
add_library(kernels_util_all_deps ${_kernels_util_all_deps__srcs})
2727
target_link_libraries(kernels_util_all_deps PRIVATE executorch_core)
28-
target_include_directories(kernels_util_all_deps PUBLIC ${_common_include_directories})
29-
target_compile_definitions(kernels_util_all_deps PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
28+
target_include_directories(
29+
kernels_util_all_deps PUBLIC ${_common_include_directories}
30+
)
31+
target_compile_definitions(
32+
kernels_util_all_deps PUBLIC C10_USING_CUSTOM_GENERATED_MACROS
33+
)
3034
target_compile_options(kernels_util_all_deps PUBLIC ${_common_compile_options})

0 commit comments

Comments
 (0)