diff options
author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-11 13:25:59 +0000 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-01-15 08:59:50 +0000 |
commit | 4912402497a51c6afe0898b3900f87feefa006a6 (patch) | |
tree | 4e9b5161781d2b0be041aec17227193da5977443 /include/armnn/Descriptors.hpp | |
parent | d0a1608e2c41639d8f3e3f9305d79c5f92c9cff8 (diff) | |
download | armnn-4912402497a51c6afe0898b3900f87feefa006a6.tar.gz |
IVGCVSW-2454 Merge together the pluggable backends work (was in a
separate branch) and master
* Brings in all the changes done for the pluggable backends
* Added sub-graph support and tests
* Added precompiled layer support and tests
* Moved BackendSettings to a separate file
* Removed the backend-specific code
* Ported DebugLayer and associated functionality
* Included fixes to make those changes work with master
Change-Id: Id7028fa7917527b844628d5aff5732e3d94c0488
Diffstat (limited to 'include/armnn/Descriptors.hpp')
-rw-r--r-- | include/armnn/Descriptors.hpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 2b30c2bcf6..4497d0da9e 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -18,7 +18,7 @@ namespace armnn /// An ActivationDescriptor for the ActivationLayer. struct ActivationDescriptor { - ActivationDescriptor() : m_Function(ActivationFunction::Sigmoid), m_A(0), m_B(0) {}; + ActivationDescriptor() : m_Function(ActivationFunction::Sigmoid), m_A(0), m_B(0) {} /// @brief The activation function to use /// (Sigmoid, TanH, Linear, ReLu, BoundedReLu, SoftReLu, LeakyReLu, Abs, Sqrt, Square). @@ -48,7 +48,7 @@ struct PermuteDescriptor /// A SoftmaxDescriptor for the SoftmaxLayer. struct SoftmaxDescriptor { - SoftmaxDescriptor() : m_Beta(1.0f) {}; + SoftmaxDescriptor() : m_Beta(1.0f) {} /// Exponentiation value. float m_Beta; }; @@ -221,7 +221,7 @@ struct Pooling2dDescriptor , m_OutputShapeRounding(OutputShapeRounding::Floor) , m_PaddingMethod(PaddingMethod::Exclude) , m_DataLayout(DataLayout::NCHW) - {}; + {} /// The pooling algorithm to use (Max. Average, L2). PoolingAlgorithm m_PoolType; @@ -255,7 +255,7 @@ struct FullyConnectedDescriptor FullyConnectedDescriptor() : m_BiasEnabled(false) , m_TransposeWeightMatrix(false) - {}; + {} /// Enable/disable bias. bool m_BiasEnabled; @@ -275,7 +275,7 @@ struct Convolution2dDescriptor , m_StrideY(0) , m_BiasEnabled(false) , m_DataLayout(DataLayout::NCHW) - {}; + {} /// Padding left value in the width dimension. uint32_t m_PadLeft; @@ -608,4 +608,17 @@ struct DebugDescriptor unsigned int m_SlotIndex; }; +/// A PreCompiledDescriptor for the PreCompiledLayer. +struct PreCompiledDescriptor +{ + PreCompiledDescriptor(unsigned int numInputSlots = 1u, unsigned int numOutputSlots = 1u) + : m_NumInputSlots(numInputSlots), m_NumOutputSlots(numOutputSlots) + {} + + ~PreCompiledDescriptor() = default; + + unsigned int m_NumInputSlots; + unsigned int m_NumOutputSlots; +}; + } |