Skip to content

Commit d3eacd7

Browse files
kirklandsignkirklandsign
committed
Let's see
1 parent 94c4b6e commit d3eacd7

File tree

31 files changed

+78
-71
lines changed

31 files changed

+78
-71
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,6 @@ target_include_directories(prim_ops_lib PUBLIC ${_common_include_directories})
616616
target_compile_definitions(prim_ops_lib PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
617617
target_compile_options(prim_ops_lib PUBLIC ${_common_compile_options})
618618
target_link_options_shared_lib(prim_ops_lib)
619-
add_library(executorch ALIAS prim_ops_lib)
620619

621620
#
622621
# portable_ops_lib: A library to register core ATen ops using portable kernels,
@@ -785,8 +784,9 @@ if(EXECUTORCH_BUILD_PYBIND)
785784
${TORCH_PYTHON_LIBRARY}
786785
bundled_program
787786
etdump
788-
executorch
787+
executorch_core
789788
extension_data_loader
789+
prim_ops_lib
790790
util
791791
torch
792792
)
@@ -838,7 +838,7 @@ if(EXECUTORCH_BUILD_PYBIND)
838838
target_compile_definitions(util PUBLIC C10_USING_CUSTOM_GENERATED_MACROS)
839839

840840
target_compile_options(util PUBLIC ${_pybind_compile_options})
841-
target_link_libraries(util PRIVATE torch c10 executorch extension_tensor)
841+
target_link_libraries(util PRIVATE torch c10 executorch_core extension_tensor)
842842

843843
# pybind portable_lib
844844
pybind11_add_module(portable_lib SHARED extension/pybindings/pybindings.cpp)

‎backends/cadence/CMakeLists.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ if(EXECUTORCH_CADENCE_CPU_RUNNER)
3939
# Find prebuilt libraries. executorch package should contain portable_ops_lib,
4040
# etdump, bundled_program.
4141
find_package(executorch CONFIG REQUIRED)
42-
target_link_options_shared_lib(executorch)
42+
target_link_options_shared_lib(prim_ops_lib)
4343
target_link_options_shared_lib(portable_ops_lib)
4444

45-
target_include_directories(executorch INTERFACE ${_common_include_directories})
45+
target_include_directories(executorch_core INTERFACE ${_common_include_directories})
4646

