Skip to content

Commit a6dbe36

Browse files
JacobSzwejbkafacebook-github-bot
JacobSzwejbka
authored and
facebook-github-bot
committed
move evalue to runtime/core
Summary: https://docs.google.com/spreadsheets/d/17mEkBHN0XwXN21pG2IxpANX-jd4hNMrX4x9FthYB5Ok/edit#gid=0 delete values subdirectory as all it contained was tag and evalue and just place them in core. Reviewed By: mergennachin Differential Revision: D47347576 fbshipit-source-id: 37d591d69654b2bc370c7c6b6f0d61b1a9bb9be4
1 parent 928816d commit a6dbe36

35 files changed

+71
-105
lines changed

‎backends/qnnpack/QNNPackBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#include <executorch/backends/qnnpack/utils/utils.h>
44
#include <executorch/core/kernel_types/util/ScalarTypeUtil.h>
55
#include <executorch/core/kernel_types/util/tensor_util.h>
6-
#include <executorch/core/values/Evalue.h>
76
#include <executorch/runtime/backend/backend_registry.h>
87
#include <executorch/runtime/core/error.h>
8+
#include <executorch/runtime/core/evalue.h>
99
#include <executorch/runtime/platform/profiler.h>
1010
#include <executorch/threadpool/threadpool.h>
1111
#include <executorch/util/memory_utils.h>

‎backends/test/demos/rpc/ExecutorBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#include <memory>
77

88
#include <executorch/core/Constants.h>
9-
#include <executorch/core/values/Evalue.h>
109
#include <executorch/executor/Executor.h>
1110
#include <executorch/runtime/backend/backend_registry.h>
1211
#include <executorch/runtime/core/error.h>
12+
#include <executorch/runtime/core/evalue.h>
1313
#include <executorch/util/embedded_data_loader.h>
1414
#include <executorch/util/util.h>
1515

‎backends/vulkan/VulkanBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include <ATen/native/vulkan/graph/Arithmetic.h>
22
#include <ATen/native/vulkan/graph/Graph.h>
33
#include <executorch/backends/vulkan/serialization/schema/schema_generated.h>
4-
#include <executorch/core/values/Evalue.h>
54
#include <executorch/runtime/backend/backend_registry.h>
65
#include <executorch/runtime/core/error.h>
6+
#include <executorch/runtime/core/evalue.h>
77
#include <executorch/runtime/platform/profiler.h>
88
#include <cstdio>
99
#include <cstdlib> /* strtol */

‎backends/xnnpack/runtime/XNNPACKBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <executorch/backends/xnnpack/runtime/XNNCompiler.h>
2-
#include <executorch/core/values/Evalue.h>
32
#include <executorch/runtime/backend/backend_registry.h>
43
#include <executorch/runtime/core/error.h>
4+
#include <executorch/runtime/core/evalue.h>
55
#include <executorch/runtime/platform/profiler.h>
66
#include <executorch/util/memory_utils.h>
77
#include <memory>

‎codegen/codegen.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ def executorch_generated_lib(
376376
deps = [
377377
"//executorch/runtime/kernel:operator_registry",
378378
"//executorch/core/prim_ops:prim_ops_registry" + aten_suffix,
379-
"//executorch/core/values:executor_values" + aten_suffix,
379+
"//executorch/runtime/core:evalue" + aten_suffix,
380380
"//executorch/profiler:profiler",
381381
"//executorch/codegen:macros",
382382
] + deps,

‎codegen/templates/RegisterCodegenUnboxedKernels.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <executorch/core/kernel_types/kernel_types.h>
2-
#include <executorch/core/values/Evalue.h>
2+
#include <executorch/runtime/core/evalue.h>
33
#include <executorch/runtime/kernel/operator_registry.h>
44
#include <executorch/runtime/platform/profiler.h>
55
#include "${fn_header}" // Generated Function import headers

‎core/kernel_types/testing/targets.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def define_common_targets():
3333
"//executorch/kernels/optimized/test/...",
3434
"//executorch/kernels/test/...",
3535
"//executorch/core/test/...",
36+
"//executorch/runtime/core/test/...",
3637
"//executorch/test/...",
3738
"//executorch/util/...",
3839
"//executorch/backends/qnnpack/test/...",

‎core/prim_ops/RegisterPrimOps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <executorch/core/prim_ops/et_copy_index.h>
2-
#include <executorch/core/values/Evalue.h>
2+
#include <executorch/runtime/core/evalue.h>
33
#include <executorch/runtime/kernel/kernel_includes.h>
44
#include <executorch/runtime/kernel/operator_registry.h>
55

‎core/prim_ops/et_copy_index.h

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

3-
#include <executorch/core/values/Evalue.h>
3+
#include <executorch/runtime/core/evalue.h>
44
#include <executorch/runtime/kernel/kernel_runtime_context.h>
55

66
namespace torch {

‎core/prim_ops/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def define_common_targets():
1919
"//executorch/runtime/kernel:kernel_includes" + aten_suffix,
2020
],
2121
exported_deps = [
22-
"//executorch/core/values:executor_values" + aten_suffix,
22+
"//executorch/runtime/core:evalue" + aten_suffix,
2323
"//executorch/runtime/kernel:kernel_runtime_context" + aten_suffix,
2424
],
2525
)
@@ -37,7 +37,7 @@ def define_common_targets():
3737
compiler_flags = ["-Wno-global-constructors"],
3838
deps = [
3939
":et_copy_index" + aten_suffix,
40-
"//executorch/core/values:executor_values" + aten_suffix,
40+
"//executorch/runtime/core:evalue" + aten_suffix,
4141
"//executorch/runtime/kernel:operator_registry",
4242
"//executorch/runtime/kernel:kernel_includes" + aten_suffix,
4343
],

