Skip to content

Commit 47d5a61

Browse files
swolchokfacebook-github-bot
authored andcommitted
remove sleef_arm target
Summary: We shouldn't need an ARM-specific variant; we have select() where we should need it. Reviewed By: nlutsenko Differential Revision: D74356413
1 parent df5e7df commit 47d5a61

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

kernels/optimized/lib_defs.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ def get_vec_deps():
3737
# various ovr_configs are not available in oss
3838
deps = select({
3939
"ovr_config//os:iphoneos-arm64": [
40-
"fbsource//third-party/sleef:sleef_arm",
40+
"fbsource//third-party/sleef:sleef",
4141
] if not runtime.is_oss else [],
4242
"ovr_config//os:macos-arm64": [
43-
"fbsource//third-party/sleef:sleef_arm",
43+
"fbsource//third-party/sleef:sleef",
4444
] if not runtime.is_oss else [],
4545
"ovr_config//os:android-arm64": [
46-
"fbsource//third-party/sleef:sleef_arm",
46+
"fbsource//third-party/sleef:sleef",
4747
] if not runtime.is_oss else [],
4848
"DEFAULT": [],
4949
})
@@ -141,7 +141,7 @@ def define_libs(is_fbcode=False):
141141
(
142142
DEVSERVER_PLATFORM_REGEX,
143143
[
144-
"fbsource//third-party/sleef:sleef_arm",
144+
"fbsource//third-party/sleef:sleef",
145145
],
146146
),
147147
],
@@ -150,7 +150,7 @@ def define_libs(is_fbcode=False):
150150
(
151151
"^android-arm64.*$",
152152
[
153-
"fbsource//third-party/sleef:sleef_arm",
153+
"fbsource//third-party/sleef:sleef",
154154
],
155155
),
156156
],

runtime/core/portable_type/c10/c10/targets.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def define_common_targets():
5757
exported_deps = select({
5858
"DEFAULT": [],
5959
"ovr_config//cpu:arm64": [
60-
"fbsource//third-party/sleef:sleef_arm",
60+
"fbsource//third-party/sleef:sleef",
6161
] if not runtime.is_oss else [],
6262
# fbsource//third-party/sleef:sleef currently fails to
6363
# link with missing symbols, hence the fbcode-specific dep below.

shim_et/xplat/executorch/codegen/codegen.bzl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -522,13 +522,13 @@ def build_optimized_lib(name, oplist_header_name, portable_header_lib, feature =
522522
"//executorch/kernels/optimized:libblas",
523523
"//executorch/kernels/optimized:libutils",
524524
"//executorch/kernels/optimized:libvec",
525-
"//executorch/kernels/portable/cpu/pattern:all_deps",
525+
"//executorch/kernels/portable/cpu/pattern:all_deps",
526526
"//executorch/kernels/portable/cpu/util:all_deps",
527527
"//executorch/runtime/core/portable_type/c10/c10:aten_headers_for_executorch",
528528
"//executorch/runtime/kernel:kernel_includes",
529529
":" + portable_header_lib,
530530
] + get_vec_deps()
531-
531+
532532
# Build optimized lib.
533533
runtime.cxx_library(
534534
name = name,
@@ -546,7 +546,7 @@ def build_optimized_lib(name, oplist_header_name, portable_header_lib, feature =
546546
(
547547
"^android-arm64.*$",
548548
[
549-
"fbsource//third-party/sleef:sleef_arm",
549+
"fbsource//third-party/sleef:sleef",
550550
],
551551
),
552552
],
@@ -655,7 +655,7 @@ def executorch_generated_lib(
655655
If you have a custom kernel library, please remove `dtype_selective_build=True`
656656
and use regular selective build.
657657
""".format(kernel_deps))
658-
658+
659659
# Dtype selective build requires that the portable/optimized kernel libraries are not passed into `deps`.
660660
if ("//executorch/kernels/portable:operators" in kernel_deps):
661661
index = 0
@@ -761,7 +761,7 @@ def executorch_generated_lib(
761761
# Build portable headers lib. Used for portable and optimized kernel libraries.
762762
portable_header_lib = name + "_portable_header_lib"
763763
build_portable_header_lib(portable_header_lib, oplist_header_name, feature)
764-
764+
765765
if "//executorch/kernels/portable:operators" in kernel_deps:
766766
# Remove portable from kernel_deps as we're building it from source.
767767
kernel_deps.remove("//executorch/kernels/portable:operators")
@@ -770,11 +770,11 @@ def executorch_generated_lib(
770770
portable_lib_name = name + "_portable_lib"
771771
build_portable_lib(portable_lib_name, oplist_header_name, portable_header_lib, feature, expose_operator_symbols)
772772
portable_lib = [":{}".format(portable_lib_name)]
773-
773+
774774
if "//executorch/kernels/optimized:optimized_operators" in kernel_deps:
775775
# Remove optimized from kernel_deps as we're building it from source.
776776
kernel_deps.remove("//executorch/kernels/optimized:optimized_operators")
777-
777+
778778
# Build optimized lib.
779779
optimized_lib_name = name + "_optimized_lib"
780780
build_optimized_lib(optimized_lib_name, oplist_header_name, portable_header_lib, feature, expose_operator_symbols)

shim_et/xplat/executorch/kernels/optimized/lib_defs.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ def get_vec_deps():
4444
"fbsource//third-party/sleef:sleef",
4545
] if not runtime.is_oss else [],
4646
"ovr_config//os:iphoneos": [
47-
"fbsource//third-party/sleef:sleef_arm",
47+
"fbsource//third-party/sleef:sleef",
4848
] if not runtime.is_oss else [],
4949
"ovr_config//os:macos-arm64": [
50-
"fbsource//third-party/sleef:sleef_arm",
50+
"fbsource//third-party/sleef:sleef",
5151
] if not runtime.is_oss else [],
5252
"ovr_config//os:android-arm64": [
53-
"fbsource//third-party/sleef:sleef_arm",
53+
"fbsource//third-party/sleef:sleef",
5454
] if not runtime.is_oss else [],
5555
"DEFAULT": [],
5656
})
@@ -104,7 +104,7 @@ def define_libs():
104104
(
105105
DEVSERVER_PLATFORM_REGEX,
106106
[
107-
"fbsource//third-party/sleef:sleef_arm",
107+
"fbsource//third-party/sleef:sleef",
108108
],
109109
),
110110
],
@@ -113,7 +113,7 @@ def define_libs():
113113
(
114114
"^android-arm64.*$",
115115
[
116-
"fbsource//third-party/sleef:sleef_arm",
116+
"fbsource//third-party/sleef:sleef",
117117
],
118118
),
119119
],

shim_et/xplat/executorch/kernels/optimized/op_registration_util.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def define_op_library(name, compiler_flags, deps):
118118
(
119119
"^android-arm64.*$",
120120
[
121-
"fbsource//third-party/sleef:sleef_arm",
121+
"fbsource//third-party/sleef:sleef",
122122
],
123123
),
124124
],

0 commit comments

Comments
 (0)