diff options
| author | Ryan OShea <ryan.oshea3@arm.com> | 2023-03-07 11:44:23 +0000 |
|---|---|---|
| committer | ryan.oshea3 <ryan.oshea3@arm.com> | 2023-03-22 13:12:55 +0000 |
| commit | 238ecd9279f08a1b05189e03ffa73a9201b1c0ce (patch) | |
| tree | 942386ab532039fb423ac951f375c484352faece /shim | |
| parent | 3ec3077b4eaedcc0c20ab5774bdbe365da541445 (diff) | |
| download | armnn-238ecd9279f08a1b05189e03ffa73a9201b1c0ce.tar.gz | |
IVGCVSW-7526 Upgrade ArmNN to Tensorflow 2.12
When creating a flatbuffers model, we need to provide an empty buffer 0 that is
reserved by tensorflow. When creating empty buffers for inputs and outputs we
can not pass in an empty vector, or tflite will assume that we know how many bytes to
allocate in advance. Instead we need to only pass in the builder.
* Update libraries in FindTfLite.cmake
* Add nullptr to delegate struct for OpaqueDelegateBuilder
* Fix issue in unit tests where Flatbuffers model was not being parsed by tflite
* Tensorflow 2.12 now includes C++ 17 features. Update our cmake build
to require a compiler to support these features.
* Change minimum cmake in Arm NN to 3.7 as that's the minimum for the
delegate build.
Signed-off-by: Ryan OShea <ryan.oshea3@arm.com>
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: I7d15b196b8c59b1914f8fc1c4c2f8960630c069c
Diffstat (limited to 'shim')
| -rw-r--r-- | shim/sl/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/shim/sl/CMakeLists.txt b/shim/sl/CMakeLists.txt index e54101c932..a33c71f74b 100644 --- a/shim/sl/CMakeLists.txt +++ b/shim/sl/CMakeLists.txt @@ -1,11 +1,13 @@ # -# Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +# Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved. # SPDX-License-Identifier: MIT # cmake_minimum_required (VERSION 3.7.0) enable_language(ASM) project(armnn_support_library) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++17 -Wall -fexceptions -Werror -Wno-unused-parameter -Wno-unused-private-field -Wno-unused-variable -Wno-attributes -Wno-format-security -Wno-extern-c-compat -Wno-invalid-partial-specialization -Wno-unneeded-internal-declaration -Wno-unused-function -DNN_COMPATIBILITY_LIBRARY_BUILD -DNN_DEBUGGABLE") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -DOPENSSL_SMALL -DBORINGSSL_ANDROID_SYSTEM -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION") |