Gate training pybind build behind flag

Differential Revision: D75079436

Pull Request resolved: #11001

Author: JacobSzwejbka

CMakeLists.txt

@@ -362,6 +362,9 @@ add_library(executorch_core ${_executorch_core__srcs})
 add_library(executorch_no_prim_ops ALIAS executorch_core)
 
 target_link_libraries(executorch_core PRIVATE program_schema)
+if(ANDROID)
+  target_link_libraries(executorch_core PUBLIC log)
+endif()
 if(EXECUTORCH_USE_DL)
   # Check if dl exists for this toolchain and only then link it.
   find_library(DL_LIBRARY_EXISTS NAMES dl)
@@ -653,10 +656,6 @@ if(EXECUTORCH_BUILD_PYBIND)
   install(TARGETS portable_lib
           LIBRARY DESTINATION executorch/extension/pybindings
   )
-
-  if(EXECUTORCH_BUILD_EXTENSION_TRAINING)
-
-  endif()
 endif()
 
 if(EXECUTORCH_BUILD_EXTENSION_TRAINING)

extension/training/CMakeLists.txt

@@ -40,32 +40,34 @@ train_xor gflags executorch_core portable_ops_lib extension_tensor
 )
 target_compile_options(train_xor PUBLIC ${_common_compile_options})
 
-# Pybind library.
-set(_pybind_training_dep_libs
-  ${TORCH_PYTHON_LIBRARY}
-  etdump
-  executorch
-  util
-  torch
-  extension_training
-)
+if(EXECUTORCH_BUILD_PYBIND)
+  # Pybind library.
+  set(_pybind_training_dep_libs
+    ${TORCH_PYTHON_LIBRARY}
+    etdump
+    executorch
+    util
+    torch
+    extension_training
+  )
 
-if(EXECUTORCH_BUILD_XNNPACK)
-# need to explicitly specify XNNPACK and microkernels-prod
-# here otherwise uses XNNPACK and microkernel-prod symbols from libtorch_cpu
-list(APPEND _pybind_training_dep_libs xnnpack_backend XNNPACK microkernels-prod)
-endif()
+  if(EXECUTORCH_BUILD_XNNPACK)
+    # need to explicitly specify XNNPACK and microkernels-prod
+    # here otherwise uses XNNPACK and microkernel-prod symbols from libtorch_cpu
+    list(APPEND _pybind_training_dep_libs xnnpack_backend XNNPACK microkernels-prod)
+  endif()
 
-# pybind training
-pybind11_add_module(_training_lib SHARED ${CMAKE_CURRENT_SOURCE_DIR}/pybindings/_training_lib.cpp)
+  # pybind training
+  pybind11_add_module(_training_lib SHARED ${CMAKE_CURRENT_SOURCE_DIR}/pybindings/_training_lib.cpp)
 
-target_include_directories(_training_lib PRIVATE ${TORCH_INCLUDE_DIRS})
-target_compile_options(_training_lib PUBLIC -Wno-deprecated-declarations -fPIC -frtti -fexceptions)
-target_link_libraries(_training_lib PRIVATE ${_pybind_training_dep_libs})
+  target_include_directories(_training_lib PRIVATE ${TORCH_INCLUDE_DIRS})
+  target_compile_options(_training_lib PUBLIC -Wno-deprecated-declarations -fPIC -frtti -fexceptions)
+  target_link_libraries(_training_lib PRIVATE ${_pybind_training_dep_libs})
 
-install(TARGETS _training_lib
-    LIBRARY DESTINATION executorch/extension/training/pybindings
-)
+  install(TARGETS _training_lib
+      LIBRARY DESTINATION executorch/extension/training/pybindings
+  )
+endif()
 
 # Install libraries
 install(

scripts/build_android_library.sh

@@ -50,6 +50,7 @@ build_android_native_library() {
     -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
     -DEXECUTORCH_BUILD_EXTENSION_RUNNER_UTIL=ON \
     -DEXECUTORCH_BUILD_EXTENSION_TENSOR=ON \
+    -DEXECUTORCH_BUILD_EXTENSION_TRAINING=ON \
     -DEXECUTORCH_BUILD_KERNELS_OPTIMIZED=ON \
     -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \
     -DEXECUTORCH_BUILD_KERNELS_CUSTOM="${EXECUTORCH_BUILD_EXTENSION_LLM:-ON}" \