Support for model API

Author: BujSet

examples/selective_build/CMakeLists.txt

@@ -62,6 +62,10 @@ option(EXECUTORCH_SELECT_ALL_OPS
        "Whether to register all ops defined in portable kernel library." OFF
 )
 
+# Option to enable dtype selective build
+option(EXECUTORCH_SELECT_OPS_FROM_MODEL "Enable op selection from pte during build." OFF
+)
+
 # Option to enable dtype selective build
 option(EXECUTORCH_DTYPE_SELECTIVE_BUILD "Enable dtype selection during build." OFF
 )
@@ -84,11 +88,8 @@ include(${EXECUTORCH_SRCS_FILE})
 #
 set(_kernel_lib)
 if(EXECUTORCH_SELECT_OPS_YAML)
-#  set(_custom_ops_yaml
-#      ${EXECUTORCH_ROOT}/examples/portable/custom_ops/custom_ops.yaml
-#  )
   set(_custom_ops_yaml
-      ${EXECUTORCH_ROOT}/mv2_schema.yaml
+      ${EXECUTORCH_ROOT}/examples/portable/custom_ops/custom_ops.yaml
   )
   set(kernel_sources
       ${EXECUTORCH_ROOT}/examples/portable/custom_ops/custom_ops_1_out.cpp
@@ -115,6 +116,8 @@ gen_selected_ops(
   "${EXECUTORCH_SELECT_OPS_LIST}"
   INCLUDE_ALL_OPS
   "${EXECUTORCH_SELECT_ALL_OPS}"
+  OPS_FROM_MODEL
+  "${EXECUTORCH_SELECT_OPS_FROM_MODEL}"
   DTYPE_SELECT
   "${EXECUTORCH_DTYPE_SELECTIVE_BUILD}"
 )

examples/selective_build/test_selective_build.sh

@@ -119,11 +119,8 @@ test_cmake_select_ops_in_list() {
     # set MAX_KERNEL_NUM=22: 19 primops, add, mul
     rm -rf ${build_dir}
     retry cmake -DCMAKE_BUILD_TYPE=Release \
-            -DMAX_KERNEL_NUM=22 \
-            -DEXECUTORCH_SELECT_OPS_LIST="aten::convolution.out,\
-aten::_native_batch_norm_legit_no_training.out,aten::hardtanh.out,aten::add.out,\
-aten::mean.out,aten::view_copy.out,aten::permute_copy.out,aten::addmm.out,\
-aten,aten::clone.out" \
+            -DEXECUTORCH_SELECT_OPS_FROM_MODEL="./mv2.pte" \
+            -DEXECUTORCH_OPTIMIZE_SIZE=ON \
             -DEXECUTORCH_DTYPE_SELECTIVE_BUILD=ON \
             -DCMAKE_INSTALL_PREFIX=cmake-out \
             -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
@@ -169,9 +166,9 @@ test_cmake_select_ops_and_dtype() {
     ${PYTHON_EXECUTABLE} -m examples.portable.scripts.export --model_name="mv2"
     local example_dir=examples/selective_build
     local build_dir=cmake-out/${example_dir}
-    rm -rf ${build_dir}
     retry cmake -DCMAKE_BUILD_TYPE=Release \
-            -DEXECUTORCH_SELECT_OPS_YAML=ON \
+            -DEXECUTORCH_SELECT_OPS_FROM_MODEL="./mv2.pte" \
+            -DEXECUTORCH_OPTIMIZE_SIZE=ON \
             -DEXECUTORCH_DTYPE_SELECTIVE_BUILD=ON \
             -DCMAKE_INSTALL_PREFIX=cmake-out \
             -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
@@ -182,7 +179,7 @@ test_cmake_select_ops_and_dtype() {
     cmake --build ${build_dir} -j9 --config Release
 
     echo 'Running selective build test'
-    ${build_dir}/selective_build_test --model_path="./mv2.pte" --ops_schema_yaml_target="./mv2_schema.yaml"
+    ${build_dir}/selective_build_test --model_path="./mv2.pte"
 
     echo "Removing mv2.pte"
     rm "./mv2.pte"
@@ -202,9 +199,9 @@ if [[ $1 == "cmake" ]];
 then
     cmake_install_executorch_lib
 #    test_cmake_select_all_ops
-#    test_cmake_select_ops_in_list
+    test_cmake_select_ops_in_list
 #    test_cmake_select_ops_in_yaml
-    test_cmake_select_ops_and_dtype
+#    test_cmake_select_ops_and_dtype
 elif [[ $1 == "buck2" ]];
 then
     test_buck2_select_all_ops

test/build_size_test.sh

@@ -29,6 +29,7 @@ cmake_install_executorch_lib() {
           -DCMAKE_BUILD_TYPE=Release \
           -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=OFF \
           -DEXECUTORCH_OPTIMIZE_SIZE=ON \
+          -DEXECUTORCH_SELECTIVE_BUILD_DTYPE=ON \
           -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
           ${EXTRA_BUILD_ARGS} \
           -Bcmake-out .
@@ -44,11 +45,9 @@ test_cmake_size_test() {
     echo "Build size test"
     cmake --build cmake-out/test -j9 --config Release
 
-    echo 'ExecuTorch with no ops binary size, unstripped:'
-    ls -al cmake-out/test/size_test
-
-    echo 'ExecuTorch with portable ops binary size, unstripped:'
-    ls -al cmake-out/test/size_test_all_ops
+    strip cmake-out/test/size_test
+    strip cmake-out/test/size_test_all_ops
+    ls -lah cmake-out/test/
 }
 
 if [[ -z $PYTHON_EXECUTABLE ]]; then

tools/cmake/Codegen.cmake

@@ -12,14 +12,15 @@
 include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
 
 function(gen_selected_ops)
-  set(arg_names LIB_NAME OPS_SCHEMA_YAML ROOT_OPS INCLUDE_ALL_OPS DTYPE_SELECT)
+  set(arg_names LIB_NAME OPS_SCHEMA_YAML ROOT_OPS INCLUDE_ALL_OPS OPS_FROM_MODEL DTYPE_SELECT)
   cmake_parse_arguments(GEN "" "" "${arg_names}" ${ARGN})
 
   message(STATUS "Generating operator lib:")
   message(STATUS "  LIB_NAME: ${GEN_LIB_NAME}")
   message(STATUS "  OPS_SCHEMA_YAML: ${GEN_OPS_SCHEMA_YAML}")
   message(STATUS "  ROOT_OPS: ${GEN_ROOT_OPS}")
   message(STATUS "  INCLUDE_ALL_OPS: ${GEN_INCLUDE_ALL_OPS}")
+  message(STATUS "  OPS_FROM_MODEL: ${GEN_OPS_FROM_MODEL}")
   message(STATUS "  DTYPE_SELECT: ${GEN_DTYPE_SELECT}")
 
   set(_oplist_yaml
@@ -45,6 +46,9 @@ function(gen_selected_ops)
   if(GEN_INCLUDE_ALL_OPS)
     list(APPEND _gen_oplist_command --include_all_operators)
   endif()
+  if(GEN_OPS_FROM_MODEL)
+    list(APPEND _gen_oplist_command --model_file_path="${GEN_OPS_FROM_MODEL}")
+  endif()
 
   message("Command - ${_gen_oplist_command}")
   add_custom_command(