Skip to content

Commit 4f0cd47

Browse files
committed
Don't define aten-mode targets in OSS
Define get_aten_mode_options in runtime_wrapper and use it. Test Plan: buck2 build //runtime/... has many fewer errors now (aten-mode targets were failing) ghstack-source-id: 3960223 ghstack-comment-id: 2680170786 Pull Request resolved: #8661
1 parent 745be4e commit 4f0cd47

File tree

30 files changed

+61
-57
lines changed

30 files changed

+61
-57
lines changed

devtools/bundled_program/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212
runtime.cxx_library(
1313
name = "runtime" + aten_suffix,

devtools/etdump/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
SCALAR_TYPE_STEM = "scalar_type"
44
SCALAR_TYPE = SCALAR_TYPE_STEM + ".fbs"
@@ -87,7 +87,7 @@ def define_common_targets():
8787
exported_external_deps = ["flatccrt"],
8888
)
8989

90-
for aten_mode in (True, False):
90+
for aten_mode in get_aten_mode_options():
9191
aten_suffix = "_aten" if aten_mode else ""
9292
runtime.cxx_library(
9393
name = "etdump_flatcc" + aten_suffix,

extension/evalue_util/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212

1313
runtime.cxx_library(

extension/evalue_util/test/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = "_aten" if aten_mode else ""
1212

1313
runtime.cxx_test(

extension/module/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212

1313
runtime.cxx_library(

extension/module/test/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load(
33
"ANDROID",
44
"CXX",
55
)
6-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
6+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
77

88
def define_common_targets():
99
"""Defines targets that should be shared between fbcode and xplat.
@@ -12,7 +12,7 @@ def define_common_targets():
1212
TARGETS and BUCK files that call this function.
1313
"""
1414

15-
for aten_mode in (True, False):
15+
for aten_mode in get_aten_mode_options():
1616
aten_suffix = ("_aten" if aten_mode else "")
1717

1818
runtime.cxx_test(

extension/parallel/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212

1313
runtime.cxx_library(

extension/runner_util/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212

1313
runtime.cxx_library(

extension/runner_util/test/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets(is_fbcode = False):
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets(is_fbcode = False):
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212

1313
# TODO(dbort): Find a way to make these run for ANDROID/APPLE in xplat. The

extension/tensor/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212

1313
runtime.cxx_library(

extension/tensor/test/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212

1313
runtime.cxx_test(

extension/training/module/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212

1313
runtime.cxx_library(

extension/training/optimizer/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = "_aten" if aten_mode else ""
1212

1313
# if aten_mode:

extension/training/optimizer/test/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = "_aten" if aten_mode else ""
1212
runtime.cxx_test(
1313
name = "sgd_test" + aten_suffix,

kernels/prim_ops/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212

1313
runtime.cxx_library(

kernels/quantized/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22
load("@fbsource//xplat/executorch/codegen:codegen.bzl", "et_operator_library", "executorch_generated_lib", "exir_custom_ops_aot_lib")
33

44
def define_common_targets():
@@ -77,7 +77,7 @@ def define_common_targets():
7777
],
7878
)
7979

80-
for aten_mode in (True, False):
80+
for aten_mode in get_aten_mode_options():
8181
aten_suffix = "_aten" if aten_mode else ""
8282

8383
runtime.cxx_library(

runtime/backend/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212
runtime.cxx_library(
1313
name = "interface" + aten_suffix,

runtime/core/exec_aten/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = "_aten" if aten_mode else ""
1212

1313
# Depend on this target if your types (Tensor, ArrayRef, etc) should be flexible between ATen and executor

runtime/core/exec_aten/testing_util/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
55
66
The directory containing this targets.bzl file should also contain both
77
TARGETS and BUCK files that call this function.
88
"""
9-
for aten_mode in (True, False):
9+
for aten_mode in get_aten_mode_options():
1010
aten_suffix = ("_aten" if aten_mode else "")
1111

1212
runtime.cxx_library(

runtime/core/exec_aten/util/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets():
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = "_aten" if aten_mode else ""
1212

1313
exported_preprocessor_flags_ = []

runtime/core/exec_aten/util/test/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -35,7 +35,7 @@ def define_common_targets():
3535
],
3636
)
3737

38-
for aten_mode in (True, False):
38+
for aten_mode in get_aten_mode_options():
3939
aten_suffix = "_aten" if aten_mode else ""
4040
runtime.cxx_test(
4141
name = "tensor_util_test" + aten_suffix,

runtime/core/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def event_tracer_enabled():
44
return native.read_config("executorch", "event_tracer_enabled", "false") == "true"
@@ -82,7 +82,7 @@ def define_common_targets():
8282
],
8383
)
8484

85-
for aten_mode in (True, False):
85+
for aten_mode in get_aten_mode_options():
8686
aten_suffix = ("_aten" if aten_mode else "")
8787
runtime.cxx_library(
8888
name = "evalue" + aten_suffix,

runtime/core/test/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets():
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -102,7 +102,7 @@ def define_common_targets():
102102
],
103103
)
104104

105-
for aten_mode in (True, False):
105+
for aten_mode in get_aten_mode_options():
106106
aten_suffix = "_aten" if aten_mode else ""
107107

108108
runtime.cxx_test(

runtime/executor/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def _program_preprocessor_flags():
44
"""Returns the preprocessor_flags to use when building Program.cpp"""
@@ -42,7 +42,7 @@ def define_common_targets():
4242
],
4343
)
4444

45-
for aten_mode in (True, False):
45+
for aten_mode in get_aten_mode_options():
4646
aten_suffix = "_aten" if aten_mode else ""
4747
runtime.cxx_library(
4848
name = "program" + aten_suffix,

runtime/executor/test/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def define_common_targets(is_fbcode = False):
44
"""Defines targets that should be shared between fbcode and xplat.
@@ -7,7 +7,7 @@ def define_common_targets(is_fbcode = False):
77
TARGETS and BUCK files that call this function.
88
"""
99

10-
for aten_mode in (True, False):
10+
for aten_mode in get_aten_mode_options():
1111
aten_suffix = ("_aten" if aten_mode else "")
1212

1313
runtime.cxx_library(

runtime/kernel/targets.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime")
1+
load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime")
22

33
def _operator_registry_preprocessor_flags():
44
max_kernel_num = native.read_config("executorch", "max_kernel_num", None)
@@ -51,7 +51,7 @@ def define_common_targets():
5151
preprocessor_flags = ["-DMAX_KERNEL_NUM=1"],
5252
)
5353

54-
for aten_mode in (True, False):
54+
for aten_mode in get_aten_mode_options():
5555
aten_suffix = "_aten" if aten_mode else ""
5656

5757
runtime.cxx_library(

0 commit comments

Comments
 (0)