diff options
| author | Matthew Sloyan <matthew.sloyan@arm.com> | 2023-09-07 14:48:56 +0100 |
|---|---|---|
| committer | Ciara Sookarry <ciara.sookarry@arm.com> | 2023-09-22 17:11:45 +0100 |
| commit | 76d0c4c6ff4f2dc71f9d3a73ad6f051d2562135b (patch) | |
| tree | 0346782a60c9e1af620fc1c8a664d6a80d0a36b9 /delegate/opaque | |
| parent | d631463a585fd9fde9f11bd7d07d7ef1c10560c0 (diff) | |
| download | armnn-76d0c4c6ff4f2dc71f9d3a73ad6f051d2562135b.tar.gz | |
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
Diffstat (limited to 'delegate/opaque')
| -rw-r--r-- | delegate/opaque/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | delegate/opaque/include/armnn_delegate.hpp | 5 | ||||
| -rw-r--r-- | delegate/opaque/src/test/ArmnnOpaqueDelegateTest.cpp | 4 |
3 files changed, 4 insertions, 7 deletions
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 { |