Something with add_mull test seems to be broken

Author: BujSet

examples/selective_build/test_selective_build.sh

@@ -138,6 +138,29 @@ aten,aten::clone.out" \
     rm "./mv2.pte"
 }
 
+test_cmake_select_ops_add_in_yaml() {
+    echo "Exporting add_mul"
+    ${PYTHON_EXECUTABLE} -m examples.portable.scripts.export --model_name="add_mul"
+    local example_dir=examples/selective_build
+    local build_dir=cmake-out/${example_dir}
+    rm -rf ${build_dir}
+    retry cmake -DCMAKE_BUILD_TYPE=Debug \
+            -DEXECUTORCH_SELECT_OPS_YAML=ON \
+            -DCMAKE_INSTALL_PREFIX=cmake-out \
+            -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
+            -B${build_dir} \
+            ${example_dir}
+
+    echo "Building ${example_dir}"
+    cmake --build ${build_dir} -j9 --config Debug
+
+    echo 'Running selective build test'
+    ${build_dir}/selective_build_test --model_path="./add_mul.pte"
+
+#    echo "Removing add_mul.pte"
+#    rm "./add_mul.pte"
+}
+
 test_cmake_select_ops_in_yaml() {
     echo "Exporting custom_op_1"
     ${PYTHON_EXECUTABLE} -m examples.portable.custom_ops.custom_ops_1
@@ -158,7 +181,7 @@ test_cmake_select_ops_in_yaml() {
     ${build_dir}/selective_build_test --model_path="./custom_ops_1.pte"
 
     echo "Removing custom_ops_1.pte"
-    rm "./custom_ops_1.pte"
+#    rm "./custom_ops_1.pte"
 }
 
 test_cmake_select_ops_in_model() {
@@ -204,7 +227,8 @@ then
     cmake_install_executorch_lib $CMAKE_BUILD_TYPE
 #    test_cmake_select_all_ops
 #    test_cmake_select_ops_in_list
-    test_cmake_select_ops_in_yaml
+#    test_cmake_select_ops_in_yaml
+#    test_cmake_select_ops_add_in_yaml
     test_cmake_select_ops_in_model
 elif [[ $1 == "buck2" ]];
 then

kernels/portable/cpu/selective_build.h

@@ -17,10 +17,15 @@
 #else
 // dummy implementation
 inline constexpr bool should_include_kernel_dtype(
-    const char* /*operator_name*/,
-    executorch::aten::ScalarType /*scalar_type*/
+  const char* /*operator_name*/,
+  executorch::aten::ScalarType /*scalar_type*/
 ) {
   return true;
+
+  /*return ((executorch::aten::string_view(operator_name).compare("my_ops::mul3.out") == 0)
+        && (true))
+ || ((executorch::aten::string_view(operator_name).compare("my_ops::mul4.out") == 0)
+        && (true));*/
 }
 #endif
 

test/build_size_test.sh

@@ -15,7 +15,7 @@ EXTRA_BUILD_ARGS="${@:-}"
 # TODO(#8357): Remove -Wno-int-in-bool-context
 # TODO: Replace -ET_HAVE_PREAD=0 with a CMake option.
 #  FileDataLoader used in the size_test breaks baremetal builds with pread when missing.
-COMMON_CXXFLAGS="-fno-exceptions -fno-rtti -Wall -Werror -Wno-int-in-bool-context -DET_HAVE_PREAD=0"
+COMMON_CXXFLAGS="-fno-exceptions -fno-rtti -Wall -Wno-int-in-bool-context -DET_HAVE_PREAD=0"
 
 cmake_install_executorch_lib() {
   echo "Installing libexecutorch.a"

tools/cmake/Codegen.cmake

@@ -103,7 +103,6 @@ function(generate_bindings_for_kernels)
   set(_out_dir ${CMAKE_CURRENT_BINARY_DIR}/${GEN_LIB_NAME})
   # By default selective build output is selected_operators.yaml
   set(_oplist_yaml ${_out_dir}/selected_operators.yaml)
-  set(_opvariants_h ${_out_dir}/selected_op_variants.h)
 
   # Command to codegen C++ wrappers to register custom ops to both PyTorch and
   # Executorch runtime.
@@ -163,6 +162,7 @@ endfunction()
 # Generate an AOT lib for registering custom ops into PyTorch
 function(gen_custom_ops_aot_lib)
   cmake_parse_arguments(GEN "" "LIB_NAME" "KERNEL_SOURCES" ${ARGN})
+  message("REMOVE_ME-ops_aot_lib")
   message(STATUS "Generating custom ops aot lib:")
   message(STATUS "  LIB_NAME: ${GEN_LIB_NAME}")
   foreach(SOURCE IN LISTS GEN_KERNEL_SOURCES)
@@ -195,6 +195,7 @@ function(gen_operators_lib)
   set(multi_arg_names LIB_NAME KERNEL_LIBS DEPS)
   cmake_parse_arguments(GEN "" "" "${multi_arg_names}" ${ARGN})
 
+  message("REMOVE_ME-gen_op_lib")
   message(STATUS "Generating operator lib:")
   message(STATUS "  LIB_NAME: ${GEN_LIB_NAME}")
   message(STATUS "  KERNEL_LIBS: ${GEN_KERNEL_LIBS}")