diff options
| author | Keith Davis <keith.davis@arm.com> | 2022-04-07 11:32:00 +0100 |
|---|---|---|
| committer | Ryan OShea <ryan.oshea3@arm.com> | 2022-05-19 11:05:15 +0100 |
| commit | 2cddc72f7aa1eab43c69250e608d662909383ba7 (patch) | |
| tree | 62c531bb82b96c14469c151c3738e1e0383e5972 /src/armnnSerializer/test/SerializerTestUtils.cpp | |
| parent | 85edad42b8b76e76c5d969e4bc380b0e8a845c9b (diff) | |
| download | armnn-2cddc72f7aa1eab43c69250e608d662909383ba7.tar.gz | |
IVGCVSW-6124 ConstTensorsAsInput: Conv2d - FrontEnd
* Update Front-end and Tools.
* Updated Serializer, Deserializer and unit tests to reflect this.
* Updated TfLiteDelegate, TfLiteParser and OnnxParser.
* Updated Ref.
* Fixed resulting Neon / CL tests
* Unified optimizers for conv2d ops
* Optimizer Fix - Fp32ToBf16
* Partial implementation for ACL backends to fix VTS failures
!android-nn-driver:7477
Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I5fb18877f7ee32643e15a9818945356274bb401b
Diffstat (limited to 'src/armnnSerializer/test/SerializerTestUtils.cpp')
| -rw-r--r-- | src/armnnSerializer/test/SerializerTestUtils.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/armnnSerializer/test/SerializerTestUtils.cpp b/src/armnnSerializer/test/SerializerTestUtils.cpp index cf2cb15b15..187384777d 100644 --- a/src/armnnSerializer/test/SerializerTestUtils.cpp +++ b/src/armnnSerializer/test/SerializerTestUtils.cpp @@ -51,17 +51,17 @@ void LayerVerifierBase::VerifyNameAndConnections(const armnn::IConnectableLayer* const armnn::TensorInfo& connectedInfo = connectedOutput->GetTensorInfo(); CHECK(connectedInfo.GetShape() == m_InputTensorInfos[i].GetShape()); - CHECK( - GetDataTypeName(connectedInfo.GetDataType()) == GetDataTypeName(m_InputTensorInfos[i].GetDataType())); + CHECK(GetDataTypeName(connectedInfo.GetDataType()) == GetDataTypeName(m_InputTensorInfos[i].GetDataType())); - // If weights and bias are connected to DepthwiseConvolution2d via Constant Layer we do not check. - // Constant Layer already disabled in SerializerTestUtils.hpp from entering function. - if (layer->GetType() == armnn::LayerType::DepthwiseConvolution2d && - connectedOutput->GetOwningIConnectableLayer().GetType() != armnn::LayerType::Constant) + if (connectedInfo.HasMultipleQuantizationScales()) + { + CHECK(connectedInfo.GetQuantizationScales() == m_InputTensorInfos[i].GetQuantizationScales()); + } + else { CHECK(connectedInfo.GetQuantizationScale() == m_InputTensorInfos[i].GetQuantizationScale()); - CHECK(connectedInfo.GetQuantizationOffset() == m_InputTensorInfos[i].GetQuantizationOffset()); } + CHECK(connectedInfo.GetQuantizationOffset() == m_InputTensorInfos[i].GetQuantizationOffset()); } for (unsigned int i = 0; i < m_OutputTensorInfos.size(); i++) |