Still unable to get the right header for ops_dict selective build API

Author: BujSet

examples/selective_build/test_selective_build.sh

@@ -172,6 +172,7 @@ test_cmake_select_ops_in_dict() {
     retry cmake -DCMAKE_BUILD_TYPE=Release \
             -DMAX_KERNEL_NUM=22 \
             -DEXECUTORCH_SELECT_OPS_FROM_DICT='{\"aten::add\":[\"v1/3;0,1|3;0,1|3;0,1|3;0,1\"],\"aten::mul\":[],\"aten::bmm\":[\"Float\"]}' \
+            -DEXECUTORCH_DTYPE_SELECTIVE_BUILD=ON \
             -DCMAKE_INSTALL_PREFIX=cmake-out \
             -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
             -B${build_dir} \
@@ -188,7 +189,7 @@ test_cmake_select_ops_in_dict() {
 }
 
 test_cmake_select_ops_in_model() {
-    local model_name="add_mul"
+    local model_name="mv3"
     local model_export_name="${model_name}.pte"
     echo "Exporting ${model_name}"
     ${PYTHON_EXECUTABLE} -m examples.portable.scripts.export --model_name="${model_name}"
@@ -207,10 +208,8 @@ test_cmake_select_ops_in_model() {
     echo "Building ${example_dir}"
     cmake --build ${build_dir} -j9 --config $CMAKE_BUILD_TYPE
 
-    echo 'Running selective build test'
-    ${build_dir}/selective_build_test --model_path="./${model_export_name}"
-
-    echo "Removing ${model_export_name}"
+    strip ${build_dir}/selective_build_test
+    echo $(stat --format=%s ${build_dir}/selective_build_test)
     rm "./${model_export_name}"
 }
 
@@ -235,8 +234,8 @@ then
     #test_cmake_select_all_ops
     #test_cmake_select_ops_in_list
     #test_cmake_select_ops_in_yaml
-    #test_cmake_select_ops_in_model
-    test_cmake_select_ops_in_dict
+    test_cmake_select_ops_in_model
+    #test_cmake_select_ops_in_dict
 elif [[ $1 == "buck2" ]];
 then
     test_buck2_select_all_ops

kernels/portable/cpu/selective_build.h

@@ -11,9 +11,28 @@
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
 
 #ifdef EXECUTORCH_SELECTIVE_BUILD_DTYPE
+inline constexpr bool should_include_kernel_dtype(
+  const char *operator_name,
+  executorch::aten::ScalarType scalar_type
+) {
+  //return ((std::string_view(operator_name).compare("convolution.out") == 0)
+  return ((std::string_view(operator_name).compare("atan2.out") == 0)
+//        && (scalar_type == executorch::aten::ScalarType::Byte
+//		&& scalar_type == executorch::aten::ScalarType::Char
+//		|| scalar_type == executorch::aten::ScalarType::Short
+//		|| scalar_type == executorch::aten::ScalarType::Int
+//		|| scalar_type == executorch::aten::ScalarType::Long
+//		|| scalar_type == executorch::aten::ScalarType::Half
+//		|| scalar_type == executorch::aten::ScalarType::Float
+//		|| scalar_type == executorch::aten::ScalarType::Double
+//		)
+	);
+//        && (scalar_type == executorch::aten::ScalarType::Float));
+// || ((std::string_view(operator_name).compare("mm.out") == 0)
+//        && (scalar_type == executorch::aten::ScalarType::Float));
+}
 // include header generated by
 // executorch/codegen/tools/gen_selected_op_variants.py
-#include "selected_op_variants.h"
 #else
 // dummy implementation
 inline constexpr bool should_include_kernel_dtype(

tools/cmake/Codegen.cmake

@@ -26,11 +26,11 @@ function(gen_selected_ops)
 
   set(_out_dir ${CMAKE_CURRENT_BINARY_DIR}/${GEN_LIB_NAME})
 
-  if(GEN_DTYPE_SELECTIVE_BUILD)
-    if(NOT GEN_OPS_FROM_MODEL)
-      message(FATAL_ERROR "  DTYPE_SELECTIVE_BUILD is only support with model API, please pass in a model")
-    endif()
-  endif()
+  #if(GEN_DTYPE_SELECTIVE_BUILD)
+  #  if(NOT GEN_OPS_FROM_MODEL)
+  #    message(FATAL_ERROR "  DTYPE_SELECTIVE_BUILD is only support with model API, please pass in a model")
+  #  endif()
+  #endif()
 
   set(_oplist_yaml
     ${_out_dir}/selected_operators.yaml