‎core/prim_ops/test/RegisterPrimOpsTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <executorch/core/kernel_types/testing/TensorFactory.h>
55
#include <executorch/core/kernel_types/testing/TensorUtil.h>
66
#include <executorch/core/kernel_types/util/tensor_util.h>
7-
#include <executorch/core/values/Evalue.h>
7+
#include <executorch/runtime/core/evalue.h>
88
#include <executorch/runtime/kernel/kernel_runtime_context.h>
99
#include <executorch/runtime/kernel/operator_registry.h>
1010
#include <executorch/runtime/platform/runtime.h>

‎core/values/TARGETS

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎core/values/targets.bzl

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎core/values/test/TARGETS

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎core/values/test/targets.bzl

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎executor/Executor.h

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

33
#include <executorch/core/kernel_types/kernel_types.h>
4-
#include <executorch/core/values/Evalue.h>
54
#include <executorch/executor/MemoryManager.h>
65
#include <executorch/executor/Program.h>
76
#include <executorch/runtime/core/error.h>
7+
#include <executorch/runtime/core/evalue.h>
88
#include <executorch/runtime/platform/compiler.h>
99

1010
// Forward declare flatbuffer types. This is a public header and must not

‎executor/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def define_common_targets():
8282
"//executorch/core/kernel_types/util:tensor_util" + aten_suffix,
8383
"//executorch/core/kernel_types/util:dim_order_util",
8484
"//executorch/core/kernel_types/util:scalar_type_util",
85-
"//executorch/core/values:executor_values",
85+
"//executorch/runtime/core:evalue",
8686
"//executorch/runtime/core:memory_allocator",
8787
"//executorch/core/kernel_types:kernel_types" + aten_suffix,
8888
":program",

‎executor/tensor_parser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include <executorch/core/kernel_types/kernel_types.h>
22
#include <executorch/core/kernel_types/util/DimOrderUtils.h>
3-
#include <executorch/core/values/Evalue.h>
43
#include <executorch/executor/Program.h>
54
#include <executorch/executor/tensor_parser.h>
65
#include <executorch/runtime/core/error.h>
6+
#include <executorch/runtime/core/evalue.h>
77
#include <executorch/runtime/core/result.h>
88
#include <executorch/runtime/platform/profiler.h>
99

‎executor/tensor_parser.h

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

33
#include <executorch/core/kernel_types/kernel_types.h>
4-
#include <executorch/core/values/Evalue.h>
54
#include <executorch/executor/Executor.h>
65
#include <executorch/executor/Program.h>
76
#include <executorch/runtime/core/error.h>
7+
#include <executorch/runtime/core/evalue.h>
88
#include <executorch/runtime/core/memory_allocator.h>
99
#include <executorch/runtime/core/result.h>
1010
#include <executorch/schema/schema_generated.h>

‎executor/tensor_parser_aten.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#include <ATen/ATen.h> // @manual=//caffe2/aten:ATen-core
22
#include <executorch/core/kernel_types/kernel_types.h>
33
#include <executorch/core/kernel_types/util/DimOrderUtils.h>
4-
#include <executorch/core/values/Evalue.h>
54
#include <executorch/executor/Program.h>
65
#include <executorch/executor/tensor_parser.h>
76
#include <executorch/runtime/core/error.h>
7+
#include <executorch/runtime/core/evalue.h>
88
#include <executorch/runtime/core/result.h>
99
#include <executorch/runtime/platform/profiler.h>
1010

‎executor/test/ExecutorTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
#include <unordered_map>
88

99
#include <executorch/core/kernel_types/kernel_types.h>
10-
#include <executorch/core/values/Evalue.h>
1110
#include <executorch/executor/Executor.h>
1211
#include <executorch/pytree/pytree.h>
1312
#include <executorch/runtime/core/array_ref.h>
13+
#include <executorch/runtime/core/evalue.h>
1414
#include <executorch/runtime/core/hierarchical_allocator.h>
1515
#include <executorch/runtime/core/memory_allocator.h>
1616
#include <executorch/runtime/kernel/kernel_runtime_context.h>

‎executor/test/TestBackendCompilerLib.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include <executorch/core/values/Evalue.h>
21
#include <executorch/runtime/backend/backend_registry.h>
32
#include <executorch/runtime/core/error.h>
3+
#include <executorch/runtime/core/evalue.h>
44
#include <executorch/runtime/platform/profiler.h>
55
#include <cstdio>
66
#include <cstdlib> /* strtol */

