From 545a05bc0c7bbb6409812aaa2ec756afbf67fd43 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 24 Feb 2025 17:57:37 -0800 Subject: [PATCH 1/2] Update [ghstack-poisoned] --- devtools/bundled_program/targets.bzl | 4 ++-- devtools/etdump/targets.bzl | 4 ++-- extension/evalue_util/targets.bzl | 4 ++-- extension/evalue_util/test/targets.bzl | 4 ++-- extension/module/targets.bzl | 4 ++-- extension/module/test/targets.bzl | 4 ++-- extension/parallel/targets.bzl | 4 ++-- extension/runner_util/targets.bzl | 4 ++-- extension/runner_util/test/targets.bzl | 4 ++-- extension/tensor/targets.bzl | 4 ++-- extension/tensor/test/targets.bzl | 4 ++-- extension/training/module/targets.bzl | 4 ++-- extension/training/optimizer/targets.bzl | 4 ++-- extension/training/optimizer/test/targets.bzl | 4 ++-- kernels/prim_ops/targets.bzl | 4 ++-- kernels/quantized/targets.bzl | 4 ++-- runtime/backend/targets.bzl | 4 ++-- runtime/core/exec_aten/targets.bzl | 4 ++-- runtime/core/exec_aten/testing_util/targets.bzl | 4 ++-- runtime/core/exec_aten/util/targets.bzl | 4 ++-- runtime/core/exec_aten/util/test/targets.bzl | 4 ++-- runtime/core/targets.bzl | 4 ++-- runtime/core/test/targets.bzl | 4 ++-- runtime/executor/targets.bzl | 4 ++-- runtime/executor/test/targets.bzl | 4 ++-- runtime/kernel/targets.bzl | 4 ++-- runtime/kernel/test/targets.bzl | 4 ++-- shim_et/xplat/executorch/build/runtime_wrapper.bzl | 3 +++ test/utils/targets.bzl | 4 ++-- third-party/gtest_defs.bzl | 3 ++- 30 files changed, 61 insertions(+), 57 deletions(-) diff --git a/devtools/bundled_program/targets.bzl b/devtools/bundled_program/targets.bzl index 7035b3b31f6..09e9aae11b1 100644 --- a/devtools/bundled_program/targets.bzl +++ b/devtools/bundled_program/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( name = "runtime" + aten_suffix, diff --git a/devtools/etdump/targets.bzl b/devtools/etdump/targets.bzl index ddbb35eab74..bf4807aa442 100644 --- a/devtools/etdump/targets.bzl +++ b/devtools/etdump/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") SCALAR_TYPE_STEM = "scalar_type" SCALAR_TYPE = SCALAR_TYPE_STEM + ".fbs" @@ -87,7 +87,7 @@ def define_common_targets(): exported_external_deps = ["flatccrt"], ) - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" runtime.cxx_library( name = "etdump_flatcc" + aten_suffix, diff --git a/extension/evalue_util/targets.bzl b/extension/evalue_util/targets.bzl index e700ea21467..47934eb78af 100644 --- a/extension/evalue_util/targets.bzl +++ b/extension/evalue_util/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( diff --git a/extension/evalue_util/test/targets.bzl b/extension/evalue_util/test/targets.bzl index 9e78f665c97..5d6161d09e9 100644 --- a/extension/evalue_util/test/targets.bzl +++ b/extension/evalue_util/test/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" runtime.cxx_test( diff --git a/extension/module/targets.bzl b/extension/module/targets.bzl index 4cbfa0ca0f5..09a610a1fca 100644 --- a/extension/module/targets.bzl +++ b/extension/module/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( diff --git a/extension/module/test/targets.bzl b/extension/module/test/targets.bzl index bc4ce2c6af7..19ba09cf4e6 100644 --- a/extension/module/test/targets.bzl +++ b/extension/module/test/targets.bzl @@ -3,7 +3,7 @@ load( "ANDROID", "CXX", ) -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -12,7 +12,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_test( diff --git a/extension/parallel/targets.bzl b/extension/parallel/targets.bzl index b1da51b6171..82b3deab129 100644 --- a/extension/parallel/targets.bzl +++ b/extension/parallel/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( diff --git a/extension/runner_util/targets.bzl b/extension/runner_util/targets.bzl index bc0fee197d6..3ab0c26cc72 100644 --- a/extension/runner_util/targets.bzl +++ b/extension/runner_util/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( diff --git a/extension/runner_util/test/targets.bzl b/extension/runner_util/test/targets.bzl index f55a1ea995f..95d5804ecdf 100644 --- a/extension/runner_util/test/targets.bzl +++ b/extension/runner_util/test/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(is_fbcode = False): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(is_fbcode = False): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") # TODO(dbort): Find a way to make these run for ANDROID/APPLE in xplat. The diff --git a/extension/tensor/targets.bzl b/extension/tensor/targets.bzl index 97654094af6..bf1485aaba5 100644 --- a/extension/tensor/targets.bzl +++ b/extension/tensor/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( diff --git a/extension/tensor/test/targets.bzl b/extension/tensor/test/targets.bzl index 29c8bff84bc..5bf8c7019b8 100644 --- a/extension/tensor/test/targets.bzl +++ b/extension/tensor/test/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_test( diff --git a/extension/training/module/targets.bzl b/extension/training/module/targets.bzl index 88da84ed131..cfdd0f9897a 100644 --- a/extension/training/module/targets.bzl +++ b/extension/training/module/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( diff --git a/extension/training/optimizer/targets.bzl b/extension/training/optimizer/targets.bzl index 3b00ae0bfdc..fb33f41f1ca 100644 --- a/extension/training/optimizer/targets.bzl +++ b/extension/training/optimizer/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" # if aten_mode: diff --git a/extension/training/optimizer/test/targets.bzl b/extension/training/optimizer/test/targets.bzl index 11269bfa180..7a93337a379 100644 --- a/extension/training/optimizer/test/targets.bzl +++ b/extension/training/optimizer/test/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" runtime.cxx_test( name = "sgd_test" + aten_suffix, diff --git a/kernels/prim_ops/targets.bzl b/kernels/prim_ops/targets.bzl index 9a753b50faa..c1af21a7e73 100644 --- a/kernels/prim_ops/targets.bzl +++ b/kernels/prim_ops/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( diff --git a/kernels/quantized/targets.bzl b/kernels/quantized/targets.bzl index fde6698099e..a2533cb003a 100644 --- a/kernels/quantized/targets.bzl +++ b/kernels/quantized/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") load("@fbsource//xplat/executorch/codegen:codegen.bzl", "et_operator_library", "executorch_generated_lib", "exir_custom_ops_aot_lib") def define_common_targets(): @@ -77,7 +77,7 @@ def define_common_targets(): ], ) - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" runtime.cxx_library( diff --git a/runtime/backend/targets.bzl b/runtime/backend/targets.bzl index fe7ce489b56..12d68396730 100644 --- a/runtime/backend/targets.bzl +++ b/runtime/backend/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( name = "interface" + aten_suffix, diff --git a/runtime/core/exec_aten/targets.bzl b/runtime/core/exec_aten/targets.bzl index 5664a2aea41..9114be639c0 100644 --- a/runtime/core/exec_aten/targets.bzl +++ b/runtime/core/exec_aten/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" # Depend on this target if your types (Tensor, ArrayRef, etc) should be flexible between ATen and executor diff --git a/runtime/core/exec_aten/testing_util/targets.bzl b/runtime/core/exec_aten/testing_util/targets.bzl index 446d0a97769..ed130c8706c 100644 --- a/runtime/core/exec_aten/testing_util/targets.bzl +++ b/runtime/core/exec_aten/testing_util/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -6,7 +6,7 @@ def define_common_targets(): The directory containing this targets.bzl file should also contain both TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( diff --git a/runtime/core/exec_aten/util/targets.bzl b/runtime/core/exec_aten/util/targets.bzl index 55e38d882fd..ac46da052ca 100644 --- a/runtime/core/exec_aten/util/targets.bzl +++ b/runtime/core/exec_aten/util/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" exported_preprocessor_flags_ = [] diff --git a/runtime/core/exec_aten/util/test/targets.bzl b/runtime/core/exec_aten/util/test/targets.bzl index 357e91eea3a..1fcf984e034 100644 --- a/runtime/core/exec_aten/util/test/targets.bzl +++ b/runtime/core/exec_aten/util/test/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -35,7 +35,7 @@ def define_common_targets(): ], ) - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" runtime.cxx_test( name = "tensor_util_test" + aten_suffix, diff --git a/runtime/core/targets.bzl b/runtime/core/targets.bzl index d67312beda3..3195e727d96 100644 --- a/runtime/core/targets.bzl +++ b/runtime/core/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def event_tracer_enabled(): return native.read_config("executorch", "event_tracer_enabled", "false") == "true" @@ -82,7 +82,7 @@ def define_common_targets(): ], ) - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( name = "evalue" + aten_suffix, diff --git a/runtime/core/test/targets.bzl b/runtime/core/test/targets.bzl index abe52bcadff..ef09c905674 100644 --- a/runtime/core/test/targets.bzl +++ b/runtime/core/test/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -102,7 +102,7 @@ def define_common_targets(): ], ) - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" runtime.cxx_test( diff --git a/runtime/executor/targets.bzl b/runtime/executor/targets.bzl index 67163ed8789..c5d07448a06 100644 --- a/runtime/executor/targets.bzl +++ b/runtime/executor/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def _program_preprocessor_flags(): """Returns the preprocessor_flags to use when building Program.cpp""" @@ -42,7 +42,7 @@ def define_common_targets(): ], ) - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" runtime.cxx_library( name = "program" + aten_suffix, diff --git a/runtime/executor/test/targets.bzl b/runtime/executor/test/targets.bzl index 922fa17ba75..1dbb4ea6108 100644 --- a/runtime/executor/test/targets.bzl +++ b/runtime/executor/test/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(is_fbcode = False): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(is_fbcode = False): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = ("_aten" if aten_mode else "") runtime.cxx_library( diff --git a/runtime/kernel/targets.bzl b/runtime/kernel/targets.bzl index e02c1288e55..d49435f2825 100644 --- a/runtime/kernel/targets.bzl +++ b/runtime/kernel/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def _operator_registry_preprocessor_flags(): max_kernel_num = native.read_config("executorch", "max_kernel_num", None) @@ -51,7 +51,7 @@ def define_common_targets(): preprocessor_flags = ["-DMAX_KERNEL_NUM=1"], ) - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" runtime.cxx_library( diff --git a/runtime/kernel/test/targets.bzl b/runtime/kernel/test/targets.bzl index 96e0c8c557c..bd66fc05b6f 100644 --- a/runtime/kernel/test/targets.bzl +++ b/runtime/kernel/test/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") load("@fbsource//xplat/executorch/codegen:codegen.bzl", "et_operator_library", "executorch_generated_lib") def define_common_targets(): @@ -88,7 +88,7 @@ def define_common_targets(): ], ) - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" runtime.cxx_test( diff --git a/shim_et/xplat/executorch/build/runtime_wrapper.bzl b/shim_et/xplat/executorch/build/runtime_wrapper.bzl index b81aabcd83f..5bfba568423 100644 --- a/shim_et/xplat/executorch/build/runtime_wrapper.bzl +++ b/shim_et/xplat/executorch/build/runtime_wrapper.bzl @@ -333,6 +333,9 @@ def get_oss_build_kwargs(): } return {} +def get_aten_mode_options(): + return (False,) if env.is_oss else (True, False) + # Names in this struct should match the standard Buck rule names if possible: # see the "Build Rules" section in the sidebar of # https://buck.build/concept/build_rule.html. diff --git a/test/utils/targets.bzl b/test/utils/targets.bzl index 93e33daf81f..249e7bdf2be 100644 --- a/test/utils/targets.bzl +++ b/test/utils/targets.bzl @@ -1,4 +1,4 @@ -load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "runtime") +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options", "runtime") def define_common_targets(): """Defines targets that should be shared between fbcode and xplat. @@ -7,7 +7,7 @@ def define_common_targets(): TARGETS and BUCK files that call this function. """ - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" runtime.cxx_library( diff --git a/third-party/gtest_defs.bzl b/third-party/gtest_defs.bzl index c1f4778b80c..ac8046e264d 100644 --- a/third-party/gtest_defs.bzl +++ b/third-party/gtest_defs.bzl @@ -1,3 +1,4 @@ +load("@fbsource//xplat/executorch/build:runtime_wrapper.bzl", "get_aten_mode_options") # Copied from fbsource/third-party/googletest COMPILER_FLAGS = [ @@ -17,7 +18,7 @@ def define_gtest_targets(): visibility = ["PUBLIC"], ) - for aten_mode in (True, False): + for aten_mode in get_aten_mode_options(): aten_suffix = "_aten" if aten_mode else "" # # Google Test From d85e2550bb58d1e8efad406e1fb37c44c7bd55ab Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Mon, 24 Feb 2025 18:07:41 -0800 Subject: [PATCH 2/2] Update [ghstack-poisoned] --- shim_et/xplat/executorch/build/runtime_wrapper.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/shim_et/xplat/executorch/build/runtime_wrapper.bzl b/shim_et/xplat/executorch/build/runtime_wrapper.bzl index 5bfba568423..79bc6c7e699 100644 --- a/shim_et/xplat/executorch/build/runtime_wrapper.bzl +++ b/shim_et/xplat/executorch/build/runtime_wrapper.bzl @@ -268,6 +268,7 @@ def _cxx_test(*args, **kwargs): kwargs["deps"].append("//executorch/test/utils:utils") _patch_kwargs_cxx(kwargs) + env.patch_headers(kwargs) _patch_build_mode_flags(kwargs) _patch_test_compiler_flags(kwargs)