diff options
| author | Keith Davis <keith.davis@arm.com> | 2021-01-27 13:12:03 +0000 |
|---|---|---|
| committer | KeithARM <keith.davis@arm.com> | 2021-01-28 14:05:31 +0000 |
| commit | bbc876c0b7046d6cc3aa9a8d64f80a755027d0cf (patch) | |
| tree | 521a14cee6ad3409a6c4536fa81f84098bc41518 /delegate | |
| parent | e8a2d5db38d8a32e1cf09a11009faaff5d060940 (diff) | |
| download | armnn-bbc876c0b7046d6cc3aa9a8d64f80a755027d0cf.tar.gz | |
IVGCVSW-5374 Provide Android Build for Delegate
* Remove double brackets for scalars
* Add in extra location in cmake for tf lite dynamic library
Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I31ef9a955d4677faabedc0068ae2cfbfe570b58c
Diffstat (limited to 'delegate')
| -rw-r--r-- | delegate/cmake/Modules/FindTfLite.cmake | 3 | ||||
| -rw-r--r-- | delegate/src/test/ArgMinMaxTestHelper.hpp | 4 | ||||
| -rw-r--r-- | delegate/src/test/PadTestHelper.hpp | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/delegate/cmake/Modules/FindTfLite.cmake b/delegate/cmake/Modules/FindTfLite.cmake index 18d6032147..41f55e3e8d 100644 --- a/delegate/cmake/Modules/FindTfLite.cmake +++ b/delegate/cmake/Modules/FindTfLite.cmake @@ -18,7 +18,8 @@ find_library(TfLite_LIB "libtensorflow_lite_all.so" "libtensorflowlite.so" HINTS - ${TFLITE_LIB_ROOT}) + ${TFLITE_LIB_ROOT} + ${TFLITE_LIB_ROOT}/tensorflow/lite) find_path(TfLite_Schema_INCLUDE_PATH schema_generated.h diff --git a/delegate/src/test/ArgMinMaxTestHelper.hpp b/delegate/src/test/ArgMinMaxTestHelper.hpp index d071653ac7..a734c819f9 100644 --- a/delegate/src/test/ArgMinMaxTestHelper.hpp +++ b/delegate/src/test/ArgMinMaxTestHelper.hpp @@ -88,7 +88,7 @@ std::vector<char> CreateArgMinMaxTfLiteModel(tflite::BuiltinOperator argMinMaxOp } // create operator - const std::vector<int32_t> operatorOutputs{{ 2 }}; + const std::vector<int32_t> operatorOutputs{ 2 }; flatbuffers::Offset <Operator> argMinMaxOperator = CreateOperator(flatBufferBuilder, 0, @@ -97,7 +97,7 @@ std::vector<char> CreateArgMinMaxTfLiteModel(tflite::BuiltinOperator argMinMaxOp operatorBuiltinOptionsType, operatorBuiltinOptions); - const std::vector<int> subgraphOutputs{{ 2 }}; + const std::vector<int> subgraphOutputs{ 2 }; flatbuffers::Offset <SubGraph> subgraph = CreateSubGraph(flatBufferBuilder, flatBufferBuilder.CreateVector(tensors.data(), tensors.size()), diff --git a/delegate/src/test/PadTestHelper.hpp b/delegate/src/test/PadTestHelper.hpp index 025d13df67..3d6e6493d9 100644 --- a/delegate/src/test/PadTestHelper.hpp +++ b/delegate/src/test/PadTestHelper.hpp @@ -115,7 +115,7 @@ std::vector<char> CreatePadTfLiteModel( } // create operator - const std::vector<int32_t> operatorOutputs{{ 2 }}; + const std::vector<int32_t> operatorOutputs{ 2 }; flatbuffers::Offset <Operator> redefineOperator = CreateOperator(flatBufferBuilder, 0, @@ -124,7 +124,7 @@ std::vector<char> CreatePadTfLiteModel( operatorBuiltinOptionsType, operatorBuiltinOptions); - const std::vector<int> subgraphOutputs{{ 2 }}; + const std::vector<int> subgraphOutputs{ 2 }; flatbuffers::Offset <SubGraph> subgraph = CreateSubGraph(flatBufferBuilder, flatBufferBuilder.CreateVector(tensors.data(), tensors.size()), @@ -211,4 +211,4 @@ void PadTest(tflite::BuiltinOperator padOperatorCode, armnnDelegate::CompareOutputData<T>(tfLiteInterpreter, armnnDelegateInterpreter, outputShape, expectedOutputValues); } -} // anonymous namespace
\ No newline at end of file +} // anonymous namespace |