From 238ecd9279f08a1b05189e03ffa73a9201b1c0ce Mon Sep 17 00:00:00 2001 From: Ryan OShea Date: Tue, 7 Mar 2023 11:44:23 +0000 Subject: 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 Signed-off-by: Narumol Prangnawarat Signed-off-by: Colm Donelan Change-Id: I7d15b196b8c59b1914f8fc1c4c2f8960630c069c --- cmake/GlobalConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/GlobalConfig.cmake') diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake index 0191b0d458..1f24fa537c 100644 --- a/cmake/GlobalConfig.cmake +++ b/cmake/GlobalConfig.cmake @@ -91,7 +91,7 @@ endif() # Compiler flags that are always set set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(COMPILER_IS_GNU_LIKE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Werror -Wold-style-cast -Wno-missing-braces -Wconversion -Wsign-conversion") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Wextra -Werror -Wold-style-cast -Wno-missing-braces -Wconversion -Wsign-conversion") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi") endif() -- cgit v1.2.1