4747
find_package(
4848
gflags REQUIRED PATHS ${CMAKE_CURRENT_BINARY_DIR}/../../third-party
@@ -51,7 +51,7 @@ if(EXECUTORCH_CADENCE_CPU_RUNNER)
5151
add_executable(cadence_runner
5252
${EXECUTORCH_ROOT}/examples/devtools/example_runner/example_runner.cpp
5353
)
54-
target_compile_options(executorch INTERFACE -DET_EVENT_TRACER_ENABLED)
54+
target_compile_options(executorch_core INTERFACE -DET_EVENT_TRACER_ENABLED)
5555

5656
target_include_directories(
5757
etdump INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/../../devtools/include
@@ -65,7 +65,8 @@ if(EXECUTORCH_CADENCE_CPU_RUNNER)
6565

6666
target_link_libraries(
6767
cadence_runner
68-
executorch
68+
executorch_core
69+
prim_ops_lib
6970
gflags
7071
etdump
7172
extension_data_loader

‎backends/cadence/fusion_g3/operators/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ set(_aten_ops__srcs
6969
"${EXECUTORCH_ROOT}/kernels/portable/cpu/pattern/unary_ufunc_realhbbf16_to_floathbf16.cpp"
7070
)
7171
add_library(aten_ops_cadence ${_aten_ops__srcs})
72-
target_link_libraries(aten_ops_cadence PUBLIC executorch)
72+
target_link_libraries(aten_ops_cadence PUBLIC executorch_core)
7373
target_link_libraries(aten_ops_cadence PRIVATE xa_nnlib)
7474

7575
# Let files say "include <executorch/path/to/header.h>".

‎backends/cadence/hifi/operators/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ set(_aten_ops__srcs
6565
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/delinearize_index.cpp"
6666
)
6767
add_library(aten_ops_cadence ${_aten_ops__srcs})
68-
target_link_libraries(aten_ops_cadence PUBLIC executorch)
68+
target_link_libraries(aten_ops_cadence PUBLIC executorch_core)
6969
target_link_libraries(aten_ops_cadence PRIVATE cadence_kernels)
7070

7171
# Let files say "include <executorch/path/to/header.h>".
@@ -88,7 +88,7 @@ target_include_directories(
8888
${_common_include_directories}
8989
)
9090

91-
target_link_libraries(custom_ops PUBLIC executorch)
91+
target_link_libraries(custom_ops PUBLIC executorch_core)
9292
target_link_libraries(custom_ops PRIVATE cadence_kernels)
9393

9494
# Generate C++ bindings to register kernels into both PyTorch (for AOT) and

‎backends/cadence/reference/operators/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ set(_aten_ops__srcs
6767
"${EXECUTORCH_ROOT}/kernels/portable/cpu/util/select_copy_util.cpp"
6868
)
6969
add_library(aten_ops_cadence ${_aten_ops__srcs})
70-
target_link_libraries(aten_ops_cadence PUBLIC executorch)
70+
target_link_libraries(aten_ops_cadence PUBLIC executorch_core)
7171
target_link_libraries(aten_ops_cadence PRIVATE cadence_kernels)
7272

7373
# Let files say "include <executorch/path/to/header.h>".
@@ -98,7 +98,7 @@ target_include_directories(
9898
${_common_include_directories}
9999
)
100100

101-
target_link_libraries(custom_ops PUBLIC executorch)
101+
target_link_libraries(custom_ops PUBLIC executorch_core)
102102
target_link_libraries(custom_ops PRIVATE cadence_kernels)
103103

104104
# Generate C++ bindings to register kernels into both PyTorch (for AOT) and

‎backends/openvino/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ target_link_options_shared_lib(openvino_backend)
5050

5151
if(EXECUTORCH_BUILD_OPENVINO_EXECUTOR_RUNNER)
5252
# Build executor runner binary for openvino backend
53-
list(APPEND openvino_executor_runner_libs openvino_backend executorch)
54-
53+
list(APPEND openvino_executor_runner_libs openvino_backend executorch_core prim_ops_lib)
54+
5555
set(_openvino_executor_runner__srcs
5656
${EXECUTORCH_ROOT}/examples/portable/executor_runner/executor_runner.cpp
5757
${EXECUTORCH_ROOT}/extension/data_loader/file_data_loader.cpp
@@ -60,9 +60,9 @@ if(EXECUTORCH_BUILD_OPENVINO_EXECUTOR_RUNNER)
6060
${EXECUTORCH_ROOT}/extension/runner_util/inputs_portable.cpp
6161
)
6262
add_executable(openvino_executor_runner ${_openvino_executor_runner__srcs})
63-
63+
6464
list(APPEND openvino_executor_runner_libs)
65-
65+
6666
target_link_libraries(
6767
openvino_executor_runner gflags portable_ops_lib ${openvino_executor_runner_libs}
6868
)

‎backends/qualcomm/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
242242
qnn_schema
243243
qnn_manager
244244
qnn_executorch_header
245-
executorch
245+
executorch_core
246+
prim_ops_lib
246247
qcir_utils
247248
extension_tensor
248249
)

‎backends/vulkan/test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ if(TARGET vulkan_backend)
8282
)
8383
target_include_directories(vulkan_compute_api_test PRIVATE ${COMMON_INCLUDES})
8484
target_link_libraries(
85-
vulkan_compute_api_test PRIVATE GTest::gtest_main vulkan_backend executorch
85+
vulkan_compute_api_test PRIVATE GTest::gtest_main vulkan_backend executorch_core
8686
test_shaderlib
8787
)
8888
target_compile_options(vulkan_compute_api_test PRIVATE ${VULKAN_CXX_FLAGS})

‎backends/vulkan/test/op_tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ function(vulkan_op_test test_name test_src)
8181
${test_name}
8282
PRIVATE GTest::gtest_main
8383
vulkan_backend
84-
executorch
84+
executorch_core
8585
${LIB_TORCH}
8686
${LIB_TORCH_CPU}
8787
${LIB_C10}

‎backends/xnnpack/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ if(EXECUTORCH_BUILD_KERNELS_QUANTIZED)
150150
list(APPEND xnn_executor_runner_libs quantized_ops_lib)
151151
endif()
152152

153-
list(APPEND xnn_executor_runner_libs xnnpack_backend executorch)
153+
list(APPEND xnn_executor_runner_libs xnnpack_backend executorch_core prim_ops_lib)
154154

155155
# ios can only build library but not binary
156156
if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*(iOS|ios\.toolchain)\.cmake$")

0 commit comments

Comments
 (0)