diff options
Diffstat (limited to 'src/armnn/test')
-rw-r--r-- | src/armnn/test/QuantizerTest.cpp | 38 | ||||
-rw-r--r-- | src/armnn/test/TestLayerVisitor.cpp | 4 | ||||
-rw-r--r-- | src/armnn/test/TestLayerVisitor.hpp | 80 |
3 files changed, 61 insertions, 61 deletions
diff --git a/src/armnn/test/QuantizerTest.cpp b/src/armnn/test/QuantizerTest.cpp index 7f782dc686..ba10fd8b79 100644 --- a/src/armnn/test/QuantizerTest.cpp +++ b/src/armnn/test/QuantizerTest.cpp @@ -30,8 +30,8 @@ class TestQuantization : public LayerVisitorBase<VisitorThrowingPolicy> { public: virtual void VisitInputLayer(const IConnectableLayer* layer, - LayerBindingId id, - const char* name = nullptr) + LayerBindingId id, + const char* name = nullptr) { TensorInfo info = layer->GetOutputSlot(0).GetTensorInfo(); @@ -40,12 +40,12 @@ public: BOOST_TEST((info.GetQuantizationOffset() == 128)); // Based off current default [-15.0f, 15.0f] - BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 30.0f/255.0f, 0.000001f ); + BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 30.0f/255.0f, 0.000001f); } virtual void VisitOutputLayer(const IConnectableLayer* layer, - LayerBindingId id, - const char* name = nullptr) + LayerBindingId id, + const char* name = nullptr) {} }; @@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE(QuantizeAddition) BOOST_TEST((info.GetQuantizationOffset() == 128)); // Based off current static value [-20.0f, 20.0f] - BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 40.0f/255.0f, 0.000001f ); + BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 40.0f/255.0f, 0.000001f); } }; @@ -105,8 +105,8 @@ class TestActivationQuantization : public TestQuantization { public: virtual void VisitActivationLayer(const IConnectableLayer* layer, - const ActivationDescriptor& descriptor, - const char* name = nullptr) + const ActivationDescriptor& descriptor, + const char* name = nullptr) { TensorInfo info = layer->GetOutputSlot(0).GetTensorInfo(); @@ -115,7 +115,7 @@ public: BOOST_TEST((info.GetQuantizationOffset() == 0)); // Based off current static value [-20.0f, 20.0f] - BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 15.0f/255.0f, 0.000001f ); + BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 15.0f/255.0f, 0.000001f); } }; @@ -202,8 +202,8 @@ BOOST_AUTO_TEST_CASE(QuantizeBoundedReluActivation) { public: virtual void VisitActivationLayer(const IConnectableLayer* layer, - const ActivationDescriptor& descriptor, - const char* name = nullptr) + const ActivationDescriptor& descriptor, + const char* name = nullptr) { TensorInfo info = layer->GetOutputSlot(0).GetTensorInfo(); @@ -212,7 +212,7 @@ BOOST_AUTO_TEST_CASE(QuantizeBoundedReluActivation) BOOST_TEST((info.GetQuantizationOffset() == 0)); // Based off current static value [0.0f, 3.5f(<-layer upper bound)] - BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 3.5f/255.0f, 0.000001f ); + BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 3.5f/255.0f, 0.000001f); } }; @@ -234,8 +234,8 @@ BOOST_AUTO_TEST_CASE(QuantizeTanHActivation) { public: virtual void VisitActivationLayer(const IConnectableLayer* layer, - const ActivationDescriptor& descriptor, - const char* name = nullptr) + const ActivationDescriptor& descriptor, + const char* name = nullptr) { TensorInfo info = layer->GetOutputSlot(0).GetTensorInfo(); @@ -244,7 +244,7 @@ BOOST_AUTO_TEST_CASE(QuantizeTanHActivation) BOOST_TEST((info.GetQuantizationOffset() == 128)); // Based off current static value [-1.0f, 1.0f] - BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 2.0f/255.0f, 0.000001f ); + BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 2.0f/255.0f, 0.000001f); } }; @@ -266,8 +266,8 @@ BOOST_AUTO_TEST_CASE(QuantizeLeakyReLuActivation) { public: virtual void VisitActivationLayer(const IConnectableLayer* layer, - const ActivationDescriptor& descriptor, - const char* name = nullptr) + const ActivationDescriptor& descriptor, + const char* name = nullptr) { TensorInfo info = layer->GetOutputSlot(0).GetTensorInfo(); @@ -276,7 +276,7 @@ BOOST_AUTO_TEST_CASE(QuantizeLeakyReLuActivation) BOOST_TEST((info.GetQuantizationOffset() == 64)); // Based off current static value [-5.0f, 15.0f] - BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 20.0f/255.0f, 0.000001f ); + BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 20.0f/255.0f, 0.000001f); } }; @@ -313,7 +313,7 @@ BOOST_AUTO_TEST_CASE(QuantizeBatchNorm) BOOST_TEST((info.GetQuantizationOffset() == 128)); // Based off current static value [-15.0f, 15.0f] - BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 30.0f/255.0f, 0.000001f ); + BOOST_CHECK_CLOSE(info.GetQuantizationScale(), 30.0f/255.0f, 0.000001f); //Test constants BOOST_TEST((mean.GetInfo().GetDataType() == DataType::QuantisedAsymm8)); diff --git a/src/armnn/test/TestLayerVisitor.cpp b/src/armnn/test/TestLayerVisitor.cpp index 2584179bb7..932aef6deb 100644 --- a/src/armnn/test/TestLayerVisitor.cpp +++ b/src/armnn/test/TestLayerVisitor.cpp @@ -28,7 +28,7 @@ void TestLayerVisitor::CheckLayerName(const char* name) void TestLayerVisitor::CheckLayerPointer(const IConnectableLayer* layer) { BOOST_CHECK(layer != nullptr); -}; +} void TestLayerVisitor::CheckConstTensors(const ConstTensor& expected, const ConstTensor& actual) { @@ -48,4 +48,4 @@ void TestLayerVisitor::CheckConstTensors(const ConstTensor& expected, const Cons } } -} //namespace armnn
\ No newline at end of file +} //namespace armnn diff --git a/src/armnn/test/TestLayerVisitor.hpp b/src/armnn/test/TestLayerVisitor.hpp index 6b9503291a..fe2631fa39 100644 --- a/src/armnn/test/TestLayerVisitor.hpp +++ b/src/armnn/test/TestLayerVisitor.hpp @@ -13,7 +13,7 @@ namespace armnn class TestLayerVisitor : public ILayerVisitor { protected: - virtual ~TestLayerVisitor() {}; + virtual ~TestLayerVisitor() {} void CheckLayerName(const char* name); @@ -31,87 +31,87 @@ public: { m_LayerName = ""; } - }; + } virtual void VisitInputLayer(const IConnectableLayer* layer, LayerBindingId id, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitConvolution2dLayer(const IConnectableLayer* layer, const Convolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitConvolution2dLayer(const IConnectableLayer* layer, const Convolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const ConstTensor& biases, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitDepthwiseConvolution2dLayer(const IConnectableLayer* layer, const DepthwiseConvolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitDepthwiseConvolution2dLayer(const IConnectableLayer* layer, const DepthwiseConvolution2dDescriptor& convolution2dDescriptor, const ConstTensor& weights, const ConstTensor& biases, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitDetectionPostProcessLayer(const IConnectableLayer* layer, const DetectionPostProcessDescriptor& descriptor, const ConstTensor& anchors, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitFullyConnectedLayer(const IConnectableLayer* layer, const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitFullyConnectedLayer(const IConnectableLayer* layer, const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, const ConstTensor& biases, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitPermuteLayer(const IConnectableLayer* layer, const PermuteDescriptor& permuteDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitBatchToSpaceNdLayer(const IConnectableLayer* layer, const BatchToSpaceNdDescriptor& batchToSpaceNdDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitPooling2dLayer(const IConnectableLayer* layer, const Pooling2dDescriptor& pooling2dDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitActivationLayer(const IConnectableLayer* layer, const ActivationDescriptor& activationDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitNormalizationLayer(const IConnectableLayer* layer, const NormalizationDescriptor& normalizationDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitSoftmaxLayer(const IConnectableLayer* layer, const SoftmaxDescriptor& softmaxDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitSplitterLayer(const IConnectableLayer* layer, const ViewsDescriptor& splitterDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitMergerLayer(const IConnectableLayer* layer, const OriginsDescriptor& mergerDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitAdditionLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitMultiplicationLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitBatchNormalizationLayer(const IConnectableLayer* layer, const BatchNormalizationDescriptor& desc, @@ -119,75 +119,75 @@ public: const ConstTensor& variance, const ConstTensor& beta, const ConstTensor& gamma, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitResizeBilinearLayer(const IConnectableLayer* layer, const ResizeBilinearDescriptor& resizeDesc, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitL2NormalizationLayer(const IConnectableLayer* layer, const L2NormalizationDescriptor& desc, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitConstantLayer(const IConnectableLayer* layer, const ConstTensor& input, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitReshapeLayer(const IConnectableLayer* layer, const ReshapeDescriptor& reshapeDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitSpaceToBatchNdLayer(const IConnectableLayer* layer, const SpaceToBatchNdDescriptor& spaceToBatchNdDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitFloorLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitOutputLayer(const IConnectableLayer* layer, LayerBindingId id, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitLstmLayer(const IConnectableLayer* layer, const LstmDescriptor& descriptor, const LstmInputParams& params, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitDivisionLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitSubtractionLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitMaximumLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitMeanLayer(const IConnectableLayer* layer, const MeanDescriptor& meanDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitPadLayer(const IConnectableLayer* layer, const PadDescriptor& padDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitStridedSliceLayer(const IConnectableLayer* layer, const StridedSliceDescriptor& stridedSliceDescriptor, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitMinimumLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitGreaterLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitEqualLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitRsqrtLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} virtual void VisitGatherLayer(const IConnectableLayer* layer, - const char* name = nullptr) {}; + const char* name = nullptr) {} }; } //namespace armnn |