IVGCVSW-4009 Get string name for StandInLayer type

Change-Id: I6808937bd35a2419814d04016b780efa6bb8724c
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>

diff --git a/src/armnn/InternalTypes.cpp b/src/armnn/InternalTypes.cpp
index f713644..011fcfb 100644 (file)
--- 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 c52d6a9..521eef6 100644 (file)
--- 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);