Skip to content

Commit 0574637

Browse files
cccclaifacebook-github-bot
authored andcommitted
rename to backend/interface.h (#285)
Summary: Pull Request resolved: #285 this file is more about the interface between the backend and the executor runtime. The original name is `backend.h` and was renamed to `backend_registry.h` during refactor. But the backend registery is a really small part. Techincally we can seperate out backend_registery, but it's just a few lines and feel like it might be overkill. Users also need to include two header files too and doesn't seem worth the effort Reviewed By: JacobSzwejbka Differential Revision: D48399818 fbshipit-source-id: f873e25d1cea12c457087b9011dfd5cbd3b2a47e
1 parent 7f395fd commit 0574637

20 files changed

+26
-28
lines changed

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ executorch
5454
├── backends # 1st party backend implementations.
5555
| ├── xnnpack
5656
| ├── vulkan
57-
| ├── backend_api.py # TODO move to exir/backend
58-
| ├── backend_details.py # TODO move to exir/backend
59-
| ├── partioner.py # TODO move to exir/backend
6057
├── build # Utilities for managing the build system.
6158
├── bundled_program # Utilities for attaching reference inputs and outputs to models. TODO move to extension
6259
├── codegen # Tooling to autogenerate bindings between kernels and the runtime. TODO move to tool
@@ -67,6 +64,7 @@ executorch
6764
| ├── export
6865
| ├── models
6966
├── exir # Ahead of time library, model capture and lowering apis.
67+
| ├── backend # Backend delegate ahead of time APIs
7068
| ├── capture # Program capture.
7169
| ├── dialects # Op sets for various dialects in the export process.
7270
| ├── emit # Conversion from ExportedProgram to Executorch execution instructions.
@@ -87,7 +85,7 @@ executorch
8785
| ├── quantized
8886
├── profiler # Utilities for profiling. TODO delete in favor of ETDump in sdk/
8987
├── runtime # core cpp runtime of executorch
90-
| ├── backend # Backend definition and registration.
88+
| ├── backend # Backend delegate runtime APIs
9189
| ├── core # Core structures used across all levels of the runtime
9290
| ├── executor # Model loading, initalization, and execution.
9391
| ├── kernel # Kernel registration and management.

backends/qnnpack/QNNPackBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <executorch/backends/qnnpack/qnnpack_schema_generated.h>
1111
#include <executorch/backends/xnnpack/runtime/utils/utils.h>
1212
#include <executorch/backends/xnnpack/threadpool/threadpool.h>
13-
#include <executorch/runtime/backend/backend_registry.h>
13+
#include <executorch/runtime/backend/interface.h>
1414
#include <executorch/runtime/core/error.h>
1515
#include <executorch/runtime/core/evalue.h>
1616
#include <executorch/runtime/core/exec_aten/util/scalar_type_util.h>

backends/qnnpack/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def define_common_targets():
6363
deps = [
6464
"//executorch/runtime/core/exec_aten/util:scalar_type_util",
6565
"//executorch/runtime/core/exec_aten/util:tensor_util",
66-
"//executorch/runtime/backend:backend_registry",
66+
"//executorch/runtime/backend:interface",
6767
"//executorch/backends/xnnpack/threadpool:threadpool",
6868
"//executorch/backends/xnnpack:dynamic_quant_utils",
6969
"//{prefix}caffe2/aten/src/ATen/native/quantized/cpu/qnnpack:pytorch_qnnpack".format(

backends/vulkan/TARGETS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runtime.cxx_library(
1717
deps = [
1818
"//caffe2:torch_vulkan_graph",
1919
"//executorch/backends/vulkan/serialization/schema:vk_delegate_schema",
20-
"//executorch/runtime/backend:backend_registry",
20+
"//executorch/runtime/backend:interface",
2121
],
2222
)
2323

backends/vulkan/VulkanBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <ATen/native/vulkan/graph/Arithmetic.h>
1010
#include <ATen/native/vulkan/graph/Graph.h>
1111
#include <executorch/backends/vulkan/serialization/schema/schema_generated.h>
12-
#include <executorch/runtime/backend/backend_registry.h>
12+
#include <executorch/runtime/backend/interface.h>
1313
#include <executorch/runtime/core/error.h>
1414
#include <executorch/runtime/core/evalue.h>
1515
#include <executorch/runtime/platform/profiler.h>

backends/xnnpack/runtime/XNNExecutor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#pragma once
1010

1111
#include <executorch/backends/xnnpack/runtime/XNNStatus.h>
12-
#include <executorch/runtime/backend/backend_registry.h>
12+
#include <executorch/runtime/backend/interface.h>
1313
#include <executorch/runtime/core/error.h>
1414
#include <executorch/runtime/core/exec_aten/util/tensor_util.h>
1515

backends/xnnpack/runtime/XNNPACKBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
#include <executorch/backends/xnnpack/runtime/XNNCompiler.h>
10-
#include <executorch/runtime/backend/backend_registry.h>
10+
#include <executorch/runtime/backend/interface.h>
1111
#include <executorch/runtime/core/error.h>
1212
#include <executorch/runtime/core/evalue.h>
1313
#include <executorch/runtime/platform/profiler.h>

backends/xnnpack/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def define_common_targets():
1010
exported_headers = ["runtime/utils/utils.h"],
1111
deps = [
1212
"//executorch/runtime/core/exec_aten:lib",
13-
"//executorch/runtime/backend:backend_registry",
13+
"//executorch/runtime/backend:interface",
1414
],
1515
visibility = [
1616
"//executorch/backends/xnnpack/...",
@@ -72,7 +72,7 @@ def define_common_targets():
7272
third_party_dep("XNNPACK"),
7373
":xnnpack_schema",
7474
":dynamic_quant_utils", # TODO Use (1) portable for choose_qparams(), (2) xnnpack for quantize_per_tensor(),
75-
"//executorch/runtime/backend:backend_registry",
75+
"//executorch/runtime/backend:interface",
7676
"//executorch/backends/xnnpack/threadpool:threadpool",
7777
"//executorch/runtime/core/exec_aten/util:tensor_util",
7878
],

exir/backend/test/demos/rpc/ExecutorBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <memory>
1515

1616
#include <executorch/extension/data_loader/buffer_data_loader.h>
17-
#include <executorch/runtime/backend/backend_registry.h>
17+
#include <executorch/runtime/backend/interface.h>
1818
#include <executorch/runtime/core/error.h>
1919
#include <executorch/runtime/core/evalue.h>
2020
#include <executorch/runtime/executor/method.h>

exir/backend/test/demos/rpc/ExecutorBackendRegister.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
#include <executorch/exir/backend/test/demos/rpc/ExecutorBackend.h>
10-
#include <executorch/runtime/backend/backend_registry.h>
10+
#include <executorch/runtime/backend/interface.h>
1111
#include <executorch/runtime/core/error.h>
1212

1313
namespace torch {

exir/backend/test/demos/rpc/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def define_common_targets():
2525
deps = [
2626
"//executorch/runtime/executor:program",
2727
"//executorch/kernels/portable:generated_lib",
28-
"//executorch/runtime/backend:backend_registry",
28+
"//executorch/runtime/backend:interface",
2929
"//executorch/extension/data_loader:buffer_data_loader",
3030
"//executorch/util:util",
3131
] + MODELS_ATEN_OPS_LEAN_MODE_GENERATED_LIB,
@@ -41,7 +41,7 @@ def define_common_targets():
4141
],
4242
deps = [
4343
":executor_backend",
44-
"//executorch/runtime/backend:backend_registry",
44+
"//executorch/runtime/backend:interface",
4545
"//executorch/runtime/core:core",
4646
],
4747
platforms = [ANDROID, CXX],

runtime/backend/backend_registry.cpp renamed to runtime/backend/interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
#include <executorch/runtime/backend/backend_registry.h>
9+
#include <executorch/runtime/backend/interface.h>
1010
#include <executorch/runtime/platform/assert.h>
1111

1212
namespace torch {
File renamed without changes.

runtime/backend/targets.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ def define_common_targets():
1010
for aten_mode in (True, False):
1111
aten_suffix = ("_aten" if aten_mode else "")
1212
runtime.cxx_library(
13-
name = "backend_registry" + aten_suffix,
13+
name = "interface" + aten_suffix,
1414
srcs = [
15-
"backend_registry.cpp",
15+
"interface.cpp",
1616
],
1717
exported_headers = [
1818
"backend_execution_context.h",
1919
"backend_init_context.h",
20-
"backend_registry.h",
20+
"interface.h",
2121
],
2222
preprocessor_flags = ["-DUSE_ATEN_LIB"] if aten_mode else [],
2323
visibility = [

runtime/executor/method.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <cstdint>
1313
#include <cstdio>
1414

15-
#include <executorch/runtime/backend/backend_registry.h>
15+
#include <executorch/runtime/backend/interface.h>
1616
#include <executorch/runtime/core/exec_aten/util/dim_order_util.h>
1717
#include <executorch/runtime/core/exec_aten/util/scalar_type_util.h>
1818
#include <executorch/runtime/core/exec_aten/util/tensor_util.h>

runtime/executor/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def define_common_targets():
6464
],
6565
deps = [
6666
"//executorch/kernels/prim_ops:prim_ops_registry" + aten_suffix,
67-
"//executorch/runtime/backend:backend_registry",
67+
"//executorch/runtime/backend:interface",
6868
"//executorch/runtime/core/exec_aten/util:dim_order_util",
6969
"//executorch/runtime/core/exec_aten/util:scalar_type_util",
7070
"//executorch/runtime/core/exec_aten/util:tensor_util" + aten_suffix,

runtime/executor/test/backend_integration_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <executorch/extension/data_loader/buffer_data_loader.h>
1616
#include <executorch/extension/data_loader/file_data_loader.h>
17-
#include <executorch/runtime/backend/backend_registry.h>
17+
#include <executorch/runtime/backend/interface.h>
1818
#include <executorch/runtime/core/error.h>
1919
#include <executorch/runtime/core/result.h>
2020
#include <executorch/runtime/executor/method.h>

runtime/executor/test/targets.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def define_common_targets(is_fbcode = False):
2626
compiler_flags = ["-Wno-global-constructors"],
2727
preprocessor_flags = ["-DUSE_ATEN_LIB"] if aten_mode else [],
2828
exported_deps = [
29-
"//executorch/runtime/backend:backend_registry" + aten_suffix,
29+
"//executorch/runtime/backend:interface" + aten_suffix,
3030
],
3131
# TestBackendCompilerLib.cpp needs to compile with executor as whole
3232
# @lint-ignore BUCKLINT: Avoid `link_whole=True` (https://fburl.com/avoid-link-whole)
@@ -50,7 +50,7 @@ def define_common_targets(is_fbcode = False):
5050
compiler_flags = ["-Wno-global-constructors"],
5151
preprocessor_flags = ["-DUSE_ATEN_LIB"] if aten_mode else [],
5252
exported_deps = [
53-
"//executorch/runtime/backend:backend_registry" + aten_suffix,
53+
"//executorch/runtime/backend:interface" + aten_suffix,
5454
],
5555
# TestBackendCompilerLib.cpp needs to compile with executor as whole
5656
# @lint-ignore BUCKLINT: Avoid `link_whole=True` (https://fburl.com/avoid-link-whole)
@@ -219,7 +219,7 @@ def define_common_targets(is_fbcode = False):
219219
],
220220
deps = [
221221
":managed_memory_manager",
222-
"//executorch/runtime/backend:backend_registry",
222+
"//executorch/runtime/backend:interface",
223223
"//executorch/runtime/executor:program",
224224
"//executorch/extension/data_loader:buffer_data_loader",
225225
"//executorch/extension/data_loader:file_data_loader",

runtime/executor/test/test_backend_compiler_lib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
#include <executorch/runtime/backend/backend_registry.h>
9+
#include <executorch/runtime/backend/interface.h>
1010
#include <executorch/runtime/core/error.h>
1111
#include <executorch/runtime/core/evalue.h>
1212
#include <executorch/runtime/platform/profiler.h>

runtime/executor/test/test_backend_with_delegate_mapping.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9-
#include <executorch/runtime/backend/backend_registry.h>
9+
#include <executorch/runtime/backend/interface.h>
1010
#include <executorch/runtime/core/error.h>
1111
#include <executorch/runtime/core/evalue.h>
1212

0 commit comments

Comments
 (0)