commit aa80d8a9f334254188aa244d3a438846f3996177
author Francis Murtagh <francis.murtagh@arm.com> Fri Feb 15 16:56:27 2019 +0000
committer Francis Murtagh <francis.murtagh@arm.com> Fri Feb 15 16:56:27 2019 +0000
tree 5234de6e3990fdf1ca8cca5bb4e8000604ded3dc
parent 8675b68e1ed73c56cd00c1eb3a9c9921a1898309

IVGCVSW-2618 Support static quantization of Splitter

Change-Id: I8e44866336dcd5a9694309cf9bb954a4991e61fd
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>

src/armnn/QuantizerVisitor.cpp

diff --git a/src/armnn/QuantizerVisitor.cpp b/src/armnn/QuantizerVisitor.cpp
index 95b5939..2ca164b 100644
--- a/src/armnn/QuantizerVisitor.cpp
+++ b/src/armnn/QuantizerVisitor.cpp
@@ -262,6 +262,15 @@
     RecordLayer(layer, newLayer);
 }
 
+void QuantizerVisitor::VisitSplitterLayer(const IConnectableLayer* layer,
+                                          const SplitterDescriptor& splitterDescriptor,
+                                          const char* name)
+{
+    IConnectableLayer* newLayer = m_QuantizedNetwork->AddSplitterLayer(splitterDescriptor, name);
+    RecordLayer(layer, newLayer);
+    SetQuantizedInputConnections(layer, newLayer);
+}
+
 void QuantizerVisitor::VisitReshapeLayer(const IConnectableLayer* layer,
                                          const ReshapeDescriptor& reshapeDescriptor,
                                          const char* name)

src/armnn/QuantizerVisitor.hpp

diff --git a/src/armnn/QuantizerVisitor.hpp b/src/armnn/QuantizerVisitor.hpp
index aaa888e..79c44f2 100644
--- a/src/armnn/QuantizerVisitor.hpp
+++ b/src/armnn/QuantizerVisitor.hpp
@@ -76,6 +76,10 @@
                                   const SpaceToBatchNdDescriptor& spaceToBatchNdDescriptor,
                                   const char* name = nullptr) override;
 
+    void VisitSplitterLayer(const IConnectableLayer* layer,
+                            const SplitterDescriptor& splitterDescriptor,
+                            const char* name = nullptr) override;
+
     void VisitPooling2dLayer(const IConnectableLayer* layer,
                              const Pooling2dDescriptor& pooling2dDescriptor,
                              const char* name = nullptr) override;

src/armnn/StaticRangeVisitor.cpp

diff --git a/src/armnn/StaticRangeVisitor.cpp b/src/armnn/StaticRangeVisitor.cpp
index 4b715bd..ad2de63 100644
--- a/src/armnn/StaticRangeVisitor.cpp
+++ b/src/armnn/StaticRangeVisitor.cpp
@@ -207,4 +207,12 @@
     ForwardParentParameters(layer);
 }
 
+void StaticRangeVisitor::VisitSplitterLayer(const IConnectableLayer* layer,
+                                            const SplitterDescriptor& splitterDescriptor,
+                                            const char* name)
+{
+    boost::ignore_unused(splitterDescriptor);
+    ForwardParentParameters(layer);
+}
+
 } //namespace armnn

src/armnn/StaticRangeVisitor.hpp

diff --git a/src/armnn/StaticRangeVisitor.hpp b/src/armnn/StaticRangeVisitor.hpp
index 145db20..a42ad37 100644
--- a/src/armnn/StaticRangeVisitor.hpp
+++ b/src/armnn/StaticRangeVisitor.hpp
@@ -83,6 +83,10 @@
                            const ReshapeDescriptor& reshapeDescriptor,
                            const char* name = nullptr) override;
 
+    void VisitSplitterLayer(const IConnectableLayer* layer,
+                            const SplitterDescriptor& splitterDescriptor,
+                            const char* name = nullptr) override;
+
 private:
     /// Set the range for an output slot on a layer
     void SetRange(const IConnectableLayer* layer, unsigned int outputIdx, float min, float max);

src/armnn/test/QuantizerTest.cpp

diff --git a/src/armnn/test/QuantizerTest.cpp b/src/armnn/test/QuantizerTest.cpp
index b73ac20..1f6537d 100644
--- a/src/armnn/test/QuantizerTest.cpp
+++ b/src/armnn/test/QuantizerTest.cpp
@@ -791,7 +791,7 @@
     // Establish connections
     input0->GetOutputSlot(0).Connect(activation->GetInputSlot(0));
 
-    //Set TensorInfo
+    // Set TensorInfo
     input0->GetOutputSlot(0).SetTensorInfo(info);
     activation->GetOutputSlot(0).SetTensorInfo(info);
 
@@ -918,7 +918,7 @@
     activation->GetOutputSlot(0).Connect(pooling2d->GetInputSlot(0));
     pooling2d->GetOutputSlot(0).Connect(output->GetInputSlot(0));
 
-    //Set TensorInfo
+    // Set TensorInfo
     input0->GetOutputSlot(0).SetTensorInfo(info);
     activation->GetOutputSlot(0).SetTensorInfo(info);
     pooling2d->GetOutputSlot(0).SetTensorInfo(info);
@@ -1083,5 +1083,42 @@
     VisitLayersTopologically(quantizedNetwork.get(), validator);
 }
 
+class TestSplitterQuantization : public TestLeakyReLuActivationQuantization
+{
+public:
+    virtual void VisitSplitterLayer(const IConnectableLayer* layer,
+                                    const SplitterDescriptor& desc,
+                                    const char* name = nullptr)
+    {
+        TensorInfo info = layer->GetOutputSlot(0).GetTensorInfo();
+
+        BOOST_TEST((info.GetDataType() == DataType::QuantisedAsymm8));
+
+        BOOST_TEST((info.GetQuantizationOffset() == 64));
+
+        // Based off parent LeakyReLu [-5.f, 15.f]
+        BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 20.0f/g_QuantizationBase, g_TestTolerance);
+    }
+};
+
+BOOST_AUTO_TEST_CASE(QuantizeSplitter)
+{
+    auto network = INetwork::Create();
+
+    TensorShape shape{3U};
+    TensorInfo info(shape, DataType::Float32);
+
+    IConnectableLayer* activation = CreateStartOfLeakyReluNetwork(network.get(), info);
+
+    // Add the layer under test
+    ViewsDescriptor splitterDesc(2,4);
+    IConnectableLayer* splitter = network->AddSplitterLayer(splitterDesc);
+    CompleteLeakyReluNetwork(network.get(), activation, splitter, info);
+
+    auto quantizedNetwork = INetworkQuantizer::Create(network.get())->ExportNetwork();
+    TestSplitterQuantization validator;
+    VisitLayersTopologically(quantizedNetwork.get(), validator);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 } // namespace armnn