make extension_module static

Author: jathu

docs/source/llm/getting-started.md

@@ -376,7 +376,7 @@ add_executable(nanogpt_runner main.cpp)
 target_link_libraries(
   nanogpt_runner
   PRIVATE executorch
-          extension_module_static # Provides the Module class
+          extension_module # Provides the Module class
           extension_tensor # Provides the TensorPtr class
           optimized_native_cpu_ops_lib # Provides baseline cross-platform
                                        # kernels
@@ -533,7 +533,7 @@ add_executable(nanogpt_runner main.cpp)
 target_link_libraries(
   nanogpt_runner
   PRIVATE executorch
-          extension_module_static # Provides the Module class
+          extension_module # Provides the Module class
           extension_tensor # Provides the TensorPtr class
           optimized_native_cpu_ops_lib # Provides baseline cross-platform
                                        # kernels
@@ -672,7 +672,7 @@ target_link_libraries(
     nanogpt_runner
     PRIVATE
     executorch
-    extension_module_static # Provides the Module class
+    extension_module # Provides the Module class
     optimized_native_cpu_ops_lib # Provides baseline cross-platform kernels
     xnnpack_backend) # Provides the XNNPACK CPU acceleration backend
 ```

examples/llm_manual/CMakeLists.txt

@@ -27,7 +27,7 @@ add_executable(nanogpt_runner main.cpp)
 target_link_libraries(
   nanogpt_runner
   PRIVATE executorch
-          extension_module_static # Provides the Module class
+          extension_module # Provides the Module class
           extension_tensor # Provides the TensorPtr class
           optimized_native_cpu_ops_lib # Provides baseline cross-platform
                                        # kernels

examples/models/phi-3-mini/CMakeLists.txt

@@ -49,6 +49,6 @@ target_include_directories(
          ${CMAKE_CURRENT_SOURCE_DIR}/../../../extension/llm/tokenizers/include
 )
 target_link_libraries(
-  phi_3_mini_runner PRIVATE executorch extension_module_static extension_tensor
+  phi_3_mini_runner PRIVATE executorch extension_module extension_tensor
                             optimized_native_cpu_ops_lib xnnpack_backend gflags
 )

extension/module/CMakeLists.txt

@@ -17,36 +17,16 @@ if(NOT EXECUTORCH_ROOT)
 endif()
 
 list(TRANSFORM _extension_module__srcs PREPEND "${EXECUTORCH_ROOT}/")
-if(CMAKE_TOOLCHAIN_IOS
-   OR CMAKE_TOOLCHAIN_ANDROID
-   OR APPLE
-)
-  # Building a share library on iOS requires code signing On Android we see
-  # duplicated registration when using shared lib
-  add_library(extension_module STATIC ${_extension_module__srcs})
-else()
-  add_library(extension_module SHARED ${_extension_module__srcs})
-endif()
+add_library(extension_module STATIC ${_extension_module__srcs})
 target_link_libraries(extension_module PRIVATE executorch extension_data_loader extension_flat_tensor)
 target_include_directories(extension_module PUBLIC ${EXECUTORCH_ROOT}/..)
 target_compile_options(
   extension_module PUBLIC -Wno-deprecated-declarations -fPIC
 )
 
-# Module extension built as a static library. TODO(gjcomer) Remove this target
-# after cleaning up CMake targets.
-add_library(extension_module_static STATIC ${_extension_module__srcs})
-target_link_libraries(
-  extension_module_static PRIVATE executorch extension_data_loader extension_flat_tensor
-)
-target_include_directories(extension_module_static PUBLIC ${EXECUTORCH_ROOT}/..)
-target_compile_options(
-  extension_module_static PUBLIC -Wno-deprecated-declarations -fPIC
-)
-
 # Install libraries
 install(
-  TARGETS extension_module extension_module_static
+  TARGETS extension_module
   DESTINATION lib
   INCLUDES
   DESTINATION ${_common_include_directories}

extension/module/test/CMakeLists.txt

@@ -25,7 +25,7 @@ et_cxx_test(
   ${_test_srcs}
   EXTRA_LIBS
   extension_data_loader
-  extension_module_static
+  extension_module
   extension_tensor
   portable_kernels
   portable_ops_lib

tools/cmake/executorch-config.cmake

@@ -76,7 +76,6 @@ set(lib_list
     portable_ops_lib
     custom_ops
     extension_module
-    extension_module_static
     extension_runner_util
     extension_tensor
     extension_threadpool