Undoing git merge mistake

Author: BujSet

tools/cmake/Codegen.cmake

@@ -12,22 +12,14 @@
 include(${EXECUTORCH_ROOT}/tools/cmake/Utils.cmake)
 
 function(gen_selected_ops)
-<<<<<<< Updated upstream
   set(arg_names LIB_NAME OPS_SCHEMA_YAML ROOT_OPS INCLUDE_ALL_OPS)
-=======
-  set(arg_names LIB_NAME OPS_SCHEMA_YAML ROOT_OPS INCLUDE_ALL_OPS DTYPE_SELECTIVE_BUILD)
->>>>>>> Stashed changes
   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}")
-<<<<<<< Updated upstream
-=======
-  message(STATUS "  DTYPE_SELECTIVE_BUILD: ${GEN_DTYPE_SELECTIVE_BUILD}")
->>>>>>> Stashed changes
 
   set(_oplist_yaml
       ${CMAKE_CURRENT_BINARY_DIR}/${GEN_LIB_NAME}/selected_operators.yaml
@@ -61,26 +53,6 @@ function(gen_selected_ops)
     WORKING_DIRECTORY ${EXECUTORCH_ROOT}
   )
 
-<<<<<<< Updated upstream
-=======
-  if(GEN_DTYPE_SELECTIVE_BUILD)
-    set(_opvariant_h
-      ${CMAKE_CURRENT_BINARY_DIR}/${GEN_LIB_NAME}/selected_op_variants.h
-    )
-    set(_gen_opvariant_command "${PYTHON_EXECUTABLE}" -m codegen.tools.gen_selected_op_variants
-                          --yaml-file=${_oplist_yaml}
-                          --output-dir=${CMAKE_CURRENT_BINARY_DIR}/${GEN_LIB_NAME}/
-    )
-    message("Command - ${_gen_opvariant_command}")
-    add_custom_command(
-      COMMENT "Generating selected_op_variants.h for ${GEN_LIB_NAME}"
-      OUTPUT ${_opvariant_h}
-      COMMAND ${_gen_opvariant_command}
-      DEPENDS ${_optlist_yaml} ${_codegen_tools_srcs}
-      WORKING_DIRECTORY ${EXECUTORCH_ROOT}
-    )
-  endif()
->>>>>>> Stashed changes
 endfunction()
 
 # Codegen for registering kernels. Kernels are defined in functions_yaml and
@@ -90,22 +62,14 @@ endfunction()
 # functions_yaml CUSTOM_OPS_YAML custom_ops_yaml )
 function(generate_bindings_for_kernels)
   set(options ADD_EXCEPTION_BOUNDARY)
-<<<<<<< Updated upstream
   set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML)
-=======
-  set(arg_names LIB_NAME FUNCTIONS_YAML CUSTOM_OPS_YAML DTYPE_SELECTIVE_BUILD)
->>>>>>> Stashed changes
   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}")
-<<<<<<< Updated upstream
-=======
-  message(STATUS "  DTYPE_SELECTIVE_BUILD: ${GEN_DTYPE_SELECTIVE_BUILD}")
->>>>>>> Stashed changes
 
   # Command to generate selected_operators.yaml from custom_ops.yaml.
   file(GLOB_RECURSE _codegen_templates "${EXECUTORCH_ROOT}/codegen/templates/*")
@@ -114,16 +78,6 @@ function(generate_bindings_for_kernels)
   # By default selective build output is selected_operators.yaml
   set(_oplist_yaml ${_out_dir}/selected_operators.yaml)
 
-<<<<<<< Updated upstream
-=======
-  # 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()
-
->>>>>>> Stashed changes
   # Command to codegen C++ wrappers to register custom ops to both PyTorch and
   # Executorch runtime.
   execute_process(
@@ -154,13 +108,6 @@ function(generate_bindings_for_kernels)
       ${_out_dir}/Functions.h ${_out_dir}/NativeFunctions.h
   )
 
-<<<<<<< Updated upstream
-=======
-  if(GEN_DTYPE_SELECTIVE_BUILD)
-    list(APPEND _gen_command_sources ${_out_dir}/selected_op_variants.h)
-  endif()
-
->>>>>>> Stashed changes
   if(GEN_FUNCTIONS_YAML)
     list(APPEND _gen_command --functions-yaml-path=${GEN_FUNCTIONS_YAML})
   endif()
@@ -218,61 +165,29 @@ endfunction()
 
 # Generate a runtime lib for registering operators in Executorch
 function(gen_operators_lib)
-<<<<<<< Updated upstream
   set(multi_arg_names LIB_NAME KERNEL_LIBS DEPS)
-=======
-  set(multi_arg_names LIB_NAME KERNEL_LIBS DEPS DTYPE_SELECTIVE_BUILD)
->>>>>>> Stashed changes
   cmake_parse_arguments(GEN "" "" "${multi_arg_names}" ${ARGN})
 
   message(STATUS "Generating operator lib:")
   message(STATUS "  LIB_NAME: ${GEN_LIB_NAME}")
   message(STATUS "  KERNEL_LIBS: ${GEN_KERNEL_LIBS}")
   message(STATUS "  DEPS: ${GEN_DEPS}")
-<<<<<<< Updated upstream
-=======
-  message(STATUS "  DTYPE_SELECTIVE_BUILD: ${GEN_DTYPE_SELECTIVE_BUILD}")
->>>>>>> Stashed changes
 
   set(_out_dir ${CMAKE_CURRENT_BINARY_DIR}/${GEN_LIB_NAME})
 
   add_library(${GEN_LIB_NAME})
-<<<<<<< Updated upstream
   target_sources(
     ${GEN_LIB_NAME}
     PRIVATE ${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
             ${_out_dir}/Functions.h ${_out_dir}/NativeFunctions.h
   )
-=======
-  if(GEN_DTYPE_SELECTIVE_BUILD)
-    target_sources(
-      ${GEN_LIB_NAME}
-      PRIVATE ${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
-              ${_out_dir}/Functions.h ${_out_dir}/NativeFunctions.h
-              ${_out_dir}/selected_op_variants.h
-    )
-  else()
-    target_sources(
-      ${GEN_LIB_NAME}
-      PRIVATE ${_out_dir}/RegisterCodegenUnboxedKernelsEverything.cpp
-              ${_out_dir}/Functions.h ${_out_dir}/NativeFunctions.h
-    )
-  endif()
-
->>>>>>> Stashed changes
   target_link_libraries(${GEN_LIB_NAME} PRIVATE ${GEN_DEPS})
   if(GEN_KERNEL_LIBS)
     target_link_libraries(${GEN_LIB_NAME} PUBLIC ${GEN_KERNEL_LIBS})
   endif()
 
   target_link_options_shared_lib(${GEN_LIB_NAME})
   set(_generated_headers ${_out_dir}/Functions.h ${_out_dir}/NativeFunctions.h)
-<<<<<<< Updated upstream
-=======
-  if(GEN_DTYPE_SELECTIVE_BUILD)
-    list(APPEND _generated_headers ${_out_dir}/selected_op_variants.h)
-  endif()
->>>>>>> Stashed changes
   set_target_properties(
     ${GEN_LIB_NAME} PROPERTIES PUBLIC_HEADER "${_generated_headers}"
   )