aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFinn Williams <Finn.Williams@arm.com>2020-10-02 13:28:34 +0100
committerFinn Williams <Finn.Williams@arm.com>2020-10-02 13:28:34 +0100
commit4918446f3490e4edab86a5dc75aba3cdf74ae430 (patch)
tree3ee6b8ff57dc725167da953cc9dfba01b4dae819
parentcb31b3b8eb2ac538536999f40b65983b26eb82a4 (diff)
downloadandroid-nn-driver-4918446f3490e4edab86a5dc75aba3cdf74ae430.tar.gz
IVGCVSW-5356 Fix skipping VTS DynamicOutputShape FullyConnected
Signed-off-by: Finn Williams <Finn.Williams@arm.com> Change-Id: I011466158b6736670bafba474e8c9ce12c38e229
-rw-r--r--ConversionUtils.hpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index b9c4d411..5837d3df 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -3065,17 +3065,19 @@ bool ConvertFullyConnected(const HalOperation& operation, const HalModel& model,
desc.m_TransposeWeightMatrix = true;
desc.m_BiasEnabled = true;
- if (!VerifyFullyConnectedShapes(reshapedInfo.GetShape(),
- weights.GetInfo().GetShape(),
- outputInfo.GetShape(),
- desc.m_TransposeWeightMatrix))
- {
- return Fail("%s: Expected outputShape does not match actual outputShape", __func__);
- }
-
bool isSupported = false;
auto validateFunc = [&](const armnn::TensorInfo& outputInfo, bool& isSupported)
{
+ if (!VerifyFullyConnectedShapes(reshapedInfo.GetShape(),
+ weights.GetInfo().GetShape(),
+ outputInfo.GetShape(),
+ desc.m_TransposeWeightMatrix))
+ {
+ isSupported = false;
+ Fail("%s: Expected outputShape does not match actual outputShape", __func__);
+ return;
+ }
+
FORWARD_LAYER_SUPPORT_FUNC(__func__,
IsFullyConnectedSupported,
data.m_Backends,