diff options
| author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-10-15 17:35:36 +0100 |
|---|---|---|
| committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-10-16 09:39:56 +0000 |
| commit | 6fe5247f8997a04edfdd7c974c96a0a086ef3ab5 (patch) | |
| tree | 52d6cc314797f7bf138a0b2d81491543e05b6900 /src/armnn/test/TestNameOnlyLayerVisitor.cpp | |
| parent | 20bea0071d507772e303eb6f1c476bf1feac9be5 (diff) | |
| download | armnn-6fe5247f8997a04edfdd7c974c96a0a086ef3ab5.tar.gz | |
IVGCVSW-3991 Make Descriptor objects comparable and refactor LayerVisitor tests
* Implemented operator==() for Descriptor structs
* Refactored TestNameAndDescriptorLayerVisitor to eliminate code duplication
by using templates and taking advantage of the fact that descriptor objects
can now all be compared the same way using ==
* Cleaned up TestNameOnlylayerVisitor by moving all test cases for layers
that require a descriptor to TestNameAndDescriptorLayerVisitor
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Iee38b04d68d34a5f4ec7e5790de39ecb7ab0fb80
Diffstat (limited to 'src/armnn/test/TestNameOnlyLayerVisitor.cpp')
| -rw-r--r-- | src/armnn/test/TestNameOnlyLayerVisitor.cpp | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/src/armnn/test/TestNameOnlyLayerVisitor.cpp b/src/armnn/test/TestNameOnlyLayerVisitor.cpp index 2217a32edf..6bc2dc7c65 100644 --- a/src/armnn/test/TestNameOnlyLayerVisitor.cpp +++ b/src/armnn/test/TestNameOnlyLayerVisitor.cpp @@ -12,54 +12,48 @@ namespace { -#define ADD_LAYER_METHOD_1_PARAM(name) net.Add##name##Layer("name##Layer") -#define ADD_LAYER_METHOD_2_PARAM(name) net.Add##name##Layer(armnn::name##Descriptor(), "name##Layer") - -#define TEST_CASE_CHECK_LAYER_VISITOR_NAME(name, numParams) \ +#define TEST_CASE_CHECK_LAYER_VISITOR_NAME(name) \ BOOST_AUTO_TEST_CASE(Check##name##LayerVisitorName) \ { \ Test##name##LayerVisitor visitor("name##Layer"); \ armnn::Network net; \ - armnn::IConnectableLayer *const layer = ADD_LAYER_METHOD_##numParams##_PARAM(name); \ + armnn::IConnectableLayer *const layer = net.Add##name##Layer("name##Layer"); \ layer->Accept(visitor); \ } -#define ADD_LAYER_METHOD_NULLPTR_1_PARAM(name) net.Add##name##Layer() -#define ADD_LAYER_METHOD_NULLPTR_2_PARAM(name) net.Add##name##Layer(armnn::name##Descriptor()) - -#define TEST_CASE_CHECK_LAYER_VISITOR_NAME_NULLPTR(name, numParams) \ +#define TEST_CASE_CHECK_LAYER_VISITOR_NAME_NULLPTR(name) \ BOOST_AUTO_TEST_CASE(Check##name##LayerVisitorNameNullptr) \ { \ Test##name##LayerVisitor visitor; \ armnn::Network net; \ - armnn::IConnectableLayer *const layer = ADD_LAYER_METHOD_NULLPTR_##numParams##_PARAM(name); \ + armnn::IConnectableLayer *const layer = net.Add##name##Layer(); \ layer->Accept(visitor); \ } -#define TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(name) \ -TEST_CASE_CHECK_LAYER_VISITOR_NAME(name, 1) \ -TEST_CASE_CHECK_LAYER_VISITOR_NAME_NULLPTR(name, 1) - -#define TEST_SUITE_NAME_ONLY_LAYER_VISITOR_2_PARAM(name) \ -TEST_CASE_CHECK_LAYER_VISITOR_NAME(name, 2) \ -TEST_CASE_CHECK_LAYER_VISITOR_NAME_NULLPTR(name, 2) +#define TEST_SUITE_NAME_ONLY_LAYER_VISITOR(name) \ +TEST_CASE_CHECK_LAYER_VISITOR_NAME(name) \ +TEST_CASE_CHECK_LAYER_VISITOR_NAME_NULLPTR(name) } // anonymous namespace BOOST_AUTO_TEST_SUITE(TestNameOnlyLayerVisitor) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Addition) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_2_PARAM(DepthToSpace) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Division) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Equal) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Floor) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Gather) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Greater) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Maximum) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Minimum) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Multiplication) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Rsqrt) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_2_PARAM(Slice) -TEST_SUITE_NAME_ONLY_LAYER_VISITOR_1_PARAM(Subtraction) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Abs) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Addition) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Dequantize) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Division) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Equal) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Floor) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Gather) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Greater) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Maximum) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Merge) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Minimum) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Multiplication) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Prelu) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Quantize) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Rsqrt) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Subtraction) +TEST_SUITE_NAME_ONLY_LAYER_VISITOR(Switch) BOOST_AUTO_TEST_SUITE_END() |