From f90c56d72de4848a2dc5844a97458aaf09df07c2 Mon Sep 17 00:00:00 2001 From: Derek Lamberti Date: Fri, 10 Jan 2020 17:14:08 +0000 Subject: Rename quantized data types to remove ambiguity for signed/unsigned payloads !android-nn-driver:2572 Change-Id: I8fe52ceb09987b3d05c539409510f535165455cc Signed-off-by: Derek Lamberti --- .../test/layerTests/Pooling2dTestImpl.cpp | 80 +++++++++++----------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp') diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp index 160e6582d5..b58e9826b8 100644 --- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp @@ -1366,7 +1366,7 @@ LayerTestResult SimpleMaxPooling2dSize2x2Stride2x2Uint8Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, bool forceNoPadding) { - return SimpleMaxPooling2dSize2x2Stride2x2TestCommon( + return SimpleMaxPooling2dSize2x2Stride2x2TestCommon( workloadFactory, memoryManager, forceNoPadding, 3.0f, -5); } @@ -1375,7 +1375,7 @@ LayerTestResult SimpleMaxPooling2dSize2x2Stride2x2Int16Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, bool forceNoPadding) { - return SimpleMaxPooling2dSize2x2Stride2x2TestCommon( + return SimpleMaxPooling2dSize2x2Stride2x2TestCommon( workloadFactory, memoryManager, forceNoPadding); } @@ -1393,7 +1393,7 @@ LayerTestResult SimpleMaxPooling2dSize3x3Stride2x4Uint8Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, bool forceNoPadding) { - return SimpleMaxPooling2dSize3x3Stride2x4TestCommon( + return SimpleMaxPooling2dSize3x3Stride2x4TestCommon( workloadFactory, memoryManager, forceNoPadding, 0.1f, 128); } @@ -1402,7 +1402,7 @@ LayerTestResult SimpleMaxPooling2dSize3x3Stride2x4Int16Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, bool forceNoPadding) { - return SimpleMaxPooling2dSize3x3Stride2x4TestCommon( + return SimpleMaxPooling2dSize3x3Stride2x4TestCommon( workloadFactory, memoryManager, forceNoPadding); } @@ -1419,7 +1419,7 @@ LayerTestResult SimpleMaxPooling2dUint8Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::DataLayout dataLayout) { - return SimpleMaxPooling2dTestCommon(workloadFactory, memoryManager, dataLayout); + return SimpleMaxPooling2dTestCommon(workloadFactory, memoryManager, dataLayout); } LayerTestResult SimpleMaxPooling2dInt16Test( @@ -1427,7 +1427,7 @@ LayerTestResult SimpleMaxPooling2dInt16Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::DataLayout dataLayout) { - return SimpleMaxPooling2dTestCommon(workloadFactory, memoryManager, dataLayout); + return SimpleMaxPooling2dTestCommon(workloadFactory, memoryManager, dataLayout); } LayerTestResult IgnorePaddingSimpleMaxPooling2dTest( armnn::IWorkloadFactory& workloadFactory, @@ -1440,7 +1440,7 @@ LayerTestResult IgnorePaddingSimpleMaxPooling2dUint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingSimpleMaxPooling2dTestCommon( + return IgnorePaddingSimpleMaxPooling2dTestCommon( workloadFactory, memoryManager, 1.0f, -5); } @@ -1448,7 +1448,7 @@ LayerTestResult IgnorePaddingSimpleMaxPooling2dInt16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingSimpleMaxPooling2dTestCommon( + return IgnorePaddingSimpleMaxPooling2dTestCommon( workloadFactory, memoryManager); } @@ -1463,7 +1463,7 @@ LayerTestResult IgnorePaddingMaxPooling2dSize3Uint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingMaxPooling2dSize3TestCommon( + return IgnorePaddingMaxPooling2dSize3TestCommon( workloadFactory, memoryManager, 1.0f, -5); } @@ -1471,7 +1471,7 @@ LayerTestResult IgnorePaddingMaxPooling2dSize3Int16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingMaxPooling2dSize3TestCommon( + return IgnorePaddingMaxPooling2dSize3TestCommon( workloadFactory, memoryManager); } @@ -1488,7 +1488,7 @@ LayerTestResult SimpleAveragePooling2dUint8Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::DataLayout dataLayout) { - return SimpleAveragePooling2dTestCommon( + return SimpleAveragePooling2dTestCommon( workloadFactory, memoryManager, dataLayout, 0.5, -1); } @@ -1497,7 +1497,7 @@ LayerTestResult SimpleAveragePooling2dInt16Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::DataLayout dataLayout) { - return SimpleAveragePooling2dTestCommon( + return SimpleAveragePooling2dTestCommon( workloadFactory, memoryManager, dataLayout); } @@ -1521,7 +1521,7 @@ LayerTestResult LargeTensorsAveragePooling2dUint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return LargeTensorsAveragePooling2dTestCommon( + return LargeTensorsAveragePooling2dTestCommon( workloadFactory, memoryManager, 0.5, -1); } @@ -1529,7 +1529,7 @@ LayerTestResult LargeTensorsAveragePooling2dInt16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return LargeTensorsAveragePooling2dTestCommon( + return LargeTensorsAveragePooling2dTestCommon( workloadFactory, memoryManager); } LayerTestResult IgnorePaddingSimpleAveragePooling2dTest( @@ -1543,7 +1543,7 @@ LayerTestResult IgnorePaddingSimpleAveragePooling2dUint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingSimpleAveragePooling2dTestCommon( + return IgnorePaddingSimpleAveragePooling2dTestCommon( workloadFactory, memoryManager); } @@ -1551,7 +1551,7 @@ LayerTestResult IgnorePaddingSimpleAveragePooling2dInt16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingSimpleAveragePooling2dTestCommon( + return IgnorePaddingSimpleAveragePooling2dTestCommon( workloadFactory, memoryManager); } @@ -1567,7 +1567,7 @@ LayerTestResult IgnorePaddingSimpleAveragePooling2dNoPaddingUint8Tes armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingSimpleAveragePooling2dNoPaddingTestCommon( + return IgnorePaddingSimpleAveragePooling2dNoPaddingTestCommon( workloadFactory, memoryManager); } @@ -1575,7 +1575,7 @@ LayerTestResult IgnorePaddingSimpleAveragePooling2dNoPaddingInt16Tes armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingSimpleAveragePooling2dNoPaddingTestCommon( + return IgnorePaddingSimpleAveragePooling2dNoPaddingTestCommon( workloadFactory, memoryManager); } @@ -1590,7 +1590,7 @@ LayerTestResult IgnorePaddingAveragePooling2dSize3Uint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingAveragePooling2dSize3TestCommon( + return IgnorePaddingAveragePooling2dSize3TestCommon( workloadFactory, memoryManager); } @@ -1598,7 +1598,7 @@ LayerTestResult IgnorePaddingAveragePooling2dSize3Int16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingAveragePooling2dSize3TestCommon( + return IgnorePaddingAveragePooling2dSize3TestCommon( workloadFactory, memoryManager); } @@ -1615,7 +1615,7 @@ LayerTestResult SimpleL2Pooling2dUint8Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::DataLayout dataLayout) { - return SimpleL2Pooling2dTestCommon(workloadFactory, memoryManager, dataLayout); + return SimpleL2Pooling2dTestCommon(workloadFactory, memoryManager, dataLayout); } LayerTestResult SimpleL2Pooling2dInt16Test( @@ -1623,7 +1623,7 @@ LayerTestResult SimpleL2Pooling2dInt16Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::DataLayout dataLayout) { - return SimpleL2Pooling2dTestCommon(workloadFactory, memoryManager, dataLayout); + return SimpleL2Pooling2dTestCommon(workloadFactory, memoryManager, dataLayout); } LayerTestResult L2Pooling2dSize3Stride1Test( @@ -1637,14 +1637,14 @@ LayerTestResult L2Pooling2dSize3Stride1Uint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return L2Pooling2dSize3Stride1TestCommon(workloadFactory, memoryManager); + return L2Pooling2dSize3Stride1TestCommon(workloadFactory, memoryManager); } LayerTestResult L2Pooling2dSize3Stride1Int16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return L2Pooling2dSize3Stride1TestCommon(workloadFactory, memoryManager); + return L2Pooling2dSize3Stride1TestCommon(workloadFactory, memoryManager); } LayerTestResult L2Pooling2dSize3Stride3Test( @@ -1658,14 +1658,14 @@ LayerTestResult L2Pooling2dSize3Stride3Uint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return L2Pooling2dSize3Stride3TestCommon(workloadFactory, memoryManager); + return L2Pooling2dSize3Stride3TestCommon(workloadFactory, memoryManager); } LayerTestResult L2Pooling2dSize3Stride3Int16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return L2Pooling2dSize3Stride3TestCommon(workloadFactory, memoryManager); + return L2Pooling2dSize3Stride3TestCommon(workloadFactory, memoryManager); } LayerTestResult L2Pooling2dSize3Stride4Test( armnn::IWorkloadFactory& workloadFactory, @@ -1678,14 +1678,14 @@ LayerTestResult L2Pooling2dSize3Stride4Uint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return L2Pooling2dSize3Stride4TestCommon(workloadFactory, memoryManager); + return L2Pooling2dSize3Stride4TestCommon(workloadFactory, memoryManager); } LayerTestResult L2Pooling2dSize3Stride4Int16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return L2Pooling2dSize3Stride4TestCommon(workloadFactory, memoryManager); + return L2Pooling2dSize3Stride4TestCommon(workloadFactory, memoryManager); } LayerTestResult L2Pooling2dSize7Test( @@ -1699,14 +1699,14 @@ LayerTestResult L2Pooling2dSize7Uint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return L2Pooling2dSize7TestCommon(workloadFactory, memoryManager); + return L2Pooling2dSize7TestCommon(workloadFactory, memoryManager); } LayerTestResult L2Pooling2dSize7Int16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return L2Pooling2dSize7TestCommon(workloadFactory, memoryManager); + return L2Pooling2dSize7TestCommon(workloadFactory, memoryManager); } LayerTestResult L2Pooling2dSize9Test( @@ -1720,14 +1720,14 @@ LayerTestResult L2Pooling2dSize9Uint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return L2Pooling2dSize9TestCommon(workloadFactory, memoryManager); + return L2Pooling2dSize9TestCommon(workloadFactory, memoryManager); } LayerTestResult L2Pooling2dSize9Int16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return L2Pooling2dSize9TestCommon(workloadFactory, memoryManager); + return L2Pooling2dSize9TestCommon(workloadFactory, memoryManager); } LayerTestResult IgnorePaddingSimpleL2Pooling2dTest( armnn::IWorkloadFactory& workloadFactory, @@ -1740,14 +1740,14 @@ LayerTestResult IgnorePaddingSimpleL2Pooling2dUint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingSimpleL2Pooling2dTestCommon(workloadFactory, memoryManager); + return IgnorePaddingSimpleL2Pooling2dTestCommon(workloadFactory, memoryManager); } LayerTestResult IgnorePaddingSimpleL2Pooling2dInt16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingSimpleL2Pooling2dTestCommon(workloadFactory, memoryManager); + return IgnorePaddingSimpleL2Pooling2dTestCommon(workloadFactory, memoryManager); } LayerTestResult IgnorePaddingL2Pooling2dSize3Test( @@ -1761,14 +1761,14 @@ LayerTestResult IgnorePaddingL2Pooling2dSize3Uint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingL2Pooling2dSize3TestCommon(workloadFactory, memoryManager); + return IgnorePaddingL2Pooling2dSize3TestCommon(workloadFactory, memoryManager); } LayerTestResult IgnorePaddingL2Pooling2dSize3Int16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return IgnorePaddingL2Pooling2dSize3TestCommon(workloadFactory, memoryManager); + return IgnorePaddingL2Pooling2dSize3TestCommon(workloadFactory, memoryManager); } LayerTestResult AsymmetricNonSquarePooling2dTest( @@ -1782,14 +1782,14 @@ LayerTestResult AsymmetricNonSquarePooling2dUint8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return AsymmetricNonSquarePooling2dTestCommon(workloadFactory, memoryManager); + return AsymmetricNonSquarePooling2dTestCommon(workloadFactory, memoryManager); } LayerTestResult AsymmetricNonSquarePooling2dInt16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return AsymmetricNonSquarePooling2dTestCommon(workloadFactory, memoryManager); + return AsymmetricNonSquarePooling2dTestCommon(workloadFactory, memoryManager); } LayerTestResult ComparePooling2dTest( @@ -1808,7 +1808,7 @@ LayerTestResult ComparePooling2dUint8Test( armnn::IWorkloadFactory& refWorkloadFactory, armnn::PoolingAlgorithm poolingType) { - return ComparePooling2dTestCommon( + return ComparePooling2dTestCommon( workloadFactory, memoryManager, refWorkloadFactory, poolingType, 0.1f, 128); } @@ -1818,6 +1818,6 @@ LayerTestResult ComparePooling2dInt16Test( armnn::IWorkloadFactory& refWorkloadFactory, armnn::PoolingAlgorithm poolingType) { - return ComparePooling2dTestCommon( + return ComparePooling2dTestCommon( workloadFactory, memoryManager, refWorkloadFactory, poolingType); } -- cgit v1.2.1