aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kelly <mike.kelly@arm.com>2019-12-13 16:14:23 +0000
committerMike Kelly <mike.kelly@arm.com>2019-12-13 16:14:23 +0000
commit1d042180e7af77e9a43b487631e775c3b92f3df8 (patch)
treed8d1bb52e8f35c8a9755ca745633924a00b5bed1
parent358da71e834bb1e66a528a7e7ffd1f97087e17c5 (diff)
downloadandroid-nn-driver-1d042180e7af77e9a43b487631e775c3b92f3df8.tar.gz
IVGCVSW-4241 Resolve CTS test failures
* Disable Concatenation and L2_POOL_2D in Hal 1.2 Signed-off-by: Mike Kelly <mike.kelly@arm.com> Signed-off-by: Sadik Armagan <sadik.armagan@arm.com> Change-Id: Ib3ac6702eb3e10d51be430c1c644c0e6398ee875
-rw-r--r--1.2/HalPolicy.cpp17
1 files changed, 1 insertions, 16 deletions
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index 3b1200b5..6f23987e 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -27,8 +27,6 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model,
return ConvertAveragePool2d(operation, model, data);
case V1_2::OperationType::BATCH_TO_SPACE_ND:
return ConvertBatchToSpaceNd(operation, model, data);
- case V1_2::OperationType::CONCATENATION:
- return ConvertConcatenation(operation, model, data);
case V1_2::OperationType::CONV_2D:
return ConvertConv2d(operation, model, data);
case V1_2::OperationType::DEPTHWISE_CONV_2D:
@@ -43,8 +41,6 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model,
return ConvertFullyConnected(operation, model, data);
case V1_2::OperationType::L2_NORMALIZATION:
return ConvertL2Normalization(operation, model, data);
- case V1_2::OperationType::L2_POOL_2D:
- return ConvertL2Pool2d(operation, model, data);
case V1_2::OperationType::LOCAL_RESPONSE_NORMALIZATION:
return ConvertLocalResponseNormalization(operation, model, data);
case V1_2::OperationType::LOGISTIC:
@@ -125,12 +121,6 @@ bool HalPolicy::ConvertBatchToSpaceNd(const Operation& operation, const Model& m
return ::ConvertBatchToSpaceNd<hal_1_2::HalPolicy>(operation, model, data);
}
-bool HalPolicy::ConvertConcatenation(const Operation& operation, const Model& model, ConversionData& data)
-{
- ALOGV("hal_1_2::HalPolicy::ConvertConcatenation()");
- return ::ConvertConcatenation<hal_1_2::HalPolicy>(operation, model, data);
-}
-
bool HalPolicy::ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data)
{
ALOGV("hal_1_2::HalPolicy::ConvertConv2d()");
@@ -343,6 +333,7 @@ bool HalPolicy::ConvertDepthwiseConv2d(const Operation& operation, const Model&
{
return Fail("%s: Operation has invalid inputs NCHW is not supported", __func__);
}
+
armnnUtils::DataLayoutIndexed dataLayoutIndexed(desc.m_DataLayout);
unsigned int channelsIndex = dataLayoutIndexed.GetChannelsIndex();
unsigned int widthIndex = dataLayoutIndexed.GetWidthIndex();
@@ -493,12 +484,6 @@ bool HalPolicy::ConvertL2Normalization(const Operation& operation, const Model&
return ::ConvertL2Normalization<hal_1_2::HalPolicy>(operation, model, data);
}
-bool HalPolicy::ConvertL2Pool2d(const Operation& operation, const Model& model, ConversionData& data)
-{
- ALOGV("hal_1_2::HalPolicy::ConvertL2Pool2d()");
- return ConvertPooling2d<hal_1_2::HalPolicy>(operation, __func__, armnn::PoolingAlgorithm::L2, model, data);
-}
-
bool HalPolicy::ConvertLocalResponseNormalization(const Operation& operation,
const Model& model,
ConversionData& data)