Program::Load -> Program::load for all of //executorch (#385)

dbort · facebook-github-bot · commit 4ee204f10a28 · 2023-09-18T11:20:47.000-07:00
Summary: Pull Request resolved: #385 Use the new name throughout the tree. ghstack-source-id: 200971698 exported-using-ghexport Reviewed By: cccclai Differential Revision: D49345073 fbshipit-source-id: 63ec0afcfaf932f6af0d76af1ed7824ddf98fa44
diff --git a/examples/bundled_executor_runner/bundled_executor_runner.cpp b/examples/bundled_executor_runner/bundled_executor_runner.cpp
@@ -107,7 +107,7 @@ int main(int argc, char** argv) {
 
   // Parse the program file. This is immutable, and can also be reused
   // between multiple execution invocations across multiple threads.
-  Result<Program> program = Program::Load(&buffer_data_loader);
+  Result<Program> program = Program::load(&buffer_data_loader);
   if (!program.ok()) {
     ET_LOG(Error, "Failed to parse model file %s", model_path);
     return 1;
diff --git a/examples/executor_runner/executor_runner.cpp b/examples/executor_runner/executor_runner.cpp
@@ -67,7 +67,7 @@ int main(int argc, char** argv) {
 
   // Parse the program file. This is immutable, and can also be reused between
   // multiple execution invocations across multiple threads.
-  Result<Program> program = Program::Load(&loader.get());
+  Result<Program> program = Program::load(&loader.get());
   if (!program.ok()) {
     ET_LOG(Error, "Failed to parse model file %s", model_path);
     return 1;
diff --git a/exir/backend/test/demos/rpc/ExecutorBackend.cpp b/exir/backend/test/demos/rpc/ExecutorBackend.cpp
@@ -56,7 +56,7 @@ class ExecutorBackend final : public PyTorchBackendInterface {
     // Can't free `processed` because the program will point into that memory.
 
     // Try loading the program.
-    Result<Program> program_result = Program::Load(loader);
+    Result<Program> program_result = Program::load(loader);
     if (!program_result.ok()) {
       return program_result.error();
     }
diff --git a/extension/pybindings/pybindings.cpp b/extension/pybindings/pybindings.cpp
@@ -68,7 +68,7 @@ class Module final {
   explicit Module(std::unique_ptr<DataLoader> loader)
       : loader_(std::move(loader)) {
     runtime_init();
-    Result<Program> program = Program::Load(
+    Result<Program> program = Program::load(
         loader_.get(), Program::Verification::InternalConsistency);
     THROW_IF_ERROR(
         program.error(),
diff --git a/runtime/executor/test/allocation_failure_stress_test.cpp b/runtime/executor/test/allocation_failure_stress_test.cpp
@@ -46,7 +46,7 @@ class AllocationFailureStressTest : public ::testing::Test {
     loader_ = std::make_unique<FileDataLoader>(std::move(loader.get()));
 
     // Use it to load the program.
-    Result<Program> program = Program::Load(
+    Result<Program> program = Program::load(
         loader_.get(), Program::Verification::InternalConsistency);
     ASSERT_EQ(program.error(), Error::Ok);
     program_ = std::make_unique<Program>(std::move(program.get()));
diff --git a/runtime/executor/test/backend_integration_test.cpp b/runtime/executor/test/backend_integration_test.cpp
@@ -295,7 +295,7 @@ TEST_P(BackendIntegrationTest, BasicInitSucceeds) {
   Result<FileDataLoader> loader = FileDataLoader::From(program_path());
   ASSERT_EQ(loader.error(), Error::Ok);
 
-  Result<Program> program = Program::Load(&loader.get());
+  Result<Program> program = Program::load(&loader.get());
   ASSERT_EQ(program.error(), Error::Ok);
 
   ManagedMemoryManager mmm(kDefaultNonConstMemBytes, kDefaultRuntimeMemBytes);
@@ -326,7 +326,7 @@ TEST_P(BackendIntegrationTest, FreeingProcessedBufferSucceeds) {
   DataLoaderSpy spy_loader(&loader.get());
 
   // Load the program.
-  Result<Program> program = Program::Load(&spy_loader);
+  Result<Program> program = Program::load(&spy_loader);
   ASSERT_EQ(program.error(), Error::Ok);
   ManagedMemoryManager mmm(kDefaultNonConstMemBytes, kDefaultRuntimeMemBytes);
   Result<Method> method_res = program->load_method("forward", &mmm.get());
@@ -390,7 +390,7 @@ TEST_P(BackendIntegrationTest, EndToEndTestWithProcessedAsHandle) {
   DataLoaderSpy spy_loader(&loader.get());
 
   // Load the program.
-  Result<Program> program = Program::Load(&spy_loader);
+  Result<Program> program = Program::load(&spy_loader);
   ASSERT_EQ(program.error(), Error::Ok);
 
   // Hold onto the address of the processed buffer so we can compare against
@@ -538,7 +538,7 @@ TEST_P(DelegateDataAlignmentTest, ExpectedDataAlignment) {
   DataLoaderSpy spy_loader(&loader.get());
 
   // Load the program.
-  Result<Program> program = Program::Load(&spy_loader);
+  Result<Program> program = Program::load(&spy_loader);
   ASSERT_EQ(program.error(), Error::Ok);
   ManagedMemoryManager mmm(kDefaultNonConstMemBytes, kDefaultRuntimeMemBytes);
   Result<Method> method = program->load_method("forward", &mmm.get());
diff --git a/runtime/executor/test/execution_plan_test.cpp b/runtime/executor/test/execution_plan_test.cpp
@@ -42,7 +42,7 @@ class ExecutionPlanTest : public ::testing::Test {
     loader_ = std::make_unique<FileDataLoader>(std::move(loader.get()));
 
     // Use it to load the program.
-    Result<Program> program = Program::Load(
+    Result<Program> program = Program::load(
         loader_.get(), Program::Verification::InternalConsistency);
     ASSERT_EQ(program.error(), Error::Ok);
     program_ = std::make_unique<Program>(std::move(program.get()));
diff --git a/runtime/executor/test/kernel_integration_test.cpp b/runtime/executor/test/kernel_integration_test.cpp
@@ -143,7 +143,7 @@ class KernelIntegrationTest : public ::testing::Test {
     loader_ = std::make_unique<FileDataLoader>(std::move(loader.get()));
 
     // Use it to load the program.
-    Result<Program> program = Program::Load(
+    Result<Program> program = Program::load(
         loader_.get(), Program::Verification::InternalConsistency);
     ASSERT_EQ(program.error(), Error::Ok);
     program_ = std::make_unique<Program>(std::move(program.get()));
diff --git a/runtime/executor/test/kernel_resolution_test.cpp b/runtime/executor/test/kernel_resolution_test.cpp
@@ -57,7 +57,7 @@ class KernelResolutionTest : public ::testing::Test {
     loader_ = std::make_unique<FileDataLoader>(std::move(loader.get()));
 
     // Use it to load the program.
-    Result<Program> program = Program::Load(
+    Result<Program> program = Program::load(
         loader_.get(), Program::Verification::InternalConsistency);
     ASSERT_EQ(program.error(), Error::Ok);
     program_ = std::make_unique<Program>(std::move(program.get()));
diff --git a/runtime/executor/test/method_meta_test.cpp b/runtime/executor/test/method_meta_test.cpp
@@ -34,7 +34,7 @@ class MethodMetaTest : public ::testing::Test {
     loader_ = std::make_unique<FileDataLoader>(std::move(loader.get()));
 
     // Use it to load the program.
-    Result<Program> program = Program::Load(
+    Result<Program> program = Program::load(
         loader_.get(), Program::Verification::InternalConsistency);
     ASSERT_EQ(program.error(), Error::Ok);
     program_ = std::make_unique<Program>(std::move(program.get()));
diff --git a/runtime/executor/test/method_test.cpp b/runtime/executor/test/method_test.cpp
@@ -42,7 +42,7 @@ class MethodTest : public ::testing::Test {
          std::make_unique<FileDataLoader>(std::move(loader.get()))});
 
     // Use it to load the program.
-    Result<Program> program = Program::Load(
+    Result<Program> program = Program::load(
         loaders_[module_name].get(),
         Program::Verification::InternalConsistency);
     ASSERT_EQ(program.error(), Error::Ok);
diff --git a/sdk/runners/executor_runner.cpp b/sdk/runners/executor_runner.cpp
@@ -218,7 +218,7 @@ int main(int argc, char** argv) {
   // multiple execution invocations across multiple threads.
   uint32_t prof_tok = EXECUTORCH_BEGIN_PROF("de-serialize model");
   Result<Program> program =
-      torch::executor::Program::Load(program_data.program_loader());
+      torch::executor::Program::load(program_data.program_loader());
   EXECUTORCH_END_PROF(prof_tok);
   if (!program.ok()) {
     ET_LOG(Error, "Failed to parse model file %s", FLAGS_model_path.c_str());
diff --git a/test/multi_runner.cpp b/test/multi_runner.cpp
@@ -115,7 +115,7 @@ class PreparedModel final {
 
  private:
   static Program load_program_or_die(DataLoader& loader) {
-    Result<Program> program = Program::Load(&loader);
+    Result<Program> program = Program::load(&loader);
     ET_CHECK(program.ok());
     return std::move(program.get());
   }
diff --git a/test/relocatable_runner.cpp b/test/relocatable_runner.cpp
@@ -67,7 +67,7 @@ Program* load_program(
   new (loader) util::BufferDataLoader(file_data, file_data_len);
 
   // Load the program.
-  Result<Program> program_result = Program::Load(loader);
+  Result<Program> program_result = Program::load(loader);
   ET_CHECK(program_result.ok());
 
   // Move the Program into worker memory.
diff --git a/test/size_test.cpp b/test/size_test.cpp
@@ -57,10 +57,10 @@ int main(int argc, char** argv) {
       loader.ok(), "FileDataLoader::From() failed: 0x%" PRIx32, loader.error());
 
   uint32_t prof_tok = EXECUTORCH_BEGIN_PROF("de-serialize model");
-  const auto program = Program::Load(&loader.get());
+  const auto program = Program::load(&loader.get());
   EXECUTORCH_END_PROF(prof_tok);
   ET_CHECK_MSG(
-      program.ok(), "Program::Load() failed: 0x%" PRIx32, program.error());
+      program.ok(), "Program::load() failed: 0x%" PRIx32, program.error());
   ET_LOG(Info, "Program file %s loaded.", argv[1]);
 
   // Use the first method in the program.

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class ExecutorBackend final : public PyTorchBackendInterface {`
`56`	`56`	// Can't free `processed` because the program will point into that memory.
`57`	`57`
`58`	`58`	`// Try loading the program.`
`59`		`- Result<Program> program_result = Program::Load(loader);`
	`59`	`+ Result<Program> program_result = Program::load(loader);`
`60`	`60`	`if (!program_result.ok()) {`
`61`	`61`	`return program_result.error();`
`62`	`62`	`}`