diff options
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() |