From 347fef645bda9466147042aca3de6ce7f8fecd0a Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Wed, 25 Mar 2020 16:24:21 +0800 Subject: [PATCH 1/3] [tflite] make label_image build label_image depends on old gpu:gl_delegate, which no long built. update the dependency to use use gpu:delegate --- tensorflow/lite/examples/label_image/BUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tensorflow/lite/examples/label_image/BUILD b/tensorflow/lite/examples/label_image/BUILD index b3dd0764330..a6113db77fd 100644 --- a/tensorflow/lite/examples/label_image/BUILD +++ b/tensorflow/lite/examples/label_image/BUILD @@ -39,11 +39,11 @@ cc_binary( "@com_google_absl//absl/memory", ] + select({ "//tensorflow:android": [ - "//tensorflow/lite/delegates/gpu:gl_delegate", + "//tensorflow/lite/delegates/gpu:delegate", "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", ], "//tensorflow:android_arm64": [ - "//tensorflow/lite/delegates/gpu:gl_delegate", + "//tensorflow/lite/delegates/gpu:delegate", "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", ], "//conditions:default": [], @@ -67,11 +67,11 @@ cc_library( "//tensorflow/lite/schema:schema_fbs", ] + select({ "//tensorflow:android": [ - "//tensorflow/lite/delegates/gpu:gl_delegate", + "//tensorflow/lite/delegates/gpu:delegate", "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", ], "//tensorflow:android_arm64": [ - "//tensorflow/lite/delegates/gpu:gl_delegate", + "//tensorflow/lite/delegates/gpu:delegate", "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", ], "//conditions:default": [], From 1e00a5a770b890760f761f9ab2a74bb9010f216d Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Thu, 2 Apr 2020 11:53:44 +0800 Subject: [PATCH 2/3] include delegate headers include GPU and Hexagon delegate headers explicitly --- tensorflow/lite/examples/label_image/label_image.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tensorflow/lite/examples/label_image/label_image.cc b/tensorflow/lite/examples/label_image/label_image.cc index b493fafa839..6b01428406c 100644 --- a/tensorflow/lite/examples/label_image/label_image.cc +++ b/tensorflow/lite/examples/label_image/label_image.cc @@ -45,6 +45,13 @@ limitations under the License. #include "tensorflow/lite/string_util.h" #include "tensorflow/lite/tools/evaluation/utils.h" +#if defined(__ANDROID__) +#include "tensorflow/lite/delegates/gpu/delegate.h" +#if (defined(__arm__) || defined(__aarch64__)) +#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h" +#endif +#endif + #define LOG(x) std::cerr namespace tflite { From 0abb6c9c7de552a6e5c942a637a77c252ba17c12 Mon Sep 17 00:00:00 2001 From: Koan-Sin Tan Date: Mon, 6 Apr 2020 12:33:13 +0800 Subject: [PATCH 3/3] don't include unnecessary hexagon header --- tensorflow/lite/examples/label_image/label_image.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tensorflow/lite/examples/label_image/label_image.cc b/tensorflow/lite/examples/label_image/label_image.cc index 6b01428406c..f68b793263d 100644 --- a/tensorflow/lite/examples/label_image/label_image.cc +++ b/tensorflow/lite/examples/label_image/label_image.cc @@ -36,6 +36,9 @@ limitations under the License. #include #include "absl/memory/memory.h" +#if defined(__ANDROID__) +#include "tensorflow/lite/delegates/gpu/delegate.h" +#endif #include "tensorflow/lite/delegates/nnapi/nnapi_delegate.h" #include "tensorflow/lite/examples/label_image/bitmap_helpers.h" #include "tensorflow/lite/examples/label_image/get_top_n.h" @@ -45,13 +48,6 @@ limitations under the License. #include "tensorflow/lite/string_util.h" #include "tensorflow/lite/tools/evaluation/utils.h" -#if defined(__ANDROID__) -#include "tensorflow/lite/delegates/gpu/delegate.h" -#if (defined(__arm__) || defined(__aarch64__)) -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h" -#endif -#endif - #define LOG(x) std::cerr namespace tflite {