aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Lamberti <derek.lamberti@arm.com>2019-10-21 14:10:38 +0100
committerDerek Lamberti <derek.lamberti@arm.com>2019-10-21 14:38:36 +0100
commitb99ef39cf84e48a87d3a522a4169fc50eae6ad20 (patch)
treebc5a91dfa5a9e1db6293b541096d13ed19ecf104
parent013c390c2d9829fede2d8b1d59c3f2a497730462 (diff)
downloadarmnn-b99ef39cf84e48a87d3a522a4169fc50eae6ad20.tar.gz
IVGCVSW-4009 Get string name for StandInLayer type
Change-Id: I6808937bd35a2419814d04016b780efa6bb8724c Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
-rw-r--r--src/armnn/InternalTypes.cpp1
-rw-r--r--src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp7
2 files changed, 8 insertions, 0 deletions
diff --git a/src/armnn/InternalTypes.cpp b/src/armnn/InternalTypes.cpp
index f713644656..011fcfbb89 100644
--- a/src/armnn/InternalTypes.cpp
+++ b/src/armnn/InternalTypes.cpp
@@ -63,6 +63,7 @@ char const* GetLayerTypeAsCString(LayerType type)
case LayerType::SpaceToBatchNd: return "SpaceToBatchNd";
case LayerType::Splitter: return "Splitter";
case LayerType::Stack: return "Stack";
+ case LayerType::StandIn: return "StandIn";
case LayerType::StridedSlice: return "StridedSlice";
case LayerType::Subtraction: return "Subtraction";
case LayerType::Switch: return "Switch";
diff --git a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp
index c52d6a9511..521eef6230 100644
--- a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp
+++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp
@@ -362,6 +362,7 @@ struct LayerTypePolicy<armnn::LayerType::name, DataType> \
using Desc = descType; \
using QueueDesc = armnn::name##QueueDescriptor; \
constexpr static const char* NameStr = #name; \
+ constexpr static const bool IsException = true; \
\
static std::unique_ptr<armnn::IWorkload> MakeDummyWorkload(armnn::IWorkloadFactory *factory, \
unsigned int nIn, unsigned int nOut) \
@@ -388,6 +389,7 @@ struct LayerTypePolicy<armnn::LayerType::name, DataType> \
using Type = armnn::name##Layer; \
using Desc = descType; \
constexpr static const char* NameStr = #name; \
+ constexpr static const bool IsException = true; \
\
static std::unique_ptr<armnn::IWorkload> MakeDummyWorkload(armnn::IWorkloadFactory *factory, \
unsigned int nIn, unsigned int nOut) \
@@ -551,6 +553,11 @@ bool IsLayerSupportedTest(FactoryType *factory, Tag<Type>)
using LayerDesc = typename LayerPolicy::Desc;
DummyLayer<LayerType, LayerDesc> layer;
+ if (LayerPolicy::IsException) //Don't test exceptions to the rule.
+ {
+ return true;
+ }
+
unsigned int numIn = GetNumInputs<Type>(*layer.m_Layer);
unsigned int numOut = GetNumOutputs<Type>(*layer.m_Layer);