From 964e955d8962590d3ccbaba9784962e895ca656f Mon Sep 17 00:00:00 2001 From: Nattapat Chaimanowong Date: Tue, 26 Mar 2019 11:03:26 +0000 Subject: IVGCVSW-2881 Remove DebugDescriptor * Also update Debug layer to use layer guid information Change-Id: I9ec1f639299c3f855b670ff031a0e88d685cfc6b Signed-off-by: Nattapat Chaimanowong --- src/backends/backendsCommon/LayerSupportBase.cpp | 1 - src/backends/backendsCommon/LayerSupportBase.hpp | 1 - src/backends/backendsCommon/WorkloadData.hpp | 6 ++++- src/backends/backendsCommon/WorkloadFactory.cpp | 3 --- src/backends/backendsCommon/test/DebugTestImpl.hpp | 31 +++++++++++++++------- .../test/IsLayerSupportedTestImpl.hpp | 2 +- 6 files changed, 27 insertions(+), 17 deletions(-) (limited to 'src/backends/backendsCommon') diff --git a/src/backends/backendsCommon/LayerSupportBase.cpp b/src/backends/backendsCommon/LayerSupportBase.cpp index 6358f6f0a8..c170ac05e2 100644 --- a/src/backends/backendsCommon/LayerSupportBase.cpp +++ b/src/backends/backendsCommon/LayerSupportBase.cpp @@ -100,7 +100,6 @@ bool LayerSupportBase::IsConvolution2dSupported(const TensorInfo& input, bool LayerSupportBase::IsDebugSupported(const TensorInfo& input, const TensorInfo& output, - const DebugDescriptor& descriptor, Optional reasonIfUnsupported) const { return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); diff --git a/src/backends/backendsCommon/LayerSupportBase.hpp b/src/backends/backendsCommon/LayerSupportBase.hpp index bf81459582..75c366cf3b 100644 --- a/src/backends/backendsCommon/LayerSupportBase.hpp +++ b/src/backends/backendsCommon/LayerSupportBase.hpp @@ -58,7 +58,6 @@ public: bool IsDebugSupported(const TensorInfo& input, const TensorInfo& output, - const DebugDescriptor& descriptor, Optional reasonIfUnsupported = EmptyOptional()) const override; bool IsDepthwiseConvolutionSupported(const TensorInfo& input, diff --git a/src/backends/backendsCommon/WorkloadData.hpp b/src/backends/backendsCommon/WorkloadData.hpp index 09f56479cd..18bd921d5e 100644 --- a/src/backends/backendsCommon/WorkloadData.hpp +++ b/src/backends/backendsCommon/WorkloadData.hpp @@ -380,9 +380,13 @@ struct GreaterQueueDescriptor : QueueDescriptor void Validate(const WorkloadInfo& workloadInfo) const; }; -struct DebugQueueDescriptor : QueueDescriptorWithParameters +struct DebugQueueDescriptor : QueueDescriptor { void Validate(const WorkloadInfo& workloadInfo) const; + + LayerGuid m_Guid; + std::string m_LayerName; + unsigned int m_SlotIndex; }; struct RsqrtQueueDescriptor : QueueDescriptor diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp index 72d0b19d04..0996a8aaee 100644 --- a/src/backends/backendsCommon/WorkloadFactory.cpp +++ b/src/backends/backendsCommon/WorkloadFactory.cpp @@ -192,14 +192,11 @@ bool IWorkloadFactory::IsLayerSupported(const BackendId& backendId, } case LayerType::Debug: { - auto cLayer = boost::polymorphic_downcast(&layer); - const TensorInfo& input = layer.GetInputSlot(0).GetConnection()->GetTensorInfo(); const TensorInfo& output = layer.GetOutputSlot(0).GetTensorInfo(); result = layerSupportObject->IsDebugSupported(OverrideDataType(input, dataType), OverrideDataType(output, dataType), - cLayer->GetParameters(), reason); break; } diff --git a/src/backends/backendsCommon/test/DebugTestImpl.hpp b/src/backends/backendsCommon/test/DebugTestImpl.hpp index 14808f4856..4af479d7ce 100644 --- a/src/backends/backendsCommon/test/DebugTestImpl.hpp +++ b/src/backends/backendsCommon/test/DebugTestImpl.hpp @@ -92,8 +92,9 @@ LayerTestResult Debug4DTest( unsigned int outputShape[] = {1, 2, 2, 3}; armnn::DebugQueueDescriptor desc; - desc.m_Parameters.m_LayerName = "TestOutput"; - desc.m_Parameters.m_SlotIndex = 1; + desc.m_Guid = 1; + desc.m_LayerName = "TestOutput"; + desc.m_SlotIndex = 0; inputTensorInfo = armnn::TensorInfo(4, inputShape, ArmnnType); outputTensorInfo = armnn::TensorInfo(4, outputShape, ArmnnType); @@ -115,8 +116,9 @@ LayerTestResult Debug4DTest( }); const std::string expectedStringOutput = - "{ \"layer\": \"TestOutput\"," - " \"outputSlot\": 1," + "{ \"layerGuid\": 1," + " \"layerName\": \"TestOutput\"," + " \"outputSlot\": 0," " \"shape\": [1, 2, 2, 3]," " \"min\": 1, \"max\": 12," " \"data\": [[[[1, 2, 3], [4, 5, 6]], [[7, 8, 9], [10, 11, 12]]]] }\n"; @@ -143,7 +145,9 @@ LayerTestResult Debug3DTest( unsigned int outputShape[] = {3, 3, 1}; armnn::DebugQueueDescriptor desc; - desc.m_Parameters.m_LayerName = "TestOutput"; + desc.m_Guid = 1; + desc.m_LayerName = "TestOutput"; + desc.m_SlotIndex = 0; inputTensorInfo = armnn::TensorInfo(3, inputShape, ArmnnType); outputTensorInfo = armnn::TensorInfo(3, outputShape, ArmnnType); @@ -163,7 +167,8 @@ LayerTestResult Debug3DTest( }); const std::string expectedStringOutput = - "{ \"layer\": \"TestOutput\"," + "{ \"layerGuid\": 1," + " \"layerName\": \"TestOutput\"," " \"outputSlot\": 0," " \"shape\": [3, 3, 1]," " \"min\": 1, \"max\": 9," @@ -191,7 +196,9 @@ LayerTestResult Debug2DTest( unsigned int outputShape[] = {2, 2}; armnn::DebugQueueDescriptor desc; - desc.m_Parameters.m_LayerName = "TestOutput"; + desc.m_Guid = 1; + desc.m_LayerName = "TestOutput"; + desc.m_SlotIndex = 0; inputTensorInfo = armnn::TensorInfo(2, inputShape, ArmnnType); outputTensorInfo = armnn::TensorInfo(2, outputShape, ArmnnType); @@ -209,7 +216,8 @@ LayerTestResult Debug2DTest( }); const std::string expectedStringOutput = - "{ \"layer\": \"TestOutput\"," + "{ \"layerGuid\": 1," + " \"layerName\": \"TestOutput\"," " \"outputSlot\": 0," " \"shape\": [2, 2]," " \"min\": 1, \"max\": 4," @@ -237,7 +245,9 @@ LayerTestResult Debug1DTest( unsigned int outputShape[] = {4}; armnn::DebugQueueDescriptor desc; - desc.m_Parameters.m_LayerName = "TestOutput"; + desc.m_Guid = 1; + desc.m_LayerName = "TestOutput"; + desc.m_SlotIndex = 0; inputTensorInfo = armnn::TensorInfo(1, inputShape, ArmnnType); outputTensorInfo = armnn::TensorInfo(1, outputShape, ArmnnType); @@ -253,7 +263,8 @@ LayerTestResult Debug1DTest( }); const std::string expectedStringOutput = - "{ \"layer\": \"TestOutput\"," + "{ \"layerGuid\": 1," + " \"layerName\": \"TestOutput\"," " \"outputSlot\": 0," " \"shape\": [4]," " \"min\": 1, \"max\": 4," diff --git a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp index 3df71830ca..79213c18e0 100644 --- a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp +++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp @@ -332,7 +332,7 @@ DECLARE_LAYER_POLICY_2_PARAM(Convolution2d) DECLARE_LAYER_POLICY_1_PARAM(MemCopy) -DECLARE_LAYER_POLICY_2_PARAM(Debug) +DECLARE_LAYER_POLICY_1_PARAM(Debug) DECLARE_LAYER_POLICY_2_PARAM(DepthwiseConvolution2d) -- cgit v1.2.1