diff options
| author | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-12-03 13:42:25 +0000 |
|---|---|---|
| committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-12-04 11:36:33 +0000 |
| commit | 5cb49dcf7ad74cc6e7e91790b7132ae4dd845515 (patch) | |
| tree | 120317f94830f7322fdc332d646154aa46d23d0d /tests | |
| parent | bc4d7c2d0c3484152256d5c9dbb61e6a149bdc20 (diff) | |
| download | ComputeLibrary-5cb49dcf7ad74cc6e7e91790b7132ae4dd845515.tar.gz | |
COMPMID-2962 Fix compiler warnings for g++8
Change-Id: I410c4c54577c1f253597821b1ec6cc40d936b96f
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2406
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests')
4 files changed, 9 insertions, 9 deletions
diff --git a/tests/validation/CL/UNIT/DynamicTensor.cpp b/tests/validation/CL/UNIT/DynamicTensor.cpp index 85381efe62..ceb505142a 100644 --- a/tests/validation/CL/UNIT/DynamicTensor.cpp +++ b/tests/validation/CL/UNIT/DynamicTensor.cpp @@ -50,14 +50,16 @@ namespace constexpr AbsoluteTolerance<float> absolute_tolerance_float(0.0001f); /**< Absolute Tolerance value for comparing reference's output against implementation's output for DataType::F32 */ RelativeTolerance<float> tolerance_f32(0.1f); /**< Tolerance value for comparing reference's output against implementation's output for DataType::F32 */ constexpr float tolerance_num = 0.07f; /**< Tolerance number */ +} // namespace +#ifndef DOXYGEN_SKIP_THIS using CLL2NormLayerWrapper = SimpleFunctionWrapper<MemoryManagerOnDemand, CLL2NormalizeLayer, ICLTensor>; template <> void CLL2NormLayerWrapper::configure(ICLTensor *src, ICLTensor *dst) { _func.configure(src, dst, 0, 0.0001f); } -} // namespace +#endif // DOXYGEN_SKIP_THIS TEST_SUITE(CL) TEST_SUITE(UNIT) TEST_SUITE(DynamicTensor) diff --git a/tests/validation/GLES_COMPUTE/UNIT/DynamicTensor.cpp b/tests/validation/GLES_COMPUTE/UNIT/DynamicTensor.cpp index cab854424e..f7264b281e 100644 --- a/tests/validation/GLES_COMPUTE/UNIT/DynamicTensor.cpp +++ b/tests/validation/GLES_COMPUTE/UNIT/DynamicTensor.cpp @@ -43,15 +43,15 @@ namespace test { namespace validation { -namespace -{ +#ifndef DOXYGEN_SKIP_THIS using GCNormLayerWrapper = SimpleFunctionWrapper<MemoryManagerOnDemand, GCNormalizationLayer, IGCTensor>; template <> void GCNormLayerWrapper::configure(IGCTensor *src, IGCTensor *dst) { _func.configure(src, dst, NormalizationLayerInfo(NormType::CROSS_MAP, 3)); } -} // namespace +#endif // DOXYGEN_SKIP_THIS + TEST_SUITE(GC) TEST_SUITE(UNIT) TEST_SUITE(DynamicTensor) diff --git a/tests/validation/NEON/UNIT/DynamicTensor.cpp b/tests/validation/NEON/UNIT/DynamicTensor.cpp index 53dec53912..76f30d00e5 100644 --- a/tests/validation/NEON/UNIT/DynamicTensor.cpp +++ b/tests/validation/NEON/UNIT/DynamicTensor.cpp @@ -47,14 +47,15 @@ namespace constexpr AbsoluteTolerance<float> absolute_tolerance_float(0.0001f); /**< Absolute Tolerance value for comparing reference's output against implementation's output for DataType::F32 */ RelativeTolerance<float> tolerance_f32(0.1f); /**< Tolerance value for comparing reference's output against implementation's output for DataType::F32 */ constexpr float tolerance_num = 0.07f; /**< Tolerance number */ - +} // namespace +#ifndef DOXYGEN_SKIP_THIS using NENormLayerWrapper = SimpleFunctionWrapper<MemoryManagerOnDemand, NENormalizationLayer, ITensor>; template <> void NENormLayerWrapper::configure(arm_compute::ITensor *src, arm_compute::ITensor *dst) { _func.configure(src, dst, NormalizationLayerInfo(NormType::CROSS_MAP, 3)); } -} // namespace +#endif // DOXYGEN_SKIP_THIS TEST_SUITE(NEON) TEST_SUITE(UNIT) TEST_SUITE(DynamicTensor) diff --git a/tests/validation/fixtures/UNIT/DynamicTensorFixture.h b/tests/validation/fixtures/UNIT/DynamicTensorFixture.h index 02d28fa78d..86380509ed 100644 --- a/tests/validation/fixtures/UNIT/DynamicTensorFixture.h +++ b/tests/validation/fixtures/UNIT/DynamicTensorFixture.h @@ -41,8 +41,6 @@ namespace test { namespace validation { -namespace -{ template <typename AllocatorType, typename LifetimeMgrType, typename PoolMgrType, @@ -114,7 +112,6 @@ public: private: FuncType _func; }; -} // namespace /** Simple test case to run a single function with different shapes twice. * |