From 23d1e472b2c4e15fc76946924a079ab58c18d5ff Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 28 Jun 2019 16:08:14 -0700
Subject: [PATCH] Unconditionally link with all three of portable, NEON, and
SSE tensor utils. This resolves some compilation issues on OS+CPU
combinations not handled in the switch. NEON and SSE versions don't define
any symbols to link if the appropriate instruction set is not available.
PiperOrigin-RevId: 255686326
---
tensorflow/lite/kernels/internal/BUILD | 56 +++-----------------------
1 file changed, 5 insertions(+), 51 deletions(-)
diff --git a/tensorflow/lite/kernels/internal/BUILD b/tensorflow/lite/kernels/internal/BUILD
index 9b4e65c6eb7..c1d4d9bf0b3 100644
--- a/tensorflow/lite/kernels/internal/BUILD
+++ b/tensorflow/lite/kernels/internal/BUILD
@@ -568,62 +568,16 @@ cc_library(
":common",
":compatibility",
":cpu_check",
+ ":neon_tensor_utils",
+ ":portable_tensor_utils",
+ ":sse_tensor_utils",
":types",
"//tensorflow/lite/c:c_api_internal",
- "@arm_neon_2_x86_sse",
"//tensorflow/lite/kernels:cpu_backend_context",
"//tensorflow/lite/kernels:op_macros",
+ "@arm_neon_2_x86_sse",
"@gemmlowp//:fixedpoint",
- ] + select({
- ":aarch64": [
- ":neon_tensor_utils",
- ],
- ":arm": [
- ":neon_tensor_utils",
- ],
- ":arm64-v8a": [
- ":neon_tensor_utils",
- ],
- ":armeabi-v7a": [
- ":neon_tensor_utils",
- ],
- ":armv7a": [
- ":neon_tensor_utils",
- ],
- ":haswell": [
- ":sse_tensor_utils",
- ],
- ":ios_armv7": [
- ":neon_tensor_utils",
- ],
- ":ios_arm64": [
- ":neon_tensor_utils",
- ],
- ":ios_x86_64": [
- ":sse_tensor_utils",
- ],
- ":x86_64": [
- ":sse_tensor_utils",
- ],
- ":x86": [
- ":sse_tensor_utils",
- ],
- ":k8": [
- ":sse_tensor_utils",
- ],
- ":darwin": [
- ":sse_tensor_utils",
- ],
- ":darwin_x86_64": [
- ":sse_tensor_utils",
- ],
- ":freebsd": [
- ":sse_tensor_utils",
- ],
- "//conditions:default": [
- ":portable_tensor_utils",
- ],
- }),
+ ],
)
cc_library(