Skip to content

remove sleef_arm target #11082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −19
Open

remove sleef_arm target #11082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions kernels/optimized/lib_defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ def get_vec_deps():
# various ovr_configs are not available in oss
deps = select({
"ovr_config//os:iphoneos-arm64": [
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
] if not runtime.is_oss else [],
"ovr_config//os:macos-arm64": [
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
] if not runtime.is_oss else [],
"ovr_config//os:android-arm64": [
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
] if not runtime.is_oss else [],
"DEFAULT": [],
})
Expand Down Expand Up @@ -141,7 +141,7 @@ def define_libs(is_fbcode=False):
(
DEVSERVER_PLATFORM_REGEX,
[
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
],
),
],
Expand All @@ -150,7 +150,7 @@ def define_libs(is_fbcode=False):
(
"^android-arm64.*$",
[
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
],
),
],
Expand Down
2 changes: 1 addition & 1 deletion runtime/core/portable_type/c10/c10/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def define_common_targets():
exported_deps = select({
"DEFAULT": [],
"ovr_config//cpu:arm64": [
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
] if not runtime.is_oss else [],
# fbsource//third-party/sleef:sleef currently fails to
# link with missing symbols, hence the fbcode-specific dep below.
Expand Down
14 changes: 7 additions & 7 deletions shim_et/xplat/executorch/codegen/codegen.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,13 +522,13 @@ def build_optimized_lib(name, oplist_header_name, portable_header_lib, feature =
"//executorch/kernels/optimized:libblas",
"//executorch/kernels/optimized:libutils",
"//executorch/kernels/optimized:libvec",
"//executorch/kernels/portable/cpu/pattern:all_deps",
"//executorch/kernels/portable/cpu/pattern:all_deps",
"//executorch/kernels/portable/cpu/util:all_deps",
"//executorch/runtime/core/portable_type/c10/c10:aten_headers_for_executorch",
"//executorch/runtime/kernel:kernel_includes",
":" + portable_header_lib,
] + get_vec_deps()

# Build optimized lib.
runtime.cxx_library(
name = name,
Expand All @@ -546,7 +546,7 @@ def build_optimized_lib(name, oplist_header_name, portable_header_lib, feature =
(
"^android-arm64.*$",
[
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
],
),
],
Expand Down Expand Up @@ -655,7 +655,7 @@ def executorch_generated_lib(
If you have a custom kernel library, please remove `dtype_selective_build=True`
and use regular selective build.
""".format(kernel_deps))

# Dtype selective build requires that the portable/optimized kernel libraries are not passed into `deps`.
if ("//executorch/kernels/portable:operators" in kernel_deps):
index = 0
Expand Down Expand Up @@ -761,7 +761,7 @@ def executorch_generated_lib(
# Build portable headers lib. Used for portable and optimized kernel libraries.
portable_header_lib = name + "_portable_header_lib"
build_portable_header_lib(portable_header_lib, oplist_header_name, feature)

if "//executorch/kernels/portable:operators" in kernel_deps:
# Remove portable from kernel_deps as we're building it from source.
kernel_deps.remove("//executorch/kernels/portable:operators")
Expand All @@ -770,11 +770,11 @@ def executorch_generated_lib(
portable_lib_name = name + "_portable_lib"
build_portable_lib(portable_lib_name, oplist_header_name, portable_header_lib, feature, expose_operator_symbols)
portable_lib = [":{}".format(portable_lib_name)]

if "//executorch/kernels/optimized:optimized_operators" in kernel_deps:
# Remove optimized from kernel_deps as we're building it from source.
kernel_deps.remove("//executorch/kernels/optimized:optimized_operators")

# Build optimized lib.
optimized_lib_name = name + "_optimized_lib"
build_optimized_lib(optimized_lib_name, oplist_header_name, portable_header_lib, feature, expose_operator_symbols)
Expand Down
10 changes: 5 additions & 5 deletions shim_et/xplat/executorch/kernels/optimized/lib_defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ def get_vec_deps():
"fbsource//third-party/sleef:sleef",
] if not runtime.is_oss else [],
"ovr_config//os:iphoneos": [
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
] if not runtime.is_oss else [],
"ovr_config//os:macos-arm64": [
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
] if not runtime.is_oss else [],
"ovr_config//os:android-arm64": [
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
] if not runtime.is_oss else [],
"DEFAULT": [],
})
Expand Down Expand Up @@ -104,7 +104,7 @@ def define_libs():
(
DEVSERVER_PLATFORM_REGEX,
[
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
],
),
],
Expand All @@ -113,7 +113,7 @@ def define_libs():
(
"^android-arm64.*$",
[
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
],
),
],
Expand Down
2 changes: 1 addition & 1 deletion shim_et/xplat/executorch/kernels/optimized/op_registration_util.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def define_op_library(name, compiler_flags, deps):
(
"^android-arm64.*$",
[
"fbsource//third-party/sleef:sleef_arm",
"fbsource//third-party/sleef:sleef",
],
),
],
Expand Down
Loading