Skip to content

Commit 7e37a26

Browse files
Gasoonjiafacebook-github-bot
authored andcommitted
use generate_lib to replace generate_lib_all_ops (#2315)
Summary: Pull Request resolved: #2315 bypass-github-export-checks `generate_lib` target (https://www.internalfb.com/code/fbsource/[53b009cbd8ee]/fbcode/executorch/kernels/portable/targets.bzl) has covered both aten ops and custom ops, which equals to all ops under portbale lib and make `generate_lib_all_ops` target reduntant. This diff removes `generate_lib_all_ops` and replace all places depending on it with `generate_lib`. Reviewed By: larryliu0820 Differential Revision: D54671576 fbshipit-source-id: cf524fccc5e794948cd5478b361208814cfaefce
1 parent 754429d commit 7e37a26

File tree

8 files changed

+10
-19
lines changed

8 files changed

+10
-19
lines changed

examples/apple/mps/executor_runner/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def define_common_targets():
2525
"//executorch/runtime/executor:program",
2626
"//executorch/extension/evalue_util:print_evalue",
2727
"//executorch/extension/data_loader:file_data_loader",
28-
"//executorch/kernels/portable:generated_lib_all_ops",
28+
"//executorch/kernels/portable:generated_lib",
2929
"//executorch/extension/data_loader:file_data_loader",
3030
"//executorch/sdk/etdump:etdump_flatcc",
3131
"//executorch/extension/data_loader:buffer_data_loader",

examples/models/llama2/runner/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ def _get_operator_lib(aten = False):
44
if aten:
55
return ["//executorch/kernels/portable:generated_lib_aten"]
66
elif runtime.is_oss:
7-
return ["//executorch/kernels/portable:generated_lib_all_ops"]
7+
return ["//executorch/kernels/portable:generated_lib"]
88
else:
9-
return ["//executorch/kernels/portable:generated_lib_all_ops", "//executorch/examples/models/llama2/custom_ops:custom_ops", "//executorch/examples/models/llama2/ops:generated_lib"]
9+
return ["//executorch/kernels/portable:generated_lib", "//executorch/examples/models/llama2/custom_ops:custom_ops", "//executorch/examples/models/llama2/ops:generated_lib"]
1010

1111
def define_common_targets():
1212
for aten in (True, False):

examples/portable/executor_runner/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def define_common_targets():
4747
deps = [
4848
":executor_runner_lib",
4949
"//executorch/runtime/executor/test:test_backend_compiler_lib",
50-
"//executorch/kernels/portable:generated_lib_all_ops",
50+
"//executorch/kernels/portable:generated_lib",
5151
] + custom_ops_lib,
5252
define_static_target = True,
5353
**get_oss_build_kwargs()

examples/sdk/sdk_example_runner/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def define_common_targets():
1515
],
1616
deps = [
1717
"//executorch/runtime/executor/test:test_backend_compiler_lib",
18-
"//executorch/kernels/portable:generated_lib_all_ops",
18+
"//executorch/kernels/portable:generated_lib",
1919
"//executorch/runtime/executor:program",
2020
"//executorch/extension/data_loader:file_data_loader",
2121
"//executorch/extension/data_loader:buffer_data_loader",

examples/xnnpack/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def define_common_targets():
5656
deps = [
5757
"//executorch/examples/portable/executor_runner:executor_runner_lib",
5858
"//executorch/backends/xnnpack:xnnpack_backend",
59-
"//executorch/kernels/portable:generated_lib_all_ops",
59+
"//executorch/kernels/portable:generated_lib",
6060
],
6161
define_static_target = True,
6262
**get_oss_build_kwargs()

extension/module/test/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def define_common_targets():
1313
"module_test.cpp",
1414
],
1515
deps = [
16-
"//executorch/kernels/portable:generated_lib_all_ops",
16+
"//executorch/kernels/portable:generated_lib",
1717
"//executorch/extension/module:module",
1818
],
1919
env = {

kernels/portable/targets.bzl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,6 @@ def define_common_targets():
102102
**generated_lib_common_args
103103
)
104104

105-
executorch_generated_lib(
106-
name = "generated_lib_all_ops",
107-
deps = [
108-
":executorch_all_ops",
109-
"//executorch/kernels/portable:operators",
110-
],
111-
**generated_lib_common_args
112-
)
113-
114105
executorch_generated_lib(
115106
name = "generated_lib_aten",
116107
deps = [

test/targets.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def define_common_targets():
3636
name = "size_test_all_ops",
3737
srcs = SIZE_TEST_SOURCES,
3838
deps = SIZE_TEST_DEPS + [
39-
"//executorch/kernels/portable:generated_lib_all_ops",
39+
"//executorch/kernels/portable:generated_lib",
4040
"//executorch/runtime/executor/test:test_backend_compiler_lib",
4141
],
4242
define_static_target = True,
@@ -57,7 +57,7 @@ def define_common_targets():
5757
srcs = ["multi_runner.cpp"],
5858
deps = [
5959
"//executorch/runtime/core:core",
60-
"//executorch/kernels/portable:generated_lib_all_ops",
60+
"//executorch/kernels/portable:generated_lib",
6161
"//executorch/runtime/executor:program",
6262
"//executorch/runtime/executor/test:managed_memory_manager",
6363
"//executorch/extension/data_loader:buffer_data_loader",
@@ -75,7 +75,7 @@ def define_common_targets():
7575
name = "relocatable_runner",
7676
srcs = ["relocatable_runner.cpp"],
7777
deps = [
78-
"//executorch/kernels/portable:generated_lib_all_ops",
78+
"//executorch/kernels/portable:generated_lib",
7979
"//executorch/runtime/executor:program",
8080
"//executorch/configurations:executor_cpu_optimized",
8181
"//executorch/extension/data_loader:buffer_data_loader",

0 commit comments

Comments
 (0)