aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Virginas-Tar <Aron.Virginas-Tar@arm.com>2019-07-16 13:17:06 +0100
committerÁron Virginás-Tar <aron.virginas-tar@arm.com>2019-07-16 12:59:14 +0000
commitd759323d159a50298af937dfb2c519025efe3900 (patch)
treec4d23a62347c5d86a28cca1bc850a1dddcfc025c
parentd30093c755b7e4e354eb537272876ec95b0eddc9 (diff)
downloadandroid-nn-driver-d759323d159a50298af937dfb2c519025efe3900.tar.gz
IVGCVSW-3306 Fix build errors in 1.2/HalPolicy.cpp
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Change-Id: I0c76de5f7aead831ed699e6e136e628edfccc2f5
-rw-r--r--1.2/HalPolicy.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index 4cac12ad..a82db80b 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -480,19 +480,23 @@ bool HalPolicy::ConvertMaximum(const Operation& operation, const Model& model, C
return Fail("%s: Could not read output", __func__);
}
- const armnn::TensorInfo& outInfo = GetTensorInfoForOperand(*outputOperand);
+ armnn::TensorInfo outInfo = GetTensorInfoForOperand(*outputOperand);
if (IsDynamicOutput(outInfo))
{
ALOGD("Output shape not set, will infer from inputs");
outInfo.SetShape(InferMaximumOutputShape(input0.GetTensorInfo().GetShape(), input1.GetTensorInfo().GetShape()));
}
- if (!IsLayerSupportedForAnyBackend(__func__,
- armnn::IsMaximumSupported,
- data.m_Backends,
- input0.GetTensorInfo(),
- input1.GetTensorInfo(),
- outInfo))
+ bool isSupported = false;
+ FORWARD_LAYER_SUPPORT_FUNC(__func__,
+ IsMaximumSupported,
+ data.m_Backends,
+ isSupported,
+ input0.GetTensorInfo(),
+ input1.GetTensorInfo(),
+ outInfo);
+
+ if (!isSupported)
{
return false;
}