‎executor/test/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def define_common_targets():
3939
],
4040
deps = [
4141
"//executorch/core/kernel_types:kernel_types",
42-
"//executorch/core/values:executor_values",
42+
"//executorch/runtime/core:evalue",
4343
"//executorch/runtime/core:core",
4444
"//executorch/runtime/platform:platform",
4545
"//executorch/runtime/kernel:operator_registry",

‎kernels/portable/cpu/util/test/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def define_common_targets():
77
deps = [
88
"//executorch/core/kernel_types:kernel_types",
99
"//executorch/core/kernel_types/testing:tensor_util",
10-
"//executorch/core/values:executor_values",
10+
"//executorch/runtime/core:evalue",
1111
"//executorch/kernels/portable/cpu/util:broadcast_util",
1212
],
1313
)

‎runtime/backend/backend_registry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include <cstring>
44

5-
#include <executorch/core/values/Evalue.h>
65
#include <executorch/runtime/core/array_ref.h>
76
#include <executorch/runtime/core/error.h>
7+
#include <executorch/runtime/core/evalue.h>
88
#include <executorch/runtime/core/freeable_buffer.h>
99
#include <executorch/runtime/core/memory_allocator.h>
1010
#include <executorch/runtime/core/result.h>

‎runtime/backend/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def define_common_targets():
2424
],
2525
exported_deps = [
2626
"//executorch/runtime/core:core",
27-
"//executorch/core/values:executor_values" + aten_suffix,
27+
"//executorch/runtime/core:evalue" + aten_suffix,
2828
"//executorch/runtime/core:memory_allocator",
2929
"//executorch/profiler:profiler",
3030
],

‎core/values/Evalue.h renamed to ‎runtime/core/evalue.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/kernel_types/kernel_types.h>
4-
#include <executorch/core/values/Tag.h>
4+
#include <executorch/runtime/core/tag.h>
55
#include <executorch/runtime/platform/assert.h>
66

77
namespace torch {

‎runtime/core/portable_type/scalar.h

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

3-
#include <executorch/core/values/Tag.h>
3+
#include <executorch/runtime/core/tag.h>
44
#include <executorch/runtime/platform/assert.h>
55

66
#include <cstdint>

‎runtime/core/portable_type/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def define_common_targets():
3333
"//executorch/core/kernel_types:tensor_shape_dynamism",
3434
"//executorch/core/kernel_types/util:scalar_type_util",
3535
"//executorch/core/kernel_types/util:dim_order_util",
36-
"//executorch/core/values:executor_tag",
36+
"//executorch/runtime/core:tag",
3737
],
3838
)
3939

@@ -55,6 +55,6 @@ def define_common_targets():
5555
],
5656
exported_deps = [
5757
"//executorch/runtime/core:core",
58-
"//executorch/core/values:executor_tag",
58+
"//executorch/runtime/core:tag",
5959
],
6060
)

‎core/values/Tag.h renamed to ‎runtime/core/tag.h

File renamed without changes.

‎runtime/core/targets.bzl

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,31 @@ def define_common_targets():
4646
"@EXECUTORCH_CLIENTS",
4747
],
4848
)
49+
50+
for aten_mode in (True, False):
51+
aten_suffix = ("_aten" if aten_mode else "")
52+
runtime.cxx_library(
53+
name = "evalue" + aten_suffix,
54+
exported_headers = [
55+
"evalue.h",
56+
],
57+
visibility = [
58+
"//executorch/...",
59+
"@EXECUTORCH_CLIENTS",
60+
],
61+
exported_deps = [
62+
"//executorch/runtime/core:core",
63+
"//executorch/core/kernel_types:kernel_types" + aten_suffix,
64+
":tag",
65+
],
66+
)
67+
68+
runtime.cxx_library(
69+
name = "tag",
70+
exported_headers = [
71+
"tag.h",
72+
],
73+
visibility = [
74+
"//executorch/...",
75+
],
76+
)

‎core/values/test/EvalueTest.cpp renamed to ‎runtime/core/test/evalue_test.cpp

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

33
#include <executorch/core/kernel_types/kernel_types.h>
44
#include <executorch/core/kernel_types/testing/TensorFactory.h>
5-
#include <executorch/core/values/Evalue.h>
5+
#include <executorch/runtime/core/evalue.h>
66
#include <executorch/test/utils/DeathTest.h>
77

88
using namespace ::testing;

‎runtime/core/test/targets.bzl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,16 @@ def define_common_targets():
6262
"//executorch/runtime/core:memory_allocator",
6363
],
6464
)
65+
66+
for aten_mode in (True, False):
67+
aten_suffix = "_aten" if aten_mode else ""
68+
69+
runtime.cxx_test(
70+
name = "evalue_test" + aten_suffix,
71+
srcs = ["evalue_test.cpp"],
72+
deps = [
73+
"//executorch/core/kernel_types:kernel_types" + aten_suffix,
74+
"//executorch/core/kernel_types/testing:tensor_util" + aten_suffix,
75+
"//executorch/runtime/core:evalue" + aten_suffix,
76+
],
77+
)

0 commit comments

Comments
 (0)