executor::util -> executor::bundled_program for bp runtime api (#1056)

Summary:
Pull Request resolved: #1056

as title.

Reviewed By: tarun292

Differential Revision: D50511103

fbshipit-source-id: 235b2ff109576d3d9eddbbc2679d2797cfeb3054

Author: Gasoonjia

docs/source/sdk-bundled-io.md

@@ -213,7 +213,7 @@ We need the pointer to ExecuTorch program to do the execution. To unify the proc
 :::{dropdown} `GetProgramData`
 
 ```{eval-rst}
-.. doxygenfunction:: torch::executor::util::GetProgramData
+.. doxygenfunction:: torch::executor::bundled_program::GetProgramData
 ```
 :::
 
@@ -232,7 +232,7 @@ ET_CHECK_MSG(
 
 const void* program_ptr;
 size_t program_len;
-status = torch::executor::util::GetProgramData(
+status = torch::executor::bundled_program::GetProgramData(
     buff_ptr.get(), buff_len, &program_ptr, &program_len);
 ET_CHECK_MSG(
     status == Error::Ok,
@@ -241,22 +241,22 @@ ET_CHECK_MSG(
 ```
 
 ### Load Bundled Input to Method
-To execute the program on the bundled input, we need to load the bundled input into the method. Here we provided an API called `torch::executor::util::LoadBundledInput`:
+To execute the program on the bundled input, we need to load the bundled input into the method. Here we provided an API called `torch::executor::bundled_program::LoadBundledInput`:
 
 :::{dropdown} `LoadBundledInput`
 
 ```{eval-rst}
-.. doxygenfunction:: torch::executor::util::LoadBundledInput
+.. doxygenfunction:: torch::executor::bundled_program::LoadBundledInput
 ```
 :::
 
 ### Verify the Method's Output.
-We call `torch::executor::util::VerifyResultWithBundledExpectedOutput` to verify the method's output with bundled expected outputs. Here's the details of this API:
+We call `torch::executor::bundled_program::VerifyResultWithBundledExpectedOutput` to verify the method's output with bundled expected outputs. Here's the details of this API:
 
 :::{dropdown} `VerifyResultWithBundledExpectedOutput`
 
 ```{eval-rst}
-.. doxygenfunction:: torch::executor::util::VerifyResultWithBundledExpectedOutput
+.. doxygenfunction:: torch::executor::bundled_program::VerifyResultWithBundledExpectedOutput
 ```
 :::
 
@@ -277,7 +277,7 @@ ET_CHECK_MSG(
     method.error());
 
 // Load testset_idx-th input in the buffer to plan
-status = torch::executor::util::LoadBundledInput(
+status = torch::executor::bundled_program::LoadBundledInput(
         *method,
         program_data.bundled_program_data(),
         &bundled_input_allocator,
@@ -296,7 +296,7 @@ ET_CHECK_MSG(
     status);
 
 // Verify the result.
-status = torch::executor::util::VerifyResultWithBundledExpectedOutput(
+status = torch::executor::bundled_program::VerifyResultWithBundledExpectedOutput(
         *method,
         program_data.bundled_program_data(),
         &bundled_input_allocator,

docs/website/docs/tutorials/bundled_program.md

@@ -64,7 +64,7 @@ Here's an example of how to use the GetProgramData API:
 
   const void* program_ptr;
   size_t program_len;
-  status = torch::executor::util::GetProgramData(
+  status = torch::executor::bundled_program::GetProgramData(
       buff_ptr.get(), buff_len, &program_ptr, &program_len);
   ET_CHECK_MSG(
       status == Error::Ok,
@@ -73,7 +73,7 @@ Here's an example of how to use the GetProgramData API:
 ```
 
 ### Load bundled input to ExecutionPlan
-To execute the program on the bundled input, we need to load the bundled input into the ExecutionPlan. Here we provided an API called `torch::executor::util::LoadBundledInput`:
+To execute the program on the bundled input, we need to load the bundled input into the ExecutionPlan. Here we provided an API called `torch::executor::bundled_program::LoadBundledInput`:
 
 ```c++
 
@@ -98,7 +98,7 @@ __ET_NODISCARD Error LoadBundledInput(
 ```
 
 ### Verify the plan's output.
-We call `torch::executor::util::VerifyResultWithBundledExpectedOutput` to verify the method's output with bundled expected outputs. Here's the details of this API:
+We call `torch::executor::bundled_program::VerifyResultWithBundledExpectedOutput` to verify the method's output with bundled expected outputs. Here's the details of this API:
 
 ```c++
 /**
@@ -142,7 +142,7 @@ Here we provide an example about how to run the bundled program step by step. Mo
         method.error());
 
     // Load testset_idx-th input in the buffer to plan
-    status = torch::executor::util::LoadBundledInput(
+    status = torch::executor::bundled_program::LoadBundledInput(
           *method,
           program_data.bundled_program_data(),
           &bundled_input_allocator,
@@ -161,7 +161,7 @@ Here we provide an example about how to run the bundled program step by step. Mo
         status);
 
     // Verify the result.
-    status = torch::executor::util::VerifyResultWithBundledExpectedOutput(
+    status = torch::executor::bundled_program::VerifyResultWithBundledExpectedOutput(
           *method,
           program_data.bundled_program_data(),
           &bundled_input_allocator,

examples/apple/mps/executor_runner/mps_executor_runner.mm

@@ -122,7 +122,7 @@ static ProgramData load_or_die(std::string& filename) {
     // Find the offset to the embedded Program.
     const void* program_data;
     size_t program_data_len;
-    Error status = torch::executor::util::GetProgramData(
+    Error status = torch::executor::bundled_program::GetProgramData(
         const_cast<void*>(file_data->data()),
         file_data->size(),
         &program_data,
@@ -262,7 +262,7 @@ int main(int argc, char** argv) {
   // Find the offset to the embedded Program.
   const void* program_data;
   size_t program_data_len;
-  Error status = torch::executor::util::GetProgramData(
+  Error status = torch::executor::bundled_program::GetProgramData(
       const_cast<void*>(file_data->data()),
       file_data->size(),
       &program_data,
@@ -403,7 +403,7 @@ MemoryManager memory_manager(
   if (FLAGS_bundled_program) {
     ET_LOG(Info, "Loading bundled program...\n");
     // Use the inputs embedded in the bundled program.
-    status = torch::executor::util::LoadBundledInput(
+    status = torch::executor::bundled_program::LoadBundledInput(
         *method,
         file_data->data(),
         &bundled_input_allocator,
@@ -486,7 +486,7 @@ MemoryManager memory_manager(
         strstr(model_path, "ic4")) {
         atol = 1e-04;
     }
-    status = torch::executor::util::VerifyResultWithBundledExpectedOutput(
+    status = torch::executor::bundled_program::VerifyResultWithBundledExpectedOutput(
         *method,
         file_data->data(),
         &bundled_input_allocator,

examples/sdk/sdk_example_runner/sdk_example_runner.cpp

@@ -96,7 +96,7 @@ int main(int argc, char** argv) {
   // Find the offset to the embedded Program.
   const void* program_data;
   size_t program_data_len;
-  Error status = torch::executor::util::GetProgramData(
+  Error status = torch::executor::bundled_program::GetProgramData(
       const_cast<void*>(file_data->data()),
       file_data->size(),
       &program_data,
@@ -205,7 +205,7 @@ int main(int argc, char** argv) {
       MemoryAllocator(kBundledAllocatorPoolSize, bundled_allocator_pool)};
   exec_aten::ArrayRef<void*> inputs;
   // Use the inputs embedded in the bundled program.
-  status = torch::executor::util::LoadBundledInput(
+  status = torch::executor::bundled_program::LoadBundledInput(
       *method,
       file_data->data(),
       &bundled_input_allocator,
@@ -256,15 +256,16 @@ int main(int argc, char** argv) {
 
   if (FLAGS_output_verification) {
     // Verify the outputs.
-    status = torch::executor::util::VerifyResultWithBundledExpectedOutput(
-        *method,
-        file_data->data(),
-        &bundled_input_allocator,
-        method_name,
-        FLAGS_testset_idx,
-        1e-3, // rtol
-        1e-5 // atol
-    );
+    status =
+        torch::executor::bundled_program::VerifyResultWithBundledExpectedOutput(
+            *method,
+            file_data->data(),
+            &bundled_input_allocator,
+            method_name,
+            FLAGS_testset_idx,
+            1e-3, // rtol
+            1e-5 // atol
+        );
     ET_CHECK_MSG(
         status == Error::Ok,
         "Bundle verification failed with status 0x%" PRIx32,

extension/pybindings/pybindings.cpp

@@ -466,7 +466,7 @@ struct PyModule final {
       const string method_name,
       size_t testset_idx) {
     const void* bundled_program_ptr = m.get_bundled_program_ptr();
-    Error status = util::LoadBundledInput(
+    Error status = bundled_program::LoadBundledInput(
         module_->get_method(method_name),
         bundled_program_ptr,
         &m.get_bundled_input_allocator(),
@@ -483,7 +483,7 @@ struct PyModule final {
       const string method_name,
       size_t testset_idx) {
     const void* bundled_program_ptr = m.get_bundled_program_ptr();
-    Error status = util::VerifyResultWithBundledExpectedOutput(
+    Error status = bundled_program::VerifyResultWithBundledExpectedOutput(
         module_->get_method(method_name),
         bundled_program_ptr,
         &m.get_bundled_input_allocator(),

sdk/bundled_program/runtime.cpp

@@ -24,7 +24,7 @@
 
 namespace torch {
 namespace executor {
-namespace util {
+namespace bundled_program {
 
 namespace {
 
@@ -365,6 +365,6 @@ bool IsBundledProgram(void* file_data) {
       file_data);
 }
 
-} // namespace util
+} // namespace bundled_program
 } // namespace executor
 } // namespace torch

sdk/bundled_program/runtime.h

@@ -13,7 +13,7 @@
 
 namespace torch {
 namespace executor {
-namespace util {
+namespace bundled_program {
 
 /**
  * An opaque pointer to a serialized bundled program.
@@ -94,6 +94,6 @@ __ET_NODISCARD Error GetProgramData(
  */
 bool IsBundledProgram(void* file_data);
 
-} // namespace util
+} // namespace bundled_program
 } // namespace executor
 } // namespace torch