diff options
author | Matthew Bentham <matthew.bentham@arm.com> | 2021-07-05 12:56:46 +0100 |
---|---|---|
committer | Matthew Sloyan <matthew.sloyan@arm.com> | 2021-07-16 15:59:44 +0000 |
commit | a34c98d17b6784e4b5b3a9d77654717e86517bab (patch) | |
tree | f48ad62a9cf8ff38ffe438881d28b09a8050134e /src/armnn/test/optimizations/FuseActivationTests.cpp | |
parent | 18bf43d9caeb7f482e0beaef45202b6638d48a8c (diff) | |
download | armnn-a34c98d17b6784e4b5b3a9d77654717e86517bab.tar.gz |
Avoid empty test suites
Refactor code around conditionally-compiled tests to avoid declaring
empty test suites, as this can cause unused function warnings to be
issued under certain combinations of compiler, warning level, and
doctest version.
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
Change-Id: Ib501aef80475538a725b857d9c31d1d2f96b124d
Diffstat (limited to 'src/armnn/test/optimizations/FuseActivationTests.cpp')
-rw-r--r-- | src/armnn/test/optimizations/FuseActivationTests.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/armnn/test/optimizations/FuseActivationTests.cpp b/src/armnn/test/optimizations/FuseActivationTests.cpp index 35b5bbc2da..24ea8f6680 100644 --- a/src/armnn/test/optimizations/FuseActivationTests.cpp +++ b/src/armnn/test/optimizations/FuseActivationTests.cpp @@ -17,9 +17,7 @@ using namespace armnn; -TEST_SUITE("Optimizer") -{ -namespace armnn +namespace { template<typename T> @@ -471,10 +469,11 @@ bool FuseActivationSimpleTest(ActivationDescriptor activationDescriptor, Compute return success; } -} // namespace armnn +} -using namespace armnn; #if defined(ARMCOMPUTENEON_ENABLED) +TEST_SUITE("Optimizer") +{ // ReLu fused into Receiver Layers Float32 TEST_CASE("FuseReLUIntoConvFloat32CpuAccTest") { @@ -712,9 +711,12 @@ TEST_CASE("LayerFollowedByActivationQAsymmU8CpuAccTest") (activationDescriptor, Compute::CpuAcc)), "FullyConnected + Activation function " << static_cast<int>(activationDescriptor.m_Function)); } +} #endif #if defined(ARMCOMPUTECL_ENABLED) +TEST_SUITE("Optimizer") +{ // ReLu fused into Receiver Layers Float32 TEST_CASE("FuseReLUIntoConvFloat32GpuAccTest") { @@ -1176,6 +1178,5 @@ TEST_CASE("LayerFollowedByActivationQAsymmU8GpuAccTest") (activationDescriptor, Compute::GpuAcc)), "FullyConnected + Activation function " << static_cast<int>(activationDescriptor.m_Function)); } +} #endif - -}
\ No newline at end of file |