Skip to content

Commit 20ac60f

Browse files
JacobSzwejbkafacebook-github-bot
JacobSzwejbka
authored and
facebook-github-bot
committed
add runtime/kernel
Summary: https://docs.google.com/spreadsheets/d/17mEkBHN0XwXN21pG2IxpANX-jd4hNMrX4x9FthYB5Ok/edit#gid=0 Add runtime/kernel place: operator_registry.{cpp/h} kernel_includes.h kernel_runtime_context.h Reviewed By: mergennachin Differential Revision: D47267583 fbshipit-source-id: 8bebafe490d6c7eeeeca9385d096d94c31bfa9e9
1 parent eef92a5 commit 20ac60f

File tree

174 files changed

+270
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+270
-258
lines changed

‎codegen/codegen.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ def executorch_generated_lib(
346346
platforms = platforms,
347347
compiler_flags = compiler_flags,
348348
exported_deps = [
349-
"//executorch/kernels:kernel_runtime_context" + aten_suffix,
349+
"//executorch/runtime/kernel:kernel_runtime_context" + aten_suffix,
350350
],
351351
)
352352

@@ -373,14 +373,14 @@ def executorch_generated_lib(
373373
# Operator Registration is done through static tables
374374
compiler_flags = ["-Wno-global-constructors"] + compiler_flags,
375375
deps = [
376-
"//executorch/core:operator_registry",
376+
"//executorch/runtime/kernel:operator_registry",
377377
"//executorch/core/prim_ops:prim_ops_registry" + aten_suffix,
378378
"//executorch/core/values:executor_values" + aten_suffix,
379379
"//executorch/profiler:profiler",
380380
] + deps,
381381
exported_deps = [
382382
"//executorch/core/kernel_types:kernel_types" + aten_suffix,
383-
"//executorch/kernels:kernel_runtime_context" + aten_suffix,
383+
"//executorch/runtime/kernel:kernel_runtime_context" + aten_suffix,
384384
],
385385
xplat_deps = xplat_deps,
386386
fbcode_deps = fbcode_deps,
@@ -428,7 +428,7 @@ def executorch_generated_lib(
428428
"//executorch/core:core",
429429
] + torch_dep + custom_ops_aten_kernel_deps,
430430
exported_deps = [
431-
"//executorch/kernels:kernel_runtime_context_aten",
431+
"//executorch/runtime/kernel:kernel_runtime_context_aten",
432432
],
433433
define_static_target = define_static_targets,
434434
# Relax visibility restrictions since deps may include targets

‎codegen/templates/Functions.h

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

66
#include <executorch/core/kernel_types/kernel_types.h> // at::Tensor etc.
77
#include <executorch/core/macros.h> // TORCH_API
8-
#include <executorch/kernels/kernel_runtime_context.h>
8+
#include <executorch/runtime/kernel/kernel_runtime_context.h>
99

1010
// ${generated_comment}
1111

‎codegen/templates/NativeFunctions.h

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

66
#include <executorch/core/kernel_types/kernel_types.h> // at::Tensor etc.
77
#include <executorch/core/macros.h> // TORCH_API
8-
#include <executorch/kernels/kernel_runtime_context.h>
8+
#include <executorch/runtime/kernel/kernel_runtime_context.h>
99

1010
// ${generated_comment}
1111

‎codegen/templates/RegisterCodegenUnboxedKernels.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include <executorch/core/OperatorRegistry.h>
21
#include <executorch/core/kernel_types/kernel_types.h>
32
#include <executorch/core/values/Evalue.h>
3+
#include <executorch/runtime/kernel/operator_registry.h>
44
#include <executorch/runtime/platform/profiler.h>
55
#include "${fn_header}" // Generated Function import headers
66
// ${generated_comment}

‎core/prim_ops/RegisterPrimOps.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#include <executorch/core/OperatorRegistry.h>
21
#include <executorch/core/prim_ops/et_copy_index.h>
32
#include <executorch/core/values/Evalue.h>
4-
#include <executorch/kernels/kernel_includes.h>
3+
#include <executorch/runtime/kernel/kernel_includes.h>
4+
#include <executorch/runtime/kernel/operator_registry.h>
55

66
using OpArrayRef = ::torch::executor::ArrayRef<::torch::executor::Operator>;
77
using torch::executor::function::et_copy_index;

‎core/prim_ops/et_copy_index.cpp

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

55
#include <cstring>
66

7-
#include <executorch/kernels/kernel_includes.h>
7+
#include <executorch/runtime/kernel/kernel_includes.h>
88
#include <executorch/runtime/platform/assert.h>
99

1010
using exec_aten::SizesType;

‎core/prim_ops/et_copy_index.h

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

33
#include <executorch/core/values/Evalue.h>
4-
#include <executorch/kernels/kernel_runtime_context.h>
4+
#include <executorch/runtime/kernel/kernel_runtime_context.h>
55

66
namespace torch {
77
namespace executor {

‎core/prim_ops/targets.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ def define_common_targets():
1616
visibility = [], # Private
1717
exported_headers = ["et_copy_index.h"],
1818
deps = [
19-
"//executorch/kernels:kernel_includes" + aten_suffix,
19+
"//executorch/runtime/kernel:kernel_includes" + aten_suffix,
2020
],
2121
exported_deps = [
2222
"//executorch/core/values:executor_values" + aten_suffix,
23-
"//executorch/kernels:kernel_runtime_context" + aten_suffix,
23+
"//executorch/runtime/kernel:kernel_runtime_context" + aten_suffix,
2424
],
2525
)
2626

@@ -38,7 +38,7 @@ def define_common_targets():
3838
deps = [
3939
":et_copy_index" + aten_suffix,
4040
"//executorch/core/values:executor_values" + aten_suffix,
41-
"//executorch/core:operator_registry",
42-
"//executorch/kernels:kernel_includes" + aten_suffix,
41+
"//executorch/runtime/kernel:operator_registry",
42+
"//executorch/runtime/kernel:kernel_includes" + aten_suffix,
4343
],
4444
)

‎core/prim_ops/test/RegisterPrimOpsTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#include <gtest/gtest.h>
22

3-
#include <executorch/core/OperatorRegistry.h>
43
#include <executorch/core/kernel_types/kernel_types.h>
54
#include <executorch/core/kernel_types/testing/TensorFactory.h>
65
#include <executorch/core/kernel_types/testing/TensorUtil.h>
76
#include <executorch/core/kernel_types/util/tensor_util.h>
87
#include <executorch/core/values/Evalue.h>
9-
#include <executorch/kernels/kernel_runtime_context.h>
8+
#include <executorch/runtime/kernel/kernel_runtime_context.h>
9+
#include <executorch/runtime/kernel/operator_registry.h>
1010
#include <executorch/runtime/platform/runtime.h>
1111
#include <executorch/test/utils/DeathTest.h>
1212

‎core/prim_ops/test/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def define_common_targets():
1414
deps = [
1515
"//executorch/core/kernel_types/testing:tensor_util",
1616
"//executorch/core/prim_ops:prim_ops_registry",
17-
"//executorch/core:operator_registry",
18-
"//executorch/kernels:kernel_runtime_context",
17+
"//executorch/runtime/kernel:operator_registry",
18+
"//executorch/runtime/kernel:kernel_runtime_context",
1919
],
2020
)

‎core/targets.bzl

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,3 @@ def define_common_targets():
6262
"@EXECUTORCH_CLIENTS",
6363
],
6464
)
65-
66-
runtime.cxx_library(
67-
name = "operator_registry",
68-
srcs = ["OperatorRegistry.cpp"],
69-
exported_headers = ["OperatorRegistry.h"],
70-
visibility = [
71-
"//executorch/...",
72-
"@EXECUTORCH_CLIENTS",
73-
],
74-
exported_deps = [
75-
":core",
76-
"//executorch/core/values:executor_values",
77-
],
78-
)

‎core/test/targets.bzl

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
2-
load("@fbsource//xplat/executorch/codegen:codegen.bzl", "et_operator_library", "executorch_generated_lib")
32

43
def define_common_targets():
54
"""Defines targets that should be shared between fbcode and xplat.
@@ -75,59 +74,3 @@ def define_common_targets():
7574
"//executorch/core:freeable_buffer",
7675
],
7776
)
78-
79-
runtime.cxx_test(
80-
name = "operator_registry_test",
81-
srcs = [
82-
"OperatorRegistryTest.cpp",
83-
],
84-
deps = [
85-
"//executorch/core:operator_registry",
86-
"//executorch/kernels:kernel_runtime_context",
87-
],
88-
)
89-
90-
et_operator_library(
91-
name = "executorch_all_ops",
92-
include_all_operators = True,
93-
define_static_targets = True,
94-
)
95-
96-
executorch_generated_lib(
97-
name = "test_generated_lib_1",
98-
deps = [
99-
":executorch_all_ops",
100-
"//executorch/kernels/portable:operators",
101-
],
102-
functions_yaml_target = "//executorch/kernels/portable:functions.yaml",
103-
visibility = [
104-
"//executorch/...",
105-
],
106-
)
107-
108-
runtime.export_file(
109-
name = "functions.yaml",
110-
)
111-
112-
executorch_generated_lib(
113-
name = "specialized_kernel_generated_lib",
114-
deps = [
115-
":executorch_all_ops",
116-
"//executorch/kernels/portable:operators",
117-
],
118-
functions_yaml_target = ":functions.yaml",
119-
visibility = [
120-
"//executorch/...",
121-
],
122-
)
123-
124-
runtime.cxx_test(
125-
name = "kernel_double_registration_test",
126-
srcs = [
127-
"KernelDoubleRegistrationTest.cpp",
128-
],
129-
deps = [
130-
"//executorch/core:operator_registry",
131-
":specialized_kernel_generated_lib",
132-
],
133-
)

‎executor/Executor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
#include <cstdio>
66

77
#include <executorch/backends/backend.h>
8-
#include <executorch/core/OperatorRegistry.h>
98
#include <executorch/core/kernel_types/util/DimOrderUtils.h>
109
#include <executorch/core/kernel_types/util/ScalarTypeUtil.h>
1110
#include <executorch/core/kernel_types/util/tensor_util.h>
1211
#include <executorch/core/span.h>
1312
#include <executorch/executor/MemoryManager.h>
1413
#include <executorch/executor/Program.h>
1514
#include <executorch/executor/tensor_parser.h>
16-
#include <executorch/kernels/kernel_runtime_context.h>
15+
#include <executorch/runtime/kernel/kernel_runtime_context.h>
16+
#include <executorch/runtime/kernel/operator_registry.h>
1717
#include <executorch/runtime/platform/assert.h>
1818
#include <executorch/runtime/platform/log.h>
1919
#include <executorch/runtime/platform/profiler.h>

‎executor/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ def define_common_targets():
7474
deps = [
7575
"//executorch/backends:backend",
7676
"//executorch/core/prim_ops:prim_ops_registry" + aten_suffix,
77-
"//executorch/kernels:kernel_runtime_context" + aten_suffix,
77+
"//executorch/runtime/kernel:kernel_runtime_context" + aten_suffix,
7878
"//executorch/profiler:profiler",
7979
"//executorch/schema:schema",
8080
],
8181
exported_deps = [
8282
"//executorch/runtime/platform:platform",
8383
"//executorch/core:core",
84-
"//executorch/core:operator_registry",
84+
"//executorch/runtime/kernel:operator_registry",
8585
"//executorch/core/kernel_types/util:tensor_util" + aten_suffix,
8686
"//executorch/core/kernel_types/util:dim_order_util",
8787
"//executorch/core/kernel_types/util:scalar_type_util",

‎executor/test/ExecutorTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
#include <unordered_map>
88

99
#include <executorch/core/ArrayRef.h>
10-
#include <executorch/core/OperatorRegistry.h>
1110
#include <executorch/core/kernel_types/kernel_types.h>
1211
#include <executorch/core/values/Evalue.h>
1312
#include <executorch/executor/Executor.h>
1413
#include <executorch/executor/HierarchicalAllocator.h>
1514
#include <executorch/executor/MemoryAllocator.h>
16-
#include <executorch/kernels/kernel_runtime_context.h>
1715
#include <executorch/pytree/pytree.h>
16+
#include <executorch/runtime/kernel/kernel_runtime_context.h>
17+
#include <executorch/runtime/kernel/operator_registry.h>
1818
#include <executorch/runtime/platform/assert.h>
1919
#include <executorch/runtime/platform/runtime.h>
2020
#include <executorch/test/utils/DeathTest.h>

‎executor/test/KernelResolutionTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
#include <executorch/core/Constants.h>
88
#include <executorch/core/Error.h>
9-
#include <executorch/core/OperatorRegistry.h>
109
#include <executorch/core/Result.h>
1110
#include <executorch/executor/Executor.h>
1211
#include <executorch/executor/Program.h>
1312
#include <executorch/executor/test/ManagedMemoryManager.h>
13+
#include <executorch/runtime/kernel/operator_registry.h>
1414
#include <executorch/runtime/platform/runtime.h>
1515
#include <executorch/test/utils/DeathTest.h>
1616
#include <executorch/util/file_data_loader.h>

‎executor/test/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ def define_common_targets():
4141
"//executorch/core/values:executor_values",
4242
"//executorch/core:core",
4343
"//executorch/runtime/platform:platform",
44-
"//executorch/core:operator_registry",
44+
"//executorch/runtime/kernel:operator_registry",
4545
"//executorch/executor:executor",
4646
"//executorch/kernels/portable:generated_lib",
47-
"//executorch/kernels:kernel_runtime_context",
47+
"//executorch/runtime/kernel:kernel_runtime_context",
4848
"//executorch/pytree:pytree",
4949
"//executorch/test/utils:utils",
5050
"//executorch/util:test_memory_config",

‎kernels/optimized/cpu/op_add.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright (c) Meta Platforms, Inc. and affiliates.
22

3-
#include <executorch/kernels/kernel_includes.h>
43
#include <executorch/kernels/optimized/vec/functional.h>
54
#include <executorch/kernels/optimized/vec/vec.h>
65
#include <executorch/kernels/portable/cpu/scalar_utils.h>
76
#include <executorch/kernels/portable/cpu/util/broadcast_util.h>
7+
#include <executorch/runtime/kernel/kernel_includes.h>
88
#include <executorch/runtime/platform/assert.h>
99

1010
namespace torch {

‎kernels/optimized/cpu/op_bmm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) Meta Platforms, Inc. and affiliates.
22

3-
#include <executorch/kernels/kernel_includes.h>
3+
#include <executorch/runtime/kernel/kernel_includes.h>
44

55
#include <executorch/kernels/optimized/blas/CPUBlas.h>
66

‎kernels/optimized/cpu/op_div.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright (c) Meta Platforms, Inc. and affiliates.
22

3-
#include <executorch/kernels/kernel_includes.h>
43
#include <executorch/kernels/optimized/vec/functional.h>
54
#include <executorch/kernels/optimized/vec/vec.h>
65
#include <executorch/kernels/portable/cpu/scalar_utils.h>
76
#include <executorch/kernels/portable/cpu/util/broadcast_util.h>
7+
#include <executorch/runtime/kernel/kernel_includes.h>
88
#include <executorch/runtime/platform/assert.h>
99

1010
namespace torch {

‎kernels/optimized/cpu/op_exp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
#include <cmath>
33

4-
#include <executorch/kernels/kernel_includes.h>
54
#include <executorch/kernels/optimized/vec/functional.h>
65
#include <executorch/kernels/optimized/vec/vec.h>
6+
#include <executorch/runtime/kernel/kernel_includes.h>
77

88
namespace torch {
99
namespace executor {

‎kernels/optimized/cpu/op_gelu.cpp

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

88
#include <cmath>
99

10-
#include <executorch/kernels/kernel_includes.h>
10+
#include <executorch/runtime/kernel/kernel_includes.h>
1111
#include <executorch/runtime/platform/assert.h>
1212

1313
namespace torch {

‎kernels/optimized/cpu/op_le.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright (c) Meta Platforms, Inc. and affiliates.
22

3-
#include <executorch/kernels/kernel_includes.h>
43
#include <executorch/kernels/optimized/vec/functional.h>
54
#include <executorch/kernels/optimized/vec/vec.h>
65
#include <executorch/kernels/portable/cpu/scalar_utils.h>
6+
#include <executorch/runtime/kernel/kernel_includes.h>
77
#include <executorch/runtime/platform/assert.h>
88

99
namespace torch {

‎kernels/optimized/cpu/op_log_softmax.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <cmath>
99
#include <type_traits>
1010

11-
#include <executorch/kernels/kernel_includes.h>
11+
#include <executorch/runtime/kernel/kernel_includes.h>
1212

1313
// `_log_softmax_out` Applies the Log_Softmax function to an n-dimensional input
1414
// Tensor rescaling them so that the elements of the n-dimensional output

‎kernels/optimized/cpu/op_mul.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright (c) Meta Platforms, Inc. and affiliates.
22

3-
#include <executorch/kernels/kernel_includes.h>
43
#include <executorch/kernels/optimized/vec/functional.h>
54
#include <executorch/kernels/optimized/vec/vec.h>
65
#include <executorch/kernels/portable/cpu/scalar_utils.h>
76
#include <executorch/kernels/portable/cpu/util/broadcast_util.h>
7+
#include <executorch/runtime/kernel/kernel_includes.h>
88
#include <executorch/runtime/platform/assert.h>
99

1010
namespace torch {

‎kernels/optimized/cpu/op_native_layer_norm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) Meta Platforms, Inc. and affiliates.
22

3-
#include <executorch/kernels/kernel_includes.h>
3+
#include <executorch/runtime/kernel/kernel_includes.h>
44
#include <cmath>
55
#include <tuple>
66

0 commit comments

Comments
 (0)