From ebe392df1635790bf21714549adb97f2f75559e1 Mon Sep 17 00:00:00 2001 From: Matthew Sloyan Date: Thu, 30 Mar 2023 10:12:08 +0100 Subject: IVGCVSW-7562 Implement DelegateTestInterpreter for classic delegate * Updated all tests to use new DelegateTestInterpreter. * Fixed some unit tests where the shape was incorrect. * Add file identifier to FlatBuffersBuilder, as it is required for validation when creating the model using new API. Signed-off-by: Matthew Sloyan Change-Id: I1c4f5464367b35d4528571fa94d14bfaef18fb4d --- delegate/test/TestUtils.hpp | 58 ++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 43 deletions(-) (limited to 'delegate/test/TestUtils.hpp') diff --git a/delegate/test/TestUtils.hpp b/delegate/test/TestUtils.hpp index 95dd257c92..ba81cd8d56 100644 --- a/delegate/test/TestUtils.hpp +++ b/delegate/test/TestUtils.hpp @@ -17,26 +17,12 @@ using Half = half_float::half; namespace armnnDelegate { -/// Can be used to assign input data from a vector to a model input. -/// Example usage can be found in ResizeTesthelper.hpp -template -void FillInput(std::unique_ptr& interpreter, int inputIndex, std::vector& inputValues) -{ - auto tfLiteDelegateInputId = interpreter->inputs()[inputIndex]; - auto tfLiteDelageInputData = interpreter->typed_tensor(tfLiteDelegateInputId); - for (unsigned int i = 0; i < inputValues.size(); ++i) - { - tfLiteDelageInputData[i] = inputValues[i]; - } -} - -template <> -void FillInput(std::unique_ptr& interpreter, int inputIndex, std::vector& inputValues); +constexpr const char* FILE_IDENTIFIER = "TFL3"; /// Can be used to compare bool data coming from a tflite interpreter /// Boolean types get converted to a bit representation in a vector. vector.data() returns a void pointer /// instead of a pointer to bool. Therefore a special function to compare to vector of bool is required -void CompareData(std::vector& tensor1, bool tensor2[], size_t tensorSize); +void CompareData(std::vector& tensor1, std::vector& tensor2, size_t tensorSize); void CompareData(bool tensor1[], bool tensor2[], size_t tensorSize); /// Can be used to compare float data coming from a tflite interpreter with a tolerance of limit_of_float*100 @@ -66,36 +52,22 @@ void CompareData(TfLiteFloat16 tensor1[], TfLiteFloat16 tensor2[], size_t tensor /// Can be used to compare Half (Float16) data and TfLiteFloat16 data coming from a tflite interpreter void CompareData(TfLiteFloat16 tensor1[], Half tensor2[], size_t tensorSize); -/// Can be used to compare the output tensor shape and values -/// from armnnDelegateInterpreter and tfLiteInterpreter. +/// Can be used to compare the output tensor shape +/// Example usage can be found in ControlTestHelper.hpp +void CompareOutputShape(const std::vector& tfLiteDelegateShape, + const std::vector& armnnDelegateShape, + const std::vector& expectedOutputShape); + +/// Can be used to compare the output tensor values /// Example usage can be found in ControlTestHelper.hpp template -void CompareOutputData(std::unique_ptr& tfLiteInterpreter, - std::unique_ptr& armnnDelegateInterpreter, - std::vector& expectedOutputShape, - std::vector& expectedOutputValues, - unsigned int outputIndex = 0) +void CompareOutputData(std::vector& tfLiteDelegateOutputs, + std::vector& armnnDelegateOutputs, + std::vector& expectedOutputValues) { - auto tfLiteDelegateOutputId = tfLiteInterpreter->outputs()[outputIndex]; - auto tfLiteDelegateOutputTensor = tfLiteInterpreter->tensor(tfLiteDelegateOutputId); - auto tfLiteDelegateOutputData = tfLiteInterpreter->typed_tensor(tfLiteDelegateOutputId); - auto armnnDelegateOutputId = armnnDelegateInterpreter->outputs()[outputIndex]; - auto armnnDelegateOutputTensor = armnnDelegateInterpreter->tensor(armnnDelegateOutputId); - auto armnnDelegateOutputData = armnnDelegateInterpreter->typed_tensor(armnnDelegateOutputId); - - CHECK(expectedOutputShape.size() == tfLiteDelegateOutputTensor->dims->size); - CHECK(expectedOutputShape.size() == armnnDelegateOutputTensor->dims->size); - - for (size_t i = 0; i < expectedOutputShape.size(); i++) - { - CHECK(expectedOutputShape[i] == armnnDelegateOutputTensor->dims->data[i]); - CHECK(tfLiteDelegateOutputTensor->dims->data[i] == expectedOutputShape[i]); - CHECK(tfLiteDelegateOutputTensor->dims->data[i] == armnnDelegateOutputTensor->dims->data[i]); - } - - armnnDelegate::CompareData(expectedOutputValues.data(), armnnDelegateOutputData , expectedOutputValues.size()); - armnnDelegate::CompareData(tfLiteDelegateOutputData , expectedOutputValues.data(), expectedOutputValues.size()); - armnnDelegate::CompareData(tfLiteDelegateOutputData , armnnDelegateOutputData , expectedOutputValues.size()); + armnnDelegate::CompareData(expectedOutputValues.data(), armnnDelegateOutputs.data(), expectedOutputValues.size()); + armnnDelegate::CompareData(tfLiteDelegateOutputs.data(), expectedOutputValues.data(), expectedOutputValues.size()); + armnnDelegate::CompareData(tfLiteDelegateOutputs.data(), armnnDelegateOutputs.data(), expectedOutputValues.size()); } } // namespace armnnDelegate -- cgit v1.2.1