2 files changed, 121 insertions, 77 deletions

diff --git a/src/armnn/test/TestNameOnlyLayerVisitor.cpp b/src/armnn/test/TestNameOnlyLayerVisitor.cpp
index 4bb9614385..c4c4a479eb 100644
--- a/src/armnn/test/TestNameOnlyLayerVisitor.cpp
+++ b/src/armnn/test/TestNameOnlyLayerVisitor.cpp
@@ -10,6 +10,7 @@ namespace armnn {
 
 BOOST_AUTO_TEST_SUITE(TestNameOnlyLayerVisitor)
 
+// Addition
 BOOST_AUTO_TEST_CASE(CheckAdditionLayerVisitorName)
 {
     TestAdditionLayerVisitor visitor("AdditionLayer");
@@ -28,24 +29,45 @@ BOOST_AUTO_TEST_CASE(CheckAdditionLayerVisitorNameNullptr)
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckMultiplicationLayerVisitorName)
+// Division
+BOOST_AUTO_TEST_CASE(CheckDivisionLayerVisitorName)
 {
-    TestMultiplicationLayerVisitor visitor("MultiplicationLayer");
+    TestDivisionLayerVisitor visitor("DivisionLayer");
     Network net;
 
-    IConnectableLayer *const layer = net.AddMultiplicationLayer("MultiplicationLayer");
+    IConnectableLayer *const layer = net.AddAdditionLayer("DivisionLayer");
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckMultiplicationLayerVisitorNameNullptr)
+BOOST_AUTO_TEST_CASE(CheckDivisionLayerVisitorNameNullptr)
 {
-    TestMultiplicationLayerVisitor visitor;
+    TestDivisionLayerVisitor visitor;
     Network net;
 
-    IConnectableLayer *const layer = net.AddMultiplicationLayer();
+    IConnectableLayer *const layer = net.AddDivisionLayer();
+    layer->Accept(visitor);
+}
+
+// Equal
+BOOST_AUTO_TEST_CASE(CheckEqualLayerVisitorName)
+{
+    TestEqualLayerVisitor visitor("EqualLayer");
+    Network net;
+
+    IConnectableLayer *const layer = net.AddEqualLayer("EqualLayer");
+    layer->Accept(visitor);
+}
+
+BOOST_AUTO_TEST_CASE(CheckEqualLayerVisitorNameNullptr)
+{
+    TestEqualLayerVisitor visitor;
+    Network net;
+
+    IConnectableLayer *const layer = net.AddEqualLayer();
     layer->Accept(visitor);
 }
 
+// Floor
 BOOST_AUTO_TEST_CASE(CheckFloorLayerVisitorName)
 {
     TestFloorLayerVisitor visitor("FloorLayer");
@@ -64,42 +86,45 @@ BOOST_AUTO_TEST_CASE(CheckFloorLayerVisitorNameNullptr)
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckDivisionLayerVisitorName)
+// Gather
+BOOST_AUTO_TEST_CASE(CheckGatherLayerVisitorName)
 {
-    TestDivisionLayerVisitor visitor("DivisionLayer");
+    TestGatherLayerVisitor visitor("GatherLayer");
     Network net;
 
-    IConnectableLayer *const layer = net.AddAdditionLayer("DivisionLayer");
+    IConnectableLayer *const layer = net.AddGatherLayer("GatherLayer");
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckDivisionLayerVisitorNameNullptr)
+BOOST_AUTO_TEST_CASE(CheckGatherLayerVisitorNameNullptr)
 {
-    TestDivisionLayerVisitor visitor;
+    TestGatherLayerVisitor visitor;
     Network net;
 
-    IConnectableLayer *const layer = net.AddDivisionLayer();
+    IConnectableLayer *const layer = net.AddGatherLayer();
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckSubtractionLayerVisitorName)
+// Greater
+BOOST_AUTO_TEST_CASE(CheckGreaterLayerVisitorName)
 {
-    TestSubtractionLayerVisitor visitor("SubtractionLayer");
+    TestGreaterLayerVisitor visitor("GreaterLayer");
     Network net;
 
-    IConnectableLayer *const layer = net.AddSubtractionLayer("SubtractionLayer");
+    IConnectableLayer *const layer = net.AddGreaterLayer("GreaterLayer");
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckSubtractionLayerVisitorNameNullptr)
+BOOST_AUTO_TEST_CASE(CheckGreaterLayerVisitorNameNullptr)
 {
-    TestSubtractionLayerVisitor visitor;
+    TestGreaterLayerVisitor visitor;
     Network net;
 
-    IConnectableLayer *const layer = net.AddSubtractionLayer();
+    IConnectableLayer *const layer = net.AddGreaterLayer();
     layer->Accept(visitor);
 }
 
+// Maximum
 BOOST_AUTO_TEST_CASE(CheckMaximumLayerVisitorName)
 {
     TestMaximumLayerVisitor visitor("MaximumLayer");
@@ -118,6 +143,7 @@ BOOST_AUTO_TEST_CASE(CheckMaximumLayerVisitorNameNullptr)
     layer->Accept(visitor);
 }
 
+// Minimum
 BOOST_AUTO_TEST_CASE(CheckMinimumLayerVisitorName)
 {
     TestMinimumLayerVisitor visitor("MinimumLayer");
@@ -136,78 +162,82 @@ BOOST_AUTO_TEST_CASE(CheckMinimumLayerVisitorNameNullptr)
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckGreaterLayerVisitorName)
+// Multiplication
+BOOST_AUTO_TEST_CASE(CheckMultiplicationLayerVisitorName)
 {
-    TestGreaterLayerVisitor visitor("GreaterLayer");
+    TestMultiplicationLayerVisitor visitor("MultiplicationLayer");
     Network net;
 
-    IConnectableLayer *const layer = net.AddGreaterLayer("GreaterLayer");
+    IConnectableLayer *const layer = net.AddMultiplicationLayer("MultiplicationLayer");
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckGreaterLayerVisitorNameNullptr)
+BOOST_AUTO_TEST_CASE(CheckMultiplicationLayerVisitorNameNullptr)
 {
-    TestGreaterLayerVisitor visitor;
+    TestMultiplicationLayerVisitor visitor;
     Network net;
 
-    IConnectableLayer *const layer = net.AddGreaterLayer();
+    IConnectableLayer *const layer = net.AddMultiplicationLayer();
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckEqualLayerVisitorName)
+// Rsqrt
+BOOST_AUTO_TEST_CASE(CheckRsqrtLayerVisitorName)
 {
-    TestEqualLayerVisitor visitor("EqualLayer");
+    TestRsqrtLayerVisitor visitor("RsqrtLayer");
     Network net;
 
-    IConnectableLayer *const layer = net.AddEqualLayer("EqualLayer");
+    IConnectableLayer *const layer = net.AddRsqrtLayer("RsqrtLayer");
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckEqualLayerVisitorNameNullptr)
+BOOST_AUTO_TEST_CASE(CheckRsqrtLayerVisitorNameNullptr)
 {
-    TestEqualLayerVisitor visitor;
+    TestRsqrtLayerVisitor visitor;
     Network net;
 
-    IConnectableLayer *const layer = net.AddEqualLayer();
+    IConnectableLayer *const layer = net.AddRsqrtLayer();
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckRsqrtLayerVisitorName)
+// Slice
+BOOST_AUTO_TEST_CASE(CheckSliceLayerVisitorName)
 {
-    TestRsqrtLayerVisitor visitor("RsqrtLayer");
+    TestSliceLayerVisitor visitor("SliceLayer");
     Network net;
 
-    IConnectableLayer *const layer = net.AddRsqrtLayer("RsqrtLayer");
+    IConnectableLayer *const layer = net.AddSliceLayer(SliceDescriptor(), "SliceLayer");
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckRsqrtLayerVisitorNameNullptr)
+BOOST_AUTO_TEST_CASE(CheckSliceLayerVisitorNameNullptr)
 {
-    TestRsqrtLayerVisitor visitor;
+    TestSliceLayerVisitor visitor;
     Network net;
 
-    IConnectableLayer *const layer = net.AddRsqrtLayer();
+    IConnectableLayer *const layer = net.AddSliceLayer(SliceDescriptor());
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckGatherLayerVisitorName)
+// Subtraction
+BOOST_AUTO_TEST_CASE(CheckSubtractionLayerVisitorName)
 {
-    TestGatherLayerVisitor visitor("GatherLayer");
+    TestSubtractionLayerVisitor visitor("SubtractionLayer");
     Network net;
 
-    IConnectableLayer *const layer = net.AddGatherLayer("GatherLayer");
+    IConnectableLayer *const layer = net.AddSubtractionLayer("SubtractionLayer");
     layer->Accept(visitor);
 }
 
-BOOST_AUTO_TEST_CASE(CheckGatherLayerVisitorNameNullptr)
+BOOST_AUTO_TEST_CASE(CheckSubtractionLayerVisitorNameNullptr)
 {
-    TestGatherLayerVisitor visitor;
+    TestSubtractionLayerVisitor visitor;
     Network net;
 
-    IConnectableLayer *const layer = net.AddGatherLayer();
+    IConnectableLayer *const layer = net.AddSubtractionLayer();
     layer->Accept(visitor);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} //namespace armnn
\ No newline at end of file
+} // namespace armnn
diff --git a/src/armnn/test/TestNameOnlyLayerVisitor.hpp b/src/armnn/test/TestNameOnlyLayerVisitor.hpp
index c0037ae28f..dec0d15a96 100644
--- a/src/armnn/test/TestNameOnlyLayerVisitor.hpp
+++ b/src/armnn/test/TestNameOnlyLayerVisitor.hpp
@@ -22,97 +22,97 @@ public:
     };
 };
 
-class TestMultiplicationLayerVisitor : public TestLayerVisitor
+class TestDivisionLayerVisitor : public TestLayerVisitor
 {
 public:
-    explicit TestMultiplicationLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
+    explicit TestDivisionLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
 
-    void VisitMultiplicationLayer(const IConnectableLayer* layer,
-                                  const char* name = nullptr) override {
+    void VisitDivisionLayer(const IConnectableLayer* layer,
+                            const char* name = nullptr) override {
         CheckLayerPointer(layer);
         CheckLayerName(name);
     };
 };
 
-class TestFloorLayerVisitor : public TestLayerVisitor
+class TestEqualLayerVisitor : public TestLayerVisitor
 {
 public:
-    explicit TestFloorLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
+    explicit TestEqualLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
 
-    void VisitFloorLayer(const IConnectableLayer* layer,
+    void VisitEqualLayer(const IConnectableLayer* layer,
                          const char* name = nullptr) override {
         CheckLayerPointer(layer);
         CheckLayerName(name);
     };
 };
 
-class TestDivisionLayerVisitor : public TestLayerVisitor
+class TestFloorLayerVisitor : public TestLayerVisitor
 {
 public:
-    explicit TestDivisionLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
+    explicit TestFloorLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
 
-    void VisitDivisionLayer(const IConnectableLayer* layer,
-                            const char* name = nullptr) override {
+    void VisitFloorLayer(const IConnectableLayer* layer,
+                         const char* name = nullptr) override {
         CheckLayerPointer(layer);
         CheckLayerName(name);
     };
 };
 
-class TestSubtractionLayerVisitor : public TestLayerVisitor
+class TestGatherLayerVisitor : public TestLayerVisitor
 {
 public:
-    explicit TestSubtractionLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
+    explicit TestGatherLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
 
-    void VisitSubtractionLayer(const IConnectableLayer* layer,
-                               const char* name = nullptr) override {
+    void VisitGatherLayer(const IConnectableLayer* layer,
+                          const char* name = nullptr) override {
         CheckLayerPointer(layer);
         CheckLayerName(name);
     };
 };
 
-class TestMaximumLayerVisitor : public TestLayerVisitor
+class TestGreaterLayerVisitor : public TestLayerVisitor
 {
 public:
-    explicit TestMaximumLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
+    explicit TestGreaterLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
 
-    void VisitMaximumLayer(const IConnectableLayer* layer,
+    void VisitGreaterLayer(const IConnectableLayer* layer,
                            const char* name = nullptr) override {
         CheckLayerPointer(layer);
         CheckLayerName(name);
     };
 };
 
-class TestMinimumLayerVisitor : public TestLayerVisitor
+class TestMultiplicationLayerVisitor : public TestLayerVisitor
 {
 public:
-    explicit TestMinimumLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
+    explicit TestMultiplicationLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
 
-    void VisitMinimumLayer(const IConnectableLayer* layer,
-                           const char* name = nullptr) override {
+    void VisitMultiplicationLayer(const IConnectableLayer* layer,
+                                  const char* name = nullptr) override {
         CheckLayerPointer(layer);
         CheckLayerName(name);
     };
 };
 
-class TestGreaterLayerVisitor : public TestLayerVisitor
+class TestMaximumLayerVisitor : public TestLayerVisitor
 {
 public:
-    explicit TestGreaterLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
+    explicit TestMaximumLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
 
-    void VisitGreaterLayer(const IConnectableLayer* layer,
+    void VisitMaximumLayer(const IConnectableLayer* layer,
                            const char* name = nullptr) override {
         CheckLayerPointer(layer);
         CheckLayerName(name);
     };
 };
 
-class TestEqualLayerVisitor : public TestLayerVisitor
+class TestMinimumLayerVisitor : public TestLayerVisitor
 {
 public:
-    explicit TestEqualLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
+    explicit TestMinimumLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
 
-    void VisitEqualLayer(const IConnectableLayer* layer,
-                         const char* name = nullptr) override {
+    void VisitMinimumLayer(const IConnectableLayer* layer,
+                           const char* name = nullptr) override {
         CheckLayerPointer(layer);
         CheckLayerName(name);
     };
@@ -130,16 +130,30 @@ public:
     };
 };
 
-class TestGatherLayerVisitor : public TestLayerVisitor
+class TestSliceLayerVisitor : public TestLayerVisitor
 {
 public:
-    explicit TestGatherLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
+    explicit TestSliceLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
 
-    void VisitGatherLayer(const IConnectableLayer* layer,
-                          const char* name = nullptr) override {
+    void VisitSliceLayer(const IConnectableLayer* layer,
+                         const SliceDescriptor& sliceDescriptor,
+                         const char* name = nullptr) override
+    {
+        CheckLayerPointer(layer);
+        CheckLayerName(name);
+    };
+};
+
+class TestSubtractionLayerVisitor : public TestLayerVisitor
+{
+public:
+    explicit TestSubtractionLayerVisitor(const char* name = nullptr) : TestLayerVisitor(name) {};
+
+    void VisitSubtractionLayer(const IConnectableLayer* layer,
+                               const char* name = nullptr) override {
         CheckLayerPointer(layer);
         CheckLayerName(name);
     };
 };
 
-} //namespace armnn
\ No newline at end of file
+} // namespace armnn