diff options
author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2018-12-03 16:06:49 +0000 |
---|---|---|
committer | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2018-12-03 16:06:49 +0000 |
commit | a9a1cf117072b8aa81e27bab4d1d3e356d8ea51d (patch) | |
tree | d8f6c92615a8f3821d732bb3ae229cd028f58c95 /src/armnn | |
parent | de7055840ad27de2f60e80bf6e264705db4c0d19 (diff) | |
download | armnn-a9a1cf117072b8aa81e27bab4d1d3e356d8ea51d.tar.gz |
IVGCVSW-2315 Add DebugLayer and no-op factory method
Change-Id: I5455b720565248ff94278e76887d63f8434a7b58
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/InternalTypes.cpp | 1 | ||||
-rw-r--r-- | src/armnn/InternalTypes.hpp | 1 | ||||
-rw-r--r-- | src/armnn/LayerSupport.cpp | 9 | ||||
-rw-r--r-- | src/armnn/LayersFwd.hpp | 2 | ||||
-rw-r--r-- | src/armnn/layers/DebugLayer.cpp | 46 | ||||
-rw-r--r-- | src/armnn/layers/DebugLayer.hpp | 27 |
6 files changed, 86 insertions, 0 deletions
diff --git a/src/armnn/InternalTypes.cpp b/src/armnn/InternalTypes.cpp index 0b6c777546..8a4f892583 100644 --- a/src/armnn/InternalTypes.cpp +++ b/src/armnn/InternalTypes.cpp @@ -22,6 +22,7 @@ char const* GetLayerTypeAsCString(LayerType type) case LayerType::ConvertFp16ToFp32: return "ConvertFp16ToFp32"; case LayerType::ConvertFp32ToFp16: return "ConvertFp32ToFp16"; case LayerType::Convolution2d: return "Convolution2d"; + case LayerType::Debug: return "Debug"; case LayerType::DepthwiseConvolution2d: return "DepthwiseConvolution2d"; case LayerType::Division: return "Division"; case LayerType::FakeQuantization: return "FakeQuantization"; diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp index df8bb737e7..3d4f043051 100644 --- a/src/armnn/InternalTypes.hpp +++ b/src/armnn/InternalTypes.hpp @@ -22,6 +22,7 @@ enum class LayerType ConvertFp16ToFp32, ConvertFp32ToFp16, Convolution2d, + Debug, DepthwiseConvolution2d, Division, FakeQuantization, diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index bbc9e3bd80..bdcd58a063 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -167,6 +167,15 @@ bool IsConvolution2dSupported(const BackendId& backend, FORWARD_LAYER_SUPPORT_FUNC(backend, IsConvolution2dSupported, input, output, descriptor, weights, biases); } +bool IsDebugSupported(const BackendId& backend, + const TensorInfo& input, + const TensorInfo& output, + char* reasonIfUnsupported, + size_t reasonIfUnsupportedMaxLength) +{ + FORWARD_LAYER_SUPPORT_FUNC(backend, IsDebugSupported, input, output); +} + bool IsDivisionSupported(const BackendId& backend, const TensorInfo& input0, const TensorInfo& input1, diff --git a/src/armnn/LayersFwd.hpp b/src/armnn/LayersFwd.hpp index 88a636a0b8..ebfa5db6b1 100644 --- a/src/armnn/LayersFwd.hpp +++ b/src/armnn/LayersFwd.hpp @@ -14,6 +14,7 @@ #include "layers/ConvertFp16ToFp32Layer.hpp" #include "layers/ConvertFp32ToFp16Layer.hpp" #include "layers/Convolution2dLayer.hpp" +#include "layers/DebugLayer.hpp" #include "layers/DepthwiseConvolution2dLayer.hpp" #include "layers/DivisionLayer.hpp" #include "layers/FakeQuantizationLayer.hpp" @@ -76,6 +77,7 @@ DECLARE_LAYER(Constant) DECLARE_LAYER(ConvertFp16ToFp32) DECLARE_LAYER(ConvertFp32ToFp16) DECLARE_LAYER(Convolution2d) +DECLARE_LAYER(Debug) DECLARE_LAYER(DepthwiseConvolution2d) DECLARE_LAYER(Division) DECLARE_LAYER(FakeQuantization) diff --git a/src/armnn/layers/DebugLayer.cpp b/src/armnn/layers/DebugLayer.cpp new file mode 100644 index 0000000000..c407643742 --- /dev/null +++ b/src/armnn/layers/DebugLayer.cpp @@ -0,0 +1,46 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#include "DebugLayer.hpp" + +#include "LayerCloneBase.hpp" + +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> + +namespace armnn +{ + +DebugLayer::DebugLayer(const char* name) : Layer(1, 1, LayerType::Debug, name) +{} + +std::unique_ptr<IWorkload> DebugLayer::CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const +{ + DebugQueueDescriptor descriptor; + + return factory.CreateDebug(descriptor, PrepInfoAndDesc(descriptor, graph)); +} + +DebugLayer* DebugLayer::Clone(Graph& graph) const +{ + return CloneBase<DebugLayer>(graph, GetName()); +} + +void DebugLayer::ValidateTensorShapesFromInputs() +{ + VerifyLayerConnections(1, CHECK_LOCATION()); + + std::vector<TensorShape> inferredShapes = InferOutputShapes({ + GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape() }); + + BOOST_ASSERT(inferredShapes.size() == 1); + + ConditionalThrowIfNotEqual<LayerValidationException>( + "DebugLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", + GetOutputSlot(0).GetTensorInfo().GetShape(), + inferredShapes[0]); +} + +} // namespace armnn diff --git a/src/armnn/layers/DebugLayer.hpp b/src/armnn/layers/DebugLayer.hpp new file mode 100644 index 0000000000..39ef9c7ae0 --- /dev/null +++ b/src/armnn/layers/DebugLayer.hpp @@ -0,0 +1,27 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include <Layer.hpp> + +namespace armnn +{ + +class DebugLayer : public Layer +{ +public: + virtual std::unique_ptr<IWorkload> CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const override; + + DebugLayer* Clone(Graph& graph) const override; + + void ValidateTensorShapesFromInputs() override; + +protected: + DebugLayer(const char* name); + ~DebugLayer() = default; +}; + +} // namespace armnn |