Revert changes to executor_runner (#6687)

fix seg fault

Co-authored-by: lind <[email protected]>

Author: davidlin54

examples/portable/executor_runner/executor_runner.cpp

@@ -22,11 +22,7 @@
 
 #include <gflags/gflags.h>
 
-#include <fcntl.h>
-#include <unistd.h>
-
 #include <executorch/extension/data_loader/file_data_loader.h>
-#include <executorch/extension/data_loader/file_descriptor_data_loader.h>
 #include <executorch/extension/evalue_util/print_evalue.h>
 #include <executorch/extension/runner_util/inputs.h>
 #include <executorch/runtime/executor/method.h>
@@ -40,13 +36,8 @@ DEFINE_string(
     model_path,
     "model.pte",
     "Model serialized in flatbuffer format.");
-DEFINE_bool(
-    is_fd_uri,
-    false,
-    "True if the model_path passed is a file descriptor with the prefix \"fd:///\".");
 
 using executorch::extension::FileDataLoader;
-using executorch::extension::FileDescriptorDataLoader;
 using executorch::runtime::Error;
 using executorch::runtime::EValue;
 using executorch::runtime::HierarchicalAllocator;
@@ -58,33 +49,6 @@ using executorch::runtime::Program;
 using executorch::runtime::Result;
 using executorch::runtime::Span;
 
-static Result<Program> getProgram(
-    const bool is_fd_uri,
-    const char* model_path) {
-  // Create a loader to get the data of the program file. This demonstrates both
-  // FileDataLoader and FileDescriptorDataLoader. There are other DataLoaders
-  // that use mmap() or point to data that's already in memory, and users can
-  // create their own DataLoaders to load from arbitrary sources.
-  if (!is_fd_uri) {
-    Result<FileDataLoader> loader = FileDataLoader::from(model_path);
-
-    ET_CHECK_MSG(
-        loader.ok(),
-        "FileDataLoader::from() failed: 0x%" PRIx32,
-        (uint32_t)loader.error());
-    return Program::load(&loader.get());
-  } else {
-    Result<FileDescriptorDataLoader> loader =
-        FileDescriptorDataLoader::fromFileDescriptorUri(model_path);
-
-    ET_CHECK_MSG(
-        loader.ok(),
-        "FileDescriptorDataLoader::fromFileDescriptorUri() failed: 0x%" PRIx32,
-        (uint32_t)loader.error());
-    return Program::load(&loader.get());
-  }
-}
-
 int main(int argc, char** argv) {
   executorch::runtime::runtime_init();
 
@@ -102,11 +66,15 @@ int main(int argc, char** argv) {
   // DataLoaders that use mmap() or point to data that's already in memory, and
   // users can create their own DataLoaders to load from arbitrary sources.
   const char* model_path = FLAGS_model_path.c_str();
-  const bool is_fd_uri = FLAGS_is_fd_uri;
+  Result<FileDataLoader> loader = FileDataLoader::from(model_path);
+  ET_CHECK_MSG(
+      loader.ok(),
+      "FileDataLoader::from() failed: 0x%" PRIx32,
+      (uint32_t)loader.error());
 
   // Parse the program file. This is immutable, and can also be reused between
   // multiple execution invocations across multiple threads.
-  Result<Program> program = getProgram(is_fd_uri, model_path);
+  Result<Program> program = Program::load(&loader.get());
   if (!program.ok()) {
     ET_LOG(Error, "Failed to parse model file %s", model_path);
     return 1;

examples/portable/executor_runner/targets.bzl

@@ -15,7 +15,6 @@ def define_common_targets():
         deps = [
             "//executorch/runtime/executor:program",
             "//executorch/extension/data_loader:file_data_loader",
-            "//executorch/extension/data_loader:file_descriptor_data_loader",
             "//executorch/extension/evalue_util:print_evalue",
             "//executorch/extension/runner_util:inputs",
         ],