diff options
| author | James Conroy <james.conroy@arm.com> | 2020-11-06 16:28:18 +0000 |
|---|---|---|
| committer | James Conroy <james.conroy@arm.com> | 2020-11-09 18:26:28 +0000 |
| commit | aba90cd608eb65ab459cd71a6724511a1507763b (patch) | |
| tree | 8c83548e02de2bc6c34811ea2eb9c3dac0976068 /src/armnn/test | |
| parent | c9bc80e1d93d27ad298133c7345627e6a946fb92 (diff) | |
| download | armnn-aba90cd608eb65ab459cd71a6724511a1507763b.tar.gz | |
IVGCVSW-5091 Add Logical ops frontend and ref impl
* Add frontend and reference implementation for logical
ops NOT, AND, OR.
* Unary NOT uses existing ElementwiseUnary layer and
ElementwiseUnary descriptor.
* Binary AND/OR uses new layer LogicalBinary and new
LogicalBinary descriptor.
* Add serialization/deserializion support and add missing
ElementwiseUnary deserializer code.
* Add additional Boolean decoder in BaseIterator.hpp.
Signed-off-by: James Conroy <james.conroy@arm.com>
Change-Id: Id343b01174053a166de1b98b6175e04a5065f720
Diffstat (limited to 'src/armnn/test')
| -rw-r--r-- | src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp | 7 | ||||
| -rw-r--r-- | src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp index 6ab9f9e1e4..7d4dcaae0e 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp @@ -126,6 +126,12 @@ armnn::L2NormalizationDescriptor GetDescriptor<armnn::L2NormalizationDescriptor> } template<> +armnn::LogicalBinaryDescriptor GetDescriptor<armnn::LogicalBinaryDescriptor>() +{ + return armnn::LogicalBinaryDescriptor(armnn::LogicalBinaryOperation::LogicalOr); +} + +template<> armnn::MeanDescriptor GetDescriptor<armnn::MeanDescriptor>() { return armnn::MeanDescriptor({ 1, 2, }, true); @@ -280,6 +286,7 @@ TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Fill) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Gather) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(InstanceNormalization) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(L2Normalization) +TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(LogicalBinary) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(LogSoftmax) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Mean) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Normalization) diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp index df0e055157..dc6d11440f 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp @@ -53,6 +53,7 @@ DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Fill) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Gather) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(InstanceNormalization) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(L2Normalization) +DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(LogicalBinary) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(LogSoftmax) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Mean) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Normalization) |