From 1f140f7226c4ed7bc5cbaf2ce09654eee452f4bf Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Tue, 6 Apr 2021 12:25:55 +0100 Subject: MLCE-328 Serializer/Deserializer does not support Signed64 * Added support for Signed64 to flatbuffer's schema & updated source tree * Added support for Signed64 to TFLite Delegate * Added support for Signed64 to Serializer * Added support for Signed64 to Deserializer * Added unit test for ArgMinMax to Deserializer * Deprecated m_Output_Type from the ArgMinMaxDescriptor: the output type is solely determined by the DataType of the output Tensor * Fixed issue where RefArgMinMaxWorkload could output data using the wrong DataType * Added Signed64 to RefLayerSupport::IsArgMinMaxSupported as a supported type Signed-off-by: Mike Kelly Signed-off-by: Matthew Sloyan Change-Id: Ib622c052a1f8aa3e658262f8bde5a6881a8cbe10 --- src/armnnSerializer/test/SerializerTests.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/armnnSerializer/test/SerializerTests.cpp') diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index d7c10cb599..9d44354cdd 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -76,11 +76,11 @@ BOOST_AUTO_TEST_CASE(SerializeAddition) deserializedNetwork->ExecuteStrategy(verifier); } -BOOST_AUTO_TEST_CASE(SerializeArgMinMax) +void SerializeArgMinMaxTest(armnn::DataType dataType) { const std::string layerName("argminmax"); const armnn::TensorInfo inputInfo({1, 2, 3}, armnn::DataType::Float32); - const armnn::TensorInfo outputInfo({1, 3}, armnn::DataType::Signed32); + const armnn::TensorInfo outputInfo({1, 3}, dataType); armnn::ArgMinMaxDescriptor descriptor; descriptor.m_Function = armnn::ArgMinMaxFunction::Max; @@ -107,6 +107,16 @@ BOOST_AUTO_TEST_CASE(SerializeArgMinMax) deserializedNetwork->ExecuteStrategy(verifier); } +BOOST_AUTO_TEST_CASE(SerializeArgMinMaxSigned32) +{ + SerializeArgMinMaxTest(armnn::DataType::Signed32); +} + +BOOST_AUTO_TEST_CASE(SerializeArgMinMaxSigned64) +{ + SerializeArgMinMaxTest(armnn::DataType::Signed64); +} + BOOST_AUTO_TEST_CASE(SerializeBatchNormalization) { const std::string layerName("batchNormalization"); -- cgit v1.2.1