Still testing

Author: BujSet

examples/selective_build/test_selective_build.sh

@@ -143,13 +143,14 @@ test_cmake_select_ops_add_in_list() {
     ${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}
+#    rm -rf ${build_dir}
     retry cmake -DCMAKE_BUILD_TYPE=Debug \
 	    -DEXECUTORCH_SELECT_OPS_LIST="aten::add.out,aten::mm.out" \
-            -DCMAKE_INSTALL_PREFIX=cmake-out \
-            -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
-            -B${build_dir} \
-            ${example_dir}
+        #-DEXECUTORCH_SELECTIVE_BUILD_DTYPE=True \
+        -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
@@ -228,7 +229,7 @@ then
 #    test_cmake_select_all_ops
 #    test_cmake_select_ops_in_list
 #    test_cmake_select_ops_in_yaml
-#    test_cmake_select_ops_add_in_yaml
+#    test_cmake_select_ops_add_in_list
     test_cmake_select_ops_in_model
 elif [[ $1 == "buck2" ]];
 then

kernels/portable/cpu/selective_build.h

@@ -21,9 +21,9 @@ inline constexpr bool should_include_kernel_dtype(
   executorch::aten::ScalarType scalar_type
 ) {
   return ((executorch::aten::string_view(operator_name).compare("add.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float || scalar_type == executorch::aten::ScalarType::Int))
- || ((executorch::aten::string_view(operator_name).compare("mul.out") == 0)
-        && (scalar_type == executorch::aten::ScalarType::Float));
+        && (scalar_type == executorch::aten::ScalarType::Float || scalar_type == executorch::aten::ScalarType::Int));
+// || ((executorch::aten::string_view(operator_name).compare("mul.out") == 0)
+//        && (scalar_type == executorch::aten::ScalarType::Float));
 // || ((executorch::aten::string_view(operator_name).compare("sub.out") == 0)
 //        && (true));
 }

tools/cmake/Codegen.cmake

@@ -103,6 +103,7 @@ 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.