diff options
author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-06-20 17:17:45 +0100 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2019-06-24 12:50:46 +0000 |
commit | bf0e7226ef0ba5ee3e5c7144368c4c9c379b0330 (patch) | |
tree | b0954a42b260395303d0dda7dd67f83c118a5d44 /src/backends/backendsCommon | |
parent | 6858d3fb714cc20d5fcfd814c35ed3a84dc82145 (diff) | |
download | armnn-bf0e7226ef0ba5ee3e5c7144368c4c9c379b0330.tar.gz |
IVGCVSW-3267 Add more code coverage to the PReLU layer
* Added more unit tests to cover all code branches
* Moved the InferOutput tests to separate files
* Created convenience ARMNN_SIMPLE_TEST_CASE macro
* Created TestUtils file for common utility functions
Change-Id: Id971d3cf77005397d1f0b2783fab68b1f0bf9dfc
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Diffstat (limited to 'src/backends/backendsCommon')
3 files changed, 4 insertions, 18 deletions
diff --git a/src/backends/backendsCommon/test/CommonTestUtils.cpp b/src/backends/backendsCommon/test/CommonTestUtils.cpp index 7685626935..950b939d71 100644 --- a/src/backends/backendsCommon/test/CommonTestUtils.cpp +++ b/src/backends/backendsCommon/test/CommonTestUtils.cpp @@ -9,13 +9,6 @@ using namespace armnn; -void Connect(armnn::IConnectableLayer* from, armnn::IConnectableLayer* to, const armnn::TensorInfo& tensorInfo, - unsigned int fromIndex, unsigned int toIndex) -{ - from->GetOutputSlot(fromIndex).Connect(to->GetInputSlot(toIndex)); - from->GetOutputSlot(fromIndex).SetTensorInfo(tensorInfo); -} - SubgraphView::InputSlots CreateInputsFrom(const std::vector<Layer*>& layers) { SubgraphView::InputSlots result; diff --git a/src/backends/backendsCommon/test/CommonTestUtils.hpp b/src/backends/backendsCommon/test/CommonTestUtils.hpp index 5da0228842..03c975540a 100644 --- a/src/backends/backendsCommon/test/CommonTestUtils.hpp +++ b/src/backends/backendsCommon/test/CommonTestUtils.hpp @@ -12,11 +12,9 @@ #include <backendsCommon/CpuTensorHandle.hpp> #include <backendsCommon/BackendRegistry.hpp> -#include <algorithm> +#include <test/TestUtils.hpp> -// Connects two layers -void Connect(armnn::IConnectableLayer* from, armnn::IConnectableLayer* to, const armnn::TensorInfo& tensorInfo, - unsigned int fromIndex = 0, unsigned int toIndex = 0); +#include <algorithm> // Checks that two collections have the exact same contents (in any order) // The given collections do not have to contain duplicates diff --git a/src/backends/backendsCommon/test/LayerReleaseConstantDataTest.cpp b/src/backends/backendsCommon/test/LayerReleaseConstantDataTest.cpp index d09ebb612a..08f696812e 100644 --- a/src/backends/backendsCommon/test/LayerReleaseConstantDataTest.cpp +++ b/src/backends/backendsCommon/test/LayerReleaseConstantDataTest.cpp @@ -3,6 +3,8 @@ // SPDX-License-Identifier: MIT // +#include "CommonTestUtils.hpp" + #include <Graph.hpp> #include <backendsCommon/CpuTensorHandle.hpp> @@ -16,13 +18,6 @@ using namespace armnn; using namespace std; -// connects two layers -void Connect(Layer* from, Layer* to, const TensorInfo& tensorInfo, unsigned int fromIndex = 0, unsigned int toIndex = 0) -{ - from->GetOutputSlot(fromIndex).Connect(to->GetInputSlot(toIndex)); - from->GetOutputHandler(fromIndex).SetTensorInfo(tensorInfo); -} - ///////////////////////////////////////////////////////////////////////////////////////////// // The following test are created specifically to test ReleaseConstantData() method in the Layer // They build very simple graphs including the layer will be checked. |