From 76d0c4c6ff4f2dc71f9d3a73ad6f051d2562135b Mon Sep 17 00:00:00 2001
From: Matthew Sloyan <matthew.sloyan@arm.com>
Date: Thu, 7 Sep 2023 14:48:56 +0100
Subject: IVGCVSW-7954 Upgrade Arm NN to Tensorflow 2.14

 * Added initializers for async_kernel and inplace_operator during
   Classic Delegate registration.
 * Updated failing Delegate unit tests.
 * Updated experimental Opaque Delegate header paths.
 * Updated libraries in FindTfLite.cmake for building with a debug
   TensorFlow build.
 * Update get_tensorflow.sh to TensorFlow 2.14

Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Signed-off-by: Idriss Chaouch <idriss.chaouch@arm.com>
Change-Id: I084d54bcd1cd941d7cab8122bc244d94821ce6fc
---
 delegate/opaque/CMakeLists.txt                       | 2 +-
 delegate/opaque/include/armnn_delegate.hpp           | 5 +++--
 delegate/opaque/src/test/ArmnnOpaqueDelegateTest.cpp | 4 ----
 3 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'delegate/opaque')

diff --git a/delegate/opaque/CMakeLists.txt b/delegate/opaque/CMakeLists.txt
index 365e0166ba..abbf38d071 100644
--- a/delegate/opaque/CMakeLists.txt
+++ b/delegate/opaque/CMakeLists.txt
@@ -92,7 +92,7 @@ target_include_directories(flatbuffer_headers_opaque
         INTERFACE 
             $<BUILD_INTERFACE:${Flatbuffers_INCLUDE_DIR}>
             $<INSTALL_INTERFACE:include/flatbuffer_headers_opaque>)
-target_compile_options(flatbuffer_headers_opaque INTERFACE -Wno-sign-conversion)
+target_compile_options(flatbuffer_headers_opaque INTERFACE -Wno-sign-conversion -Wno-sign-compare)
 
 target_link_libraries(armnnOpaqueDelegateObject PUBLIC flatbuffer_headers_opaque)
 
diff --git a/delegate/opaque/include/armnn_delegate.hpp b/delegate/opaque/include/armnn_delegate.hpp
index ff860c4b1c..474d5978c9 100644
--- a/delegate/opaque/include/armnn_delegate.hpp
+++ b/delegate/opaque/include/armnn_delegate.hpp
@@ -10,8 +10,9 @@
 
 #include <tensorflow/core/public/version.h>
 #include <tensorflow/lite/c/c_api_opaque.h>
-#include <tensorflow/lite/core/experimental/acceleration/configuration/c/stable_delegate.h>
-#include <tensorflow/lite/experimental/acceleration/configuration/delegate_registry.h>
+
+#include <tensorflow/lite/acceleration/configuration/delegate_registry.h>
+#include <tensorflow/lite/core/acceleration/configuration/c/stable_delegate.h>
 
 #if TF_MAJOR_VERSION > 2 || (TF_MAJOR_VERSION == 2 && TF_MINOR_VERSION > 5)
 #define ARMNN_POST_TFLITE_2_5
diff --git a/delegate/opaque/src/test/ArmnnOpaqueDelegateTest.cpp b/delegate/opaque/src/test/ArmnnOpaqueDelegateTest.cpp
index 2669bc8480..9d255b1126 100644
--- a/delegate/opaque/src/test/ArmnnOpaqueDelegateTest.cpp
+++ b/delegate/opaque/src/test/ArmnnOpaqueDelegateTest.cpp
@@ -7,10 +7,6 @@
 #include <doctest/doctest.h>
 
 #include <opaque/include/armnn_delegate.hpp>
-#include <opaque/include/Version.hpp>
-
-#include <flatbuffers/flatbuffers.h>
-#include <tensorflow/lite/experimental/acceleration/configuration/delegate_registry.h>
 
 namespace armnnOpaqueDelegate
 {
-- 
cgit v1.2.1