From cfb8cb1bb1c198dbd1010d0adfa942c94548c3a6 Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Fri, 14 Aug 2020 20:47:30 +0800 Subject: [PATCH 1/5] make `//tensorflow/lite/kernels:all` build make ``` bazel build --config android_arm64 //tensorflow/lite/kernels:all ``` works --- tensorflow/lite/kernels/BUILD | 19 +++++++++++++++++++ tensorflow/lite/kernels/kernel_util_test.cc | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/tensorflow/lite/kernels/BUILD b/tensorflow/lite/kernels/BUILD index a56d370afeb..f1aa5fa04fd 100644 --- a/tensorflow/lite/kernels/BUILD +++ b/tensorflow/lite/kernels/BUILD @@ -1,4 +1,5 @@ load("//tensorflow/lite:build_def.bzl", "tflite_copts") +load("//tensorflow/lite:build_def.bzl", "tflite_linkopts") load("//tensorflow/lite/micro:build_def.bzl", "micro_copts") load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite_combined") load("//tensorflow:tensorflow.bzl", "tf_opts_nortti_if_android") @@ -150,6 +151,12 @@ cc_library( "@com_google_absl//absl/types:optional", "@com_googlesource_code_re2//:re2", ], + linkopts = tflite_linkopts() + select({ + "//tensorflow:android": [ + "-lm", + ], + "//conditions:default": [], + }), ) cc_test( @@ -277,6 +284,12 @@ cc_test( "//third_party/eigen3", "@com_google_googletest//:gtest", ], + linkopts = tflite_linkopts() + select({ + "//tensorflow:android": [ + "-lm", + ], + "//conditions:default": [], + }), ) cc_library( @@ -460,6 +473,12 @@ cc_test( "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], + linkopts = tflite_linkopts() + select({ + "//tensorflow:android": [ + "-lm" + ], + "//conditions:default": [], + }), ) cc_test( diff --git a/tensorflow/lite/kernels/kernel_util_test.cc b/tensorflow/lite/kernels/kernel_util_test.cc index db0cc3cb39c..cd49a7797ec 100644 --- a/tensorflow/lite/kernels/kernel_util_test.cc +++ b/tensorflow/lite/kernels/kernel_util_test.cc @@ -14,11 +14,11 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/kernel_util.h" -#include #include #include #include +#include #include #include From d6db5705297a3a50cd8b351ab51886202b49de64 Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Thu, 17 Sep 2020 22:44:51 +0800 Subject: [PATCH 2/5] per review comments --- tensorflow/lite/kernels/BUILD | 24 ++++++++------------- tensorflow/lite/kernels/kernel_util_test.cc | 2 +- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/tensorflow/lite/kernels/BUILD b/tensorflow/lite/kernels/BUILD index f1aa5fa04fd..dae8112f661 100644 --- a/tensorflow/lite/kernels/BUILD +++ b/tensorflow/lite/kernels/BUILD @@ -151,11 +151,9 @@ cc_library( "@com_google_absl//absl/types:optional", "@com_googlesource_code_re2//:re2", ], - linkopts = tflite_linkopts() + select({ - "//tensorflow:android": [ - "-lm", - ], - "//conditions:default": [], + linkopts = select({ + "//tensorflow:windows": [], + "//conditions:default": ["-lm"], }), ) @@ -284,11 +282,9 @@ cc_test( "//third_party/eigen3", "@com_google_googletest//:gtest", ], - linkopts = tflite_linkopts() + select({ - "//tensorflow:android": [ - "-lm", - ], - "//conditions:default": [], + linkopts = select({ + "//tensorflow:windows": [], + "//conditions:default": ["-lm"], }), ) @@ -473,11 +469,9 @@ cc_test( "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], - linkopts = tflite_linkopts() + select({ - "//tensorflow:android": [ - "-lm" - ], - "//conditions:default": [], + linkopts = select({ + "//tensorflow:windows": [], + "//conditions:default": ["-lm"], }), ) diff --git a/tensorflow/lite/kernels/kernel_util_test.cc b/tensorflow/lite/kernels/kernel_util_test.cc index cd49a7797ec..db0cc3cb39c 100644 --- a/tensorflow/lite/kernels/kernel_util_test.cc +++ b/tensorflow/lite/kernels/kernel_util_test.cc @@ -14,11 +14,11 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/kernel_util.h" +#include #include #include #include -#include #include #include From 30c22604a50f912ec0fe865809f3dfdf1f5adc88 Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Fri, 18 Sep 2020 12:31:50 +0800 Subject: [PATCH 3/5] reformat BUILD with buildifier --- tensorflow/lite/kernels/BUILD | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tensorflow/lite/kernels/BUILD b/tensorflow/lite/kernels/BUILD index dae8112f661..80ef667b4f8 100644 --- a/tensorflow/lite/kernels/BUILD +++ b/tensorflow/lite/kernels/BUILD @@ -146,15 +146,15 @@ cc_library( "acceleration_test_util_internal.cc", ], hdrs = ["acceleration_test_util_internal.h"], + linkopts = select({ + "//tensorflow:windows": [], + "//conditions:default": ["-lm"], + }), deps = [ "//tensorflow/lite:minimal_logging", "@com_google_absl//absl/types:optional", "@com_googlesource_code_re2//:re2", ], - linkopts = select({ - "//tensorflow:windows": [], - "//conditions:default": ["-lm"], - }), ) cc_test( @@ -275,6 +275,10 @@ cc_test( name = "eigen_support_test", size = "small", srcs = ["eigen_support_test.cc"], + linkopts = select({ + "//tensorflow:windows": [], + "//conditions:default": ["-lm"], + }), deps = [ ":eigen_support", "//tensorflow/lite/c:common", @@ -282,10 +286,6 @@ cc_test( "//third_party/eigen3", "@com_google_googletest//:gtest", ], - linkopts = select({ - "//tensorflow:windows": [], - "//conditions:default": ["-lm"], - }), ) cc_library( @@ -463,16 +463,16 @@ cc_test( name = "kernel_util_test", size = "small", srcs = ["kernel_util_test.cc"], + linkopts = select({ + "//tensorflow:windows": [], + "//conditions:default": ["-lm"], + }), deps = [ ":kernel_util", "//tensorflow/lite/c:common", "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], - linkopts = select({ - "//tensorflow:windows": [], - "//conditions:default": ["-lm"], - }), ) cc_test( From 3643b85131938b70de41c69fd607921102ac9c4b Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Mon, 21 Sep 2020 13:03:35 +0800 Subject: [PATCH 4/5] per review comment merge first two lines in BUILD --- tensorflow/lite/kernels/BUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tensorflow/lite/kernels/BUILD b/tensorflow/lite/kernels/BUILD index 80ef667b4f8..cdf265164ff 100644 --- a/tensorflow/lite/kernels/BUILD +++ b/tensorflow/lite/kernels/BUILD @@ -1,5 +1,4 @@ -load("//tensorflow/lite:build_def.bzl", "tflite_copts") -load("//tensorflow/lite:build_def.bzl", "tflite_linkopts") +load("//tensorflow/lite:build_def.bzl", "tflite_copts", "tflite_linkopts") load("//tensorflow/lite/micro:build_def.bzl", "micro_copts") load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite_combined") load("//tensorflow:tensorflow.bzl", "tf_opts_nortti_if_android") From 46deac04537f5583ff4f57a3acd71ccf6fd6d275 Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Mon, 21 Sep 2020 14:03:54 +0800 Subject: [PATCH 5/5] we actually don't need tflite_linkopts anymore so remove it --- tensorflow/lite/kernels/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow/lite/kernels/BUILD b/tensorflow/lite/kernels/BUILD index cdf265164ff..baaf2d1d118 100644 --- a/tensorflow/lite/kernels/BUILD +++ b/tensorflow/lite/kernels/BUILD @@ -1,4 +1,4 @@ -load("//tensorflow/lite:build_def.bzl", "tflite_copts", "tflite_linkopts") +load("//tensorflow/lite:build_def.bzl", "tflite_copts") load("//tensorflow/lite/micro:build_def.bzl", "micro_copts") load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite_combined") load("//tensorflow:tensorflow.bzl", "tf_opts_nortti_if_android")