diff options
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/test/optimizations/FuseActivationTests.cpp | 15 | ||||
-rw-r--r-- | src/armnn/test/optimizations/ReduceMultipleAxesTests.cpp | 14 |
2 files changed, 18 insertions, 11 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 diff --git a/src/armnn/test/optimizations/ReduceMultipleAxesTests.cpp b/src/armnn/test/optimizations/ReduceMultipleAxesTests.cpp index df9a0dbc39..0be8857224 100644 --- a/src/armnn/test/optimizations/ReduceMultipleAxesTests.cpp +++ b/src/armnn/test/optimizations/ReduceMultipleAxesTests.cpp @@ -12,8 +12,9 @@ using namespace armnn; -TEST_SUITE("Optimizer_ReduceMultipleAxes") +namespace { +#if defined(ARMCOMPUTENEON_ENABLED)||defined(ARMCOMPUTECL_ENABLED) INetworkPtr CreateSimpleReduceNetwork(ReduceDescriptor reduceDescriptor, TensorShape& inputShape, TensorShape& outputShape) @@ -243,9 +244,12 @@ void ReduceSumWithThreeAxesTest(Compute backendId) reduceDescriptor.m_vAxis.size(), backendId); } +#endif +} -using namespace armnn; #if defined(ARMCOMPUTENEON_ENABLED) +TEST_SUITE("Optimizer_ReduceMultipleAxesCpu") +{ TEST_CASE("ReduceSumWithTwoAxesKeepDimsCpuAccTest") { ReduceSumWithTwoAxesKeepDimsTest(Compute::CpuAcc); @@ -265,9 +269,12 @@ TEST_CASE("ReduceSumWithThreeAxesCpuAccTest") { ReduceSumWithThreeAxesTest(Compute::CpuAcc); } +} #endif #if defined(ARMCOMPUTECL_ENABLED) +TEST_SUITE("Optimizer_ReduceMultipleAxesGpu") +{ TEST_CASE("ReduceSumWithTwoAxesKeepDimsGpuAccTest") { ReduceSumWithTwoAxesKeepDimsTest(Compute::GpuAcc); @@ -287,6 +294,5 @@ TEST_CASE("ReduceSumWithThreeAxesGpuAccTest") { ReduceSumWithThreeAxesTest(Compute::GpuAcc); } +} #endif - -}
\ No newline at end of file |