Able to now persist the needed header file

BujSet · BujSet · commit 65dcb043f618 · 2025-06-17T09:34:00.000-07:00
diff --git a/examples/selective_build/CMakeLists.txt b/examples/selective_build/CMakeLists.txt
@@ -123,9 +123,14 @@ gen_selected_ops(
 )
 
 generate_bindings_for_kernels(
-  LIB_NAME "select_build_lib" FUNCTIONS_YAML
-  ${EXECUTORCH_ROOT}/kernels/portable/functions.yaml CUSTOM_OPS_YAML
+  LIB_NAME 
+  "select_build_lib" 
+  FUNCTIONS_YAML
+  ${EXECUTORCH_ROOT}/kernels/portable/functions.yaml 
+  CUSTOM_OPS_YAML
   "${_custom_ops_yaml}"
+  DTYPE_SELECTIVE_BUILD
+  "${EXECUTORCH_DTYPE_SELECTIVE_BUILD}"
 )
 
 gen_operators_lib(
diff --git a/examples/selective_build/test_selective_build.sh b/examples/selective_build/test_selective_build.sh
@@ -186,13 +186,15 @@ test_cmake_select_ops_in_yaml() {
 }
 
 test_cmake_select_ops_in_model() {
-    echo "Exporting MobilenetV2"
-    ${PYTHON_EXECUTABLE} -m examples.portable.scripts.export --model_name="mv2"
+    local model_name="add_mul"
+    local model_export_name="${model_name}.pte"
+    echo "Exporting ${model_name}"
+    ${PYTHON_EXECUTABLE} -m examples.portable.scripts.export --model_name="${model_name}"
     local example_dir=examples/selective_build
     local build_dir=cmake-out/${example_dir}
     rm -rf ${build_dir}
     retry cmake -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
-            -DEXECUTORCH_SELECT_OPS_FROM_MODEL="./mv2.pte" \
+            -DEXECUTORCH_SELECT_OPS_FROM_MODEL="./${model_export_name}" \
             -DEXECUTORCH_DTYPE_SELECTIVE_BUILD=ON \
             -DEXECUTORCH_OPTIMIZE_SIZE=ON \
             -DCMAKE_INSTALL_PREFIX=cmake-out \
@@ -204,10 +206,10 @@ test_cmake_select_ops_in_model() {
     cmake --build ${build_dir} -j9 --config $CMAKE_BUILD_TYPE
 
     echo 'Running selective build test'
-    ${build_dir}/selective_build_test --model_path="./mv2.pte"
+    ${build_dir}/selective_build_test --model_path="./${model_export_name}"
 
-#    echo "Removing mv2.pte"
-#    rm "./mv2.pte"
+    echo "Removing ${model_export_name}"
+    rm "./${model_export_name}"
 }
 
 if [[ -z $BUCK ]];
diff --git a/kernels/portable/cpu/selective_build.h b/kernels/portable/cpu/selective_build.h
@@ -16,48 +16,12 @@
 #include "selected_op_variants.h"
 #else
 // dummy implementation
-inline constexpr bool should_include_kernel_dtype(
-  const char *operator_name,
-  executorch::aten::ScalarType scalar_type
-) {
-//  return (((std::string_view(operator_name).compare("add.out") == 0))
-//        && (scalar_type == executorch::aten::ScalarType::Float));
-//  return ((executorch::aten::string_view(operator_name).compare("add.out") == 0)
-//        && (true))
-// || ((executorch::aten::string_view(operator_name).compare("mm.out") == 0)
-//        && (true));
-//}
-
-
-  return ((std::string_view(operator_name).compare("_native_batch_norm_legit_no_training.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float))
- || ((std::string_view(operator_name).compare("add.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float))
- || ((std::string_view(operator_name).compare("addmm.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float))
- || ((std::string_view(operator_name).compare("clone.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float))
- || ((std::string_view(operator_name).compare("convolution.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float))
- || ((std::string_view(operator_name).compare("hardtanh.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float))
- //|| ((std::string_view(operator_name).compare("hardtanh.out") == 0)
- //       && (scalar_type == executorch::aten::ScalarType::Double))
- || ((std::string_view(operator_name).compare("mean.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float))
- || ((std::string_view(operator_name).compare("mean_dim.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float))
- || ((std::string_view(operator_name).compare("permute_copy.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float));
-}
-/*
 inline constexpr bool should_include_kernel_dtype(
   const char* ,//operator_name,
   executorch::aten::ScalarType //scalar_type*
 ) {
   return true;
 }
-*/
 #endif
 
 namespace torch {
diff --git a/tools/cmake/Codegen.cmake b/tools/cmake/Codegen.cmake
@@ -71,11 +71,12 @@ function(gen_selected_ops)
                           --output-dir=${CMAKE_CURRENT_BINARY_DIR}/${GEN_LIB_NAME}/
     )
     message("Command - ${_gen_opvariant_command}")
+    message("OUTPUT - ${_opvariant_h}")
     add_custom_command(
-      COMMENT "Generating selected_op_variants.h for ${GEN_LIB_NAME}"
+      COMMENT "Generating ${_opvariant_h} for ${GEN_LIB_NAME}"
       OUTPUT ${_opvariant_h}
       COMMAND ${_gen_opvariant_command}
-      DEPENDS ${_oplist_yaml} ${_codegen_tools_srcs}
+      DEPENDS ${_oplist_yaml} ${GEN_OPS_SCHEMA_YAML} ${_codegen_tools_srcs}
       WORKING_DIRECTORY ${EXECUTORCH_ROOT}
     )
   endif()
@@ -88,14 +89,15 @@ endfunction()
 # functions_yaml CUSTOM_OPS_YAML custom_ops_yaml )
 function(generate_bindings_for_kernels)
   set(options ADD_EXCEPTION_BOUNDARY)
-  set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML)
+  set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML DTYPE_SELECTIVE_BUILD)
   cmake_parse_arguments(GEN "${options}" "${arg_names}" "" ${ARGN})
 
   message(STATUS "Generating kernel bindings:")
   message(STATUS "  LIB_NAME: ${GEN_LIB_NAME}")
   message(STATUS "  FUNCTIONS_YAML: ${GEN_FUNCTIONS_YAML}")
   message(STATUS "  CUSTOM_OPS_YAML: ${GEN_CUSTOM_OPS_YAML}")
   message(STATUS "  ADD_EXCEPTION_BOUNDARY: ${GEN_ADD_EXCEPTION_BOUNDARY}")
+  message(STATUS "  DTYPE_SELECTIVE_BUILD: ${GEN_DTYPE_SELECTIVE_BUILD}")
 
   # Command to generate selected_operators.yaml from custom_ops.yaml.
   file(GLOB_RECURSE _codegen_templates "${EXECUTORCH_ROOT}/codegen/templates/*")
@@ -104,6 +106,13 @@ function(generate_bindings_for_kernels)
   # By default selective build output is selected_operators.yaml
   set(_oplist_yaml ${_out_dir}/selected_operators.yaml)
 
+  # If dtype selective build is enable, force header file to be preserved
+  if(GEN_DTYPE_SELECTIVE_BUILD)
+    set(_opvariant_h ${_out_dir}/selected_op_variants.h)
+  else()
+    set(_opvariant_h "")
+  endif()
+
   # Command to codegen C++ wrappers to register custom ops to both PyTorch and
   # Executorch runtime.
   execute_process(
@@ -148,7 +157,7 @@ function(generate_bindings_for_kernels)
     COMMENT "Generating code for kernel registration"
     OUTPUT ${_gen_command_sources}
     COMMAND ${_gen_command}
-    DEPENDS ${_oplist_yaml} ${GEN_CUSTOM_OPS_YAML}
+    DEPENDS ${_oplist_yaml} ${_opvariant_h} ${GEN_CUSTOM_OPS_YAML}
             ${GEN_FUNCTIONS_YAML} ${_codegen_templates}
             ${_torchgen_srcs}
     WORKING_DIRECTORY ${EXECUTORCH_ROOT}
