Fix et runner (#388)

Summary:
Removed patch fixes that got in due to merge conflicts

Test Plan:
CI + local repro

Reviewers:

Subscribers:

Tasks:

Tags:

runner-et/CMakeLists.txt

@@ -64,12 +64,12 @@ target_link_options_shared_lib(cpuinfo)
 if(ANDROID OR APPLE)
   target_link_options_shared_lib(executorch)
 endif()
-target_link_libraries(runner_et PRIVATE
+target_link_libraries(run PRIVATE
 "$<LINK_LIBRARY:WHOLE_ARCHIVE,${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/src/executorch/${CMAKE_OUT_DIR}/examples/models/llama2/custom_ops/libcustom_ops.a>")
 
 # This one is needed for cpuinfo where it uses android specific log lib
 if(ANDROID)
-  target_link_libraries(runner_et PRIVATE log)
+  target_link_libraries(run PRIVATE log)
 endif()
 
 # Adding target_link_options_shared_lib as commented out below leads to this:

scripts/install_utils.sh

@@ -36,9 +36,6 @@ clone_executorch() {
   git submodule sync
   git submodule update --init
 
-  echo "Applying fixes"
-  cp ${TORCHCHAT_ROOT}/scripts/fixes_et/module.cpp ${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/src/executorch/extension/module/module.cpp # ET uses non-standard C++ that does not compile in GCC
-  cp ${TORCHCHAT_ROOT}/scripts/fixes_et/managed_tensor.h ${TORCHCHAT_ROOT}/${ET_BUILD_DIR}/src/executorch/extension/runner_util/managed_tensor.h # ET is missing headers for vector/memory.  This causes downstream issues when building runner-et.
   popd
 }