move all runtime apis under bundled_program/runtime (#1050)

Summary:
Pull Request resolved: #1050

Pull Request resolved: #434

This stack focuses on moving all bundled program codes under executorch/sdk/bundled_program. Target and discussions can be found in D49605947.

This diff moves all runtime apis under bundled_program/runtime.cpp and bundled_program/runtime.h, and update dependencies.

Differential Revision: https://internalfb.com/D50422561

fbshipit-source-id: 31fb1c8a4e3e99a6d49739299aaf50dc4836db19

Author: Songhao Jia

examples/apple/mps/executor_runner/mps_executor_runner.mm

@@ -27,7 +27,7 @@
 #include <executorch/runtime/platform/profiler.h>
 #include <executorch/runtime/platform/runtime.h>
 #include <executorch/util/util.h>
-#include <executorch/util/bundled_program_verification.h>
+#include <executorch/sdk/bundled_program/bundled_program.h>
 #include <executorch/extension/data_loader/buffer_data_loader.h>
 #include <executorch/runtime/core/result.h>
 #include <executorch/runtime/platform/runtime.h>

examples/apple/mps/executor_runner/targets.bzl

@@ -20,7 +20,7 @@ def define_common_targets():
                 "//executorch/extension/data_loader:file_data_loader",
                 "//executorch/extension/data_loader:buffer_data_loader",
                 "//executorch/util:util",
-                "//executorch/util:bundled_program_verification",
+                "//executorch/sdk/bundled_program:runtime",
                 "//executorch/util:util",
             ],
             define_static_target = True,

examples/sdk/sdk_example_runner/sdk_example_runner.cpp

@@ -27,8 +27,8 @@
 #include <executorch/runtime/executor/program.h>
 #include <executorch/runtime/platform/log.h>
 #include <executorch/runtime/platform/runtime.h>
+#include <executorch/sdk/bundled_program/bundled_program.h>
 #include <executorch/sdk/etdump/etdump_flatcc.h>
-#include <executorch/util/bundled_program_verification.h>
 #include <executorch/util/util.h>
 
 static uint8_t method_allocator_pool[4 * 1024U * 1024U]; // 4MB

examples/sdk/sdk_example_runner/targets.bzl

@@ -20,8 +20,8 @@ def define_common_targets():
             "//executorch/extension/data_loader:file_data_loader",
             "//executorch/extension/data_loader:buffer_data_loader",
             "//executorch/util:util",
-            "//executorch/util:bundled_program_verification",
             "//executorch/sdk/etdump:etdump_flatcc",
+            "//executorch/sdk/bundled_program:runtime",
         ],
         external_deps = [
             "gflags",

extension/pybindings/pybindings.cpp

@@ -26,7 +26,7 @@
 #include <executorch/runtime/platform/profiler.h>
 #include <executorch/runtime/platform/runtime.h>
 #include <executorch/schema/bundled_program_schema_generated.h>
-#include <executorch/util/bundled_program_verification.h>
+#include <executorch/sdk/bundled_program/bundled_program.h>
 #include <executorch/util/read_file.h>
 
 #include <ATen/Functions.h>

schema/targets.bzl

@@ -95,6 +95,7 @@ def define_common_targets():
             # Lock this down as tightly as possible to ensure that flatbuffers
             # are an implementation detail. Ideally this list would only include
             # //executorch/runtime/executor/...
+            "//executorch/bundled_program/runtime/...",
             "//executorch/codegen/tools/...",
             "//executorch/runtime/executor/...",
         ],

sdk/bundled_program/TARGETS

@@ -1,12 +1,19 @@
-load("@fbcode_macros//build_defs:python_library.bzl", "python_library")
+load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
+load(":targets.bzl", "define_common_targets")
 
 oncall("executorch")
 
-python_library(
+define_common_targets()
+
+runtime.python_library(
     name = "core",
     srcs = [
         "core.py",
     ],
+    visibility = [
+        "//executorch/...",
+        "@EXECUTORCH_CLIENTS",
+    ],
     deps = [
         ":config",
         ":schema",
@@ -18,30 +25,40 @@ python_library(
     ],
 )
 
-python_library(
+runtime.python_library(
     name = "config",
     srcs = [
         "config.py",
     ],
+    visibility = [
+        "//executorch/...",
+        "@EXECUTORCH_CLIENTS",
+    ],
     deps = [
         "fbsource//third-party/pypi/typing-extensions:typing-extensions",
         "//caffe2:torch",
     ],
 )
 
-python_library(
+runtime.python_library(
     name = "schema",
     srcs = [
         "schema.py",
     ],
+    visibility = [
+        "//executorch/sdk/...",
+    ],
     deps = [
         "//executorch/exir:scalar_type",
     ],
 )
 
-python_library(
+runtime.python_library(
     name = "version",
     srcs = [
         "version.py",
     ],
+    visibility = [
+        "//executorch/sdk/...",
+    ],
 )

util/bundled_program_verification.cpp renamed to sdk/bundled_program/bundled_program.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/util/bundled_program_verification.h>
+#include <executorch/sdk/bundled_program/bundled_program.h>
 
 #include <cmath>
 #include <cstddef>

util/bundled_program_verification.h renamed to sdk/bundled_program/bundled_program.h

@@ -0,0 +1,28 @@
+load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
+
+def define_common_targets():
+    """Defines targets that should be shared between fbcode and xplat.
+
+    The directory containing this targets.bzl file should also contain both
+    TARGETS and BUCK files that call this function.
+    """
+
+    for aten_mode in (True, False):
+        aten_suffix = ("_aten" if aten_mode else "")
+        runtime.cxx_library(
+            name = "runtime" + aten_suffix,
+            srcs = ["bundled_program.cpp"],
+            exported_headers = ["bundled_program.h"],
+            visibility = [
+                "//executorch/...",
+                "@EXECUTORCH_CLIENTS",
+            ],
+            deps = [
+                "//executorch/runtime/core/exec_aten/util:dim_order_util" + aten_suffix,
+                "//executorch/schema:bundled_program_schema",
+            ],
+            exported_deps = [
+                "//executorch/runtime/core:memory_allocator",
+                "//executorch/runtime/executor:program" + aten_suffix,
+            ],
+        )

sdk/bundled_program/targets.bzl

@@ -14,7 +14,7 @@ PORTABLE_MODULE_DEPS = [
     "//executorch/runtime/executor:program",
     "//executorch/schema:bundled_program_schema",
     "//executorch/extension/aten_util:aten_bridge",
-    "//executorch/util:bundled_program_verification",
+    "//executorch/sdk/bundled_program:runtime",
     "//executorch/extension/data_loader:buffer_data_loader",
     "//executorch/extension/data_loader:mmap_data_loader",
     "//executorch/extension/memory_allocator:malloc_memory_allocator",
@@ -31,7 +31,7 @@ ATEN_MODULE_DEPS = [
     "//executorch/extension/data_loader:mmap_data_loader",
     "//executorch/extension/memory_allocator:malloc_memory_allocator",
     "//executorch/util:read_file",
-    "//executorch/util:bundled_program_verification_aten",
+    "//executorch/sdk/bundled_program:runtime_aten",
     "//caffe2:torch",
     "//caffe2:torch_extension",
     "//caffe2:ATen",

shim/xplat/executorch/extension/pybindings/pybindings.bzl

@@ -23,23 +23,6 @@ def define_common_targets():
 
     for aten_mode in (True, False):
         aten_suffix = ("_aten" if aten_mode else "")
-        runtime.cxx_library(
-            name = "bundled_program_verification" + aten_suffix,
-            srcs = ["bundled_program_verification.cpp"],
-            exported_headers = ["bundled_program_verification.h"],
-            visibility = [
-                "//executorch/...",
-                "@EXECUTORCH_CLIENTS",
-            ],
-            deps = [
-                "//executorch/runtime/core/exec_aten/util:dim_order_util" + aten_suffix,
-                "//executorch/schema:bundled_program_schema",
-            ],
-            exported_deps = [
-                "//executorch/runtime/core:memory_allocator",
-                "//executorch/runtime/executor:program" + aten_suffix,
-            ],
-        )
 
         runtime.cxx_library(
             name = "util" + aten_suffix,