Let custom_ops_aot_lib depend on portable_lib

Author: larryliu0820

CMakeLists.txt

@@ -179,8 +179,6 @@ option(EXECUTORCH_BUILD_KERNELS_QUANTIZED "Build the quantized kernels" OFF)
 
 option(EXECUTORCH_BUILD_SDK "Build the ExecuTorch SDK")
 
-option(EXECUTORCH_BUILD_SHARED_LIB "Build libexecutorch as a shared lib" OFF)
-
 option(EXECUTORCH_BUILD_SIZE_TEST "Build the size test" OFF)
 
 option(EXECUTORCH_BUILD_XNNPACK "Build the XNNPACK backend" OFF)
@@ -205,7 +203,6 @@ cmake_dependent_option(
 
 if(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT)
   set(EXECUTORCH_BUILD_KERNELS_CUSTOM ON)
-  set(EXECUTORCH_BUILD_SHARED_LIB ON)
 endif()
 
 if(EXECUTORCH_BUILD_KERNELS_CUSTOM)
@@ -432,11 +429,7 @@ add_subdirectory(schema)
 # Only contains primitive operators; does not contain portable kernels or other
 # full operators. Does not contain any backends.
 #
-if(EXECUTORCH_BUILD_SHARED_LIB)
-  add_library(executorch_no_prim_ops SHARED ${_executorch_no_prim_ops__srcs})
-else()
-  add_library(executorch_no_prim_ops STATIC ${_executorch_no_prim_ops__srcs})
-endif()
+add_library(executorch_no_prim_ops ${_executorch_no_prim_ops__srcs})
 target_link_libraries(executorch_no_prim_ops PRIVATE program_schema)
 # Check if dl exists for this toolchain and only then link it.
 find_library(DL_LIBRARY_EXISTS NAMES dl)
@@ -470,13 +463,6 @@ target_link_options_shared_lib(executorch)
 #
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/kernels/portable)
 
-if(EXECUTORCH_BUILD_KERNELS_CUSTOM)
-  # TODO: move all custom kernels to ${CMAKE_CURRENT_SOURCE_DIR}/kernels/custom
-  add_subdirectory(
-    ${CMAKE_CURRENT_SOURCE_DIR}/examples/models/llama2/custom_ops
-  )
-endif()
-
 if(EXECUTORCH_BUILD_KERNELS_OPTIMIZED)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/kernels/optimized)
 endif()
@@ -592,8 +578,6 @@ if(EXECUTORCH_BUILD_COREML)
 endif()
 
 if(EXECUTORCH_BUILD_PYBIND)
-  set(EXECUTORCH_BUILD_SHARED_LIB ON)
-
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third-party/pybind11)
 
   if(NOT EXECUTORCH_BUILD_EXTENSION_DATA_LOADER)
@@ -664,7 +648,7 @@ if(EXECUTORCH_BUILD_PYBIND)
   target_link_libraries(util PRIVATE torch c10 executorch)
 
   # pybind portable_lib
-  pybind11_add_module(portable_lib extension/pybindings/pybindings.cpp)
+  pybind11_add_module(portable_lib SHARED extension/pybindings/pybindings.cpp)
   # The actual output file needs a leading underscore so it can coexist with
   # portable_lib.py in the same python package.
   set_target_properties(portable_lib PROPERTIES OUTPUT_NAME "_portable_lib")
@@ -673,7 +657,7 @@ if(EXECUTORCH_BUILD_PYBIND)
   )
   target_include_directories(portable_lib PRIVATE ${TORCH_INCLUDE_DIRS})
   target_compile_options(portable_lib PUBLIC ${_pybind_compile_options})
-  target_link_libraries(portable_lib PUBLIC ${_dep_libs})
+  target_link_libraries(portable_lib PRIVATE ${_dep_libs})
   if(APPLE)
     # pip wheels will need to be able to find the torch libraries. On Linux, the
     # .so has non-absolute dependencies on libs like "libtorch.so" without
@@ -699,5 +683,12 @@ if(EXECUTORCH_BUILD_PYBIND)
   )
 endif()
 
+if(EXECUTORCH_BUILD_KERNELS_CUSTOM)
+  # TODO: move all custom kernels to ${CMAKE_CURRENT_SOURCE_DIR}/kernels/custom
+  add_subdirectory(
+    ${CMAKE_CURRENT_SOURCE_DIR}/examples/models/llama2/custom_ops
+  )
+endif()
+
 # Print all summary
 executorch_print_configuration_summary()

examples/models/llama2/custom_ops/CMakeLists.txt

@@ -40,8 +40,7 @@ include(${EXECUTORCH_SRCS_FILE})
 set(_common_include_directories ${EXECUTORCH_ROOT}/..)
 
 # Custom op libraries
-set(custom_ops_libs executorch_no_prim_ops)
-list(APPEND custom_ops_libs pthreadpool)
+set(custom_ops_libs pthreadpool)
 list(APPEND custom_ops_libs cpuinfo)
 list(APPEND custom_ops_libs cpublas)
 list(APPEND custom_ops_libs eigen_blas)
@@ -67,19 +66,19 @@ target_include_directories(custom_ops PUBLIC "${_common_include_directories}")
 target_include_directories(
   custom_ops PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../../../../include"
 )
-target_link_libraries(custom_ops PUBLIC ${custom_ops_libs})
+target_link_libraries(custom_ops PUBLIC ${custom_ops_libs} executorch_no_prim_ops)
 
 target_compile_options(
   custom_ops PUBLIC ${_common_compile_options} -DET_USE_THREADPOOL
 )
 
 install(TARGETS custom_ops DESTINATION lib)
 
-if(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT)
+if(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT AND EXECUTORCH_BUILD_PYBIND)
   # Add a AOT library
   find_package(Torch CONFIG REQUIRED)
   add_library(
-    custom_ops_aot_lib SHARED ${CMAKE_CURRENT_SOURCE_DIR}/op_sdpa_aot.cpp
+    custom_ops_aot_lib SHARED ${_custom_ops__srcs} ${CMAKE_CURRENT_SOURCE_DIR}/op_sdpa_aot.cpp
   )
   target_include_directories(
     custom_ops_aot_lib PUBLIC "${_common_include_directories}"
@@ -88,10 +87,10 @@ if(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT)
     custom_ops_aot_lib
     PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../../../../include"
   )
-  target_link_libraries(custom_ops_aot_lib PUBLIC custom_ops torch)
+  target_link_libraries(custom_ops_aot_lib PUBLIC portable_lib cpublas torch)
   target_compile_options(
     custom_ops_aot_lib PUBLIC -Wno-deprecated-declarations -fPIC -frtti
-                              -fexceptions
+                              -fexceptions ${_common_compile_options} -DET_USE_THREADPOOL
   )
 
   install(TARGETS custom_ops_aot_lib DESTINATION lib)