diff options
Diffstat (limited to 'src/armnn/test')
-rw-r--r-- | src/armnn/test/NetworkTests.cpp | 51 | ||||
-rw-r--r-- | src/armnn/test/TestLayerVisitor.hpp | 145 |
2 files changed, 53 insertions, 143 deletions
diff --git a/src/armnn/test/NetworkTests.cpp b/src/armnn/test/NetworkTests.cpp index 0963df6222..4de09a2804 100644 --- a/src/armnn/test/NetworkTests.cpp +++ b/src/armnn/test/NetworkTests.cpp @@ -6,6 +6,7 @@ #include "GraphUtils.hpp" #include <armnn/ArmNN.hpp> +#include <armnn/LayerVisitorBase.hpp> #include <Network.hpp> #include <boost/test/unit_test.hpp> @@ -366,4 +367,54 @@ BOOST_AUTO_TEST_CASE(NetworkModification_SplitterMultiplication) prevLayer->GetOutputSlot(0).Connect(layer->GetInputSlot(0)); } +BOOST_AUTO_TEST_CASE(Network_AddQuantize) +{ + struct Test : public armnn::LayerVisitorBase<armnn::VisitorNoThrowPolicy> + { + void VisitQuantizeLayer(const armnn::IConnectableLayer* layer, const char* name) override + { + m_Visited = true; + + BOOST_TEST(layer); + + std::string expectedName = std::string("quantize"); + BOOST_TEST(std::string(layer->GetName()) == expectedName); + BOOST_TEST(std::string(name) == expectedName); + + BOOST_TEST(layer->GetNumInputSlots() == 1); + BOOST_TEST(layer->GetNumOutputSlots() == 1); + + const armnn::TensorInfo& infoIn = layer->GetInputSlot(0).GetConnection()->GetTensorInfo(); + BOOST_TEST((infoIn.GetDataType() == armnn::DataType::Float32)); + + const armnn::TensorInfo& infoOut = layer->GetOutputSlot(0).GetTensorInfo(); + BOOST_TEST((infoOut.GetDataType() == armnn::DataType::QuantisedAsymm8)); + } + + bool m_Visited = false; + }; + + + auto graph = armnn::INetwork::Create(); + + auto input = graph->AddInputLayer(0, "input"); + auto quantize = graph->AddQuantizeLayer("quantize"); + auto output = graph->AddOutputLayer(1, "output"); + + input->GetOutputSlot(0).Connect(quantize->GetInputSlot(0)); + quantize->GetOutputSlot(0).Connect(output->GetInputSlot(0)); + + armnn::TensorInfo infoIn({3,1}, armnn::DataType::Float32); + input->GetOutputSlot(0).SetTensorInfo(infoIn); + + armnn::TensorInfo infoOut({3,1}, armnn::DataType::QuantisedAsymm8); + quantize->GetOutputSlot(0).SetTensorInfo(infoOut); + + Test testQuantize; + graph->Accept(testQuantize); + + BOOST_TEST(testQuantize.m_Visited == true); + +} + BOOST_AUTO_TEST_SUITE_END() diff --git a/src/armnn/test/TestLayerVisitor.hpp b/src/armnn/test/TestLayerVisitor.hpp index 8c0da50be3..e43227f520 100644 --- a/src/armnn/test/TestLayerVisitor.hpp +++ b/src/armnn/test/TestLayerVisitor.hpp @@ -4,13 +4,13 @@ // #pragma once -#include <armnn/ILayerVisitor.hpp> +#include <armnn/LayerVisitorBase.hpp> #include <armnn/Descriptors.hpp> namespace armnn { // Abstract base class with do nothing implementations for all layer visit methods -class TestLayerVisitor : public ILayerVisitor +class TestLayerVisitor : public LayerVisitorBase<VisitorNoThrowPolicy> { protected: virtual ~TestLayerVisitor() {} @@ -34,147 +34,6 @@ public: m_LayerName = ""; } } - - void VisitInputLayer(const IConnectableLayer* layer, - LayerBindingId id, - const char* name = nullptr) override {} - - void VisitConvolution2dLayer(const IConnectableLayer* layer, - const Convolution2dDescriptor& convolution2dDescriptor, - const ConstTensor& weights, - const Optional<ConstTensor>& biases, - const char* name = nullptr) override {} - - void VisitDepthwiseConvolution2dLayer(const IConnectableLayer* layer, - const DepthwiseConvolution2dDescriptor& convolution2dDescriptor, - const ConstTensor& weights, - const Optional<ConstTensor>& biases, - const char* name = nullptr) override {} - - void VisitDetectionPostProcessLayer(const IConnectableLayer* layer, - const DetectionPostProcessDescriptor& descriptor, - const ConstTensor& anchors, - const char* name = nullptr) override {} - - void VisitFullyConnectedLayer(const IConnectableLayer* layer, - const FullyConnectedDescriptor& fullyConnectedDescriptor, - const ConstTensor& weights, - const Optional<ConstTensor>& biases, - const char* name = nullptr) override {} - - void VisitPermuteLayer(const IConnectableLayer* layer, - const PermuteDescriptor& permuteDescriptor, - const char* name = nullptr) override {} - - void VisitBatchToSpaceNdLayer(const IConnectableLayer* layer, - const BatchToSpaceNdDescriptor& batchToSpaceNdDescriptor, - const char* name = nullptr) override {} - - void VisitPooling2dLayer(const IConnectableLayer* layer, - const Pooling2dDescriptor& pooling2dDescriptor, - const char* name = nullptr) override {} - - void VisitActivationLayer(const IConnectableLayer* layer, - const ActivationDescriptor& activationDescriptor, - const char* name = nullptr) override {} - - void VisitNormalizationLayer(const IConnectableLayer* layer, - const NormalizationDescriptor& normalizationDescriptor, - const char* name = nullptr) override {} - - void VisitSoftmaxLayer(const IConnectableLayer* layer, - const SoftmaxDescriptor& softmaxDescriptor, - const char* name = nullptr) override {} - - void VisitSplitterLayer(const IConnectableLayer* layer, - const ViewsDescriptor& splitterDescriptor, - const char* name = nullptr) override {} - - void VisitMergerLayer(const IConnectableLayer* layer, - const OriginsDescriptor& mergerDescriptor, - const char* name = nullptr) override {} - - void VisitAdditionLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} - - void VisitMultiplicationLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} - - void VisitBatchNormalizationLayer(const IConnectableLayer* layer, - const BatchNormalizationDescriptor& desc, - const ConstTensor& mean, - const ConstTensor& variance, - const ConstTensor& beta, - const ConstTensor& gamma, - const char* name = nullptr) override {} - - void VisitResizeBilinearLayer(const IConnectableLayer* layer, - const ResizeBilinearDescriptor& resizeDesc, - const char* name = nullptr) override {} - - void VisitL2NormalizationLayer(const IConnectableLayer* layer, - const L2NormalizationDescriptor& desc, - const char* name = nullptr) override {} - - void VisitConstantLayer(const IConnectableLayer* layer, - const ConstTensor& input, - const char* name = nullptr) override {} - - void VisitReshapeLayer(const IConnectableLayer* layer, - const ReshapeDescriptor& reshapeDescriptor, - const char* name = nullptr) override {} - - void VisitSpaceToBatchNdLayer(const IConnectableLayer* layer, - const SpaceToBatchNdDescriptor& spaceToBatchNdDescriptor, - const char* name = nullptr) override {} - - void VisitFloorLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} - - void VisitOutputLayer(const IConnectableLayer* layer, - LayerBindingId id, - const char* name = nullptr) override {} - - void VisitLstmLayer(const IConnectableLayer* layer, - const LstmDescriptor& descriptor, - const LstmInputParams& params, - const char* name = nullptr) override {} - - void VisitDivisionLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} - - void VisitSubtractionLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} - - void VisitMaximumLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} - - void VisitMeanLayer(const IConnectableLayer* layer, - const MeanDescriptor& meanDescriptor, - const char* name = nullptr) override {} - - void VisitPadLayer(const IConnectableLayer* layer, - const PadDescriptor& padDescriptor, - const char* name = nullptr) override {} - - void VisitStridedSliceLayer(const IConnectableLayer* layer, - const StridedSliceDescriptor& stridedSliceDescriptor, - const char* name = nullptr) override {} - - void VisitMinimumLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} - - void VisitGreaterLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} - - void VisitEqualLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} - - void VisitRsqrtLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} - - void VisitGatherLayer(const IConnectableLayer* layer, - const char* name = nullptr) override {} }; } //namespace armnn |