diff options
Diffstat (limited to 'src/backends/backendsCommon')
-rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 16 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/LayerTests.hpp | 60 |
2 files changed, 16 insertions, 60 deletions
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 1505078b77..7c9d4ac58c 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -914,6 +914,22 @@ void ResizeBilinearQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) c ValidateTensorNumDimensions(workloadInfo.m_InputTensorInfos[0], "ResizeBilinearQueueDescriptor", 4, "input"); ValidateTensorNumDimensions(workloadInfo.m_OutputTensorInfos[0], "ResizeBilinearQueueDescriptor", 4, "output"); + std::vector<DataType> supportedTypes = + { + DataType::Float16, + DataType::Float32, + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 + }; + + ValidateDataTypes(workloadInfo.m_InputTensorInfos[0], + supportedTypes, + "ResizeBilinearQueueDescriptor"); + + ValidateDataTypes(workloadInfo.m_OutputTensorInfos[0], + {workloadInfo.m_InputTensorInfos[0].GetDataType()}, + "ResizeBilinearQueueDescriptor"); + // Resizes bilinear only changes width and height: batch and channel count must match. { const unsigned int inputBatchSize = workloadInfo.m_InputTensorInfos[0].GetShape()[0]; diff --git a/src/backends/backendsCommon/test/LayerTests.hpp b/src/backends/backendsCommon/test/LayerTests.hpp index fab1ad83c1..704e88ef6b 100644 --- a/src/backends/backendsCommon/test/LayerTests.hpp +++ b/src/backends/backendsCommon/test/LayerTests.hpp @@ -2443,18 +2443,6 @@ LayerTestResult<T, 4> ResizeBilinearNopTest( return result; } -template LayerTestResult<typename armnn::ResolveType<armnn::DataType::Float32>, 4> -ResizeBilinearNopTest<armnn::DataType::Float32>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::DataLayout dataLayout); - -template LayerTestResult<typename armnn::ResolveType<armnn::DataType::QuantisedAsymm8>, 4> -ResizeBilinearNopTest<armnn::DataType::QuantisedAsymm8>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::DataLayout dataLayout); - template<armnn::DataType ArmnnType, typename T> LayerTestResult<T, 4> SimpleResizeBilinearTest( armnn::IWorkloadFactory& workloadFactory, @@ -2553,18 +2541,6 @@ LayerTestResult<T, 4> SimpleResizeBilinearTest( return result; } -template LayerTestResult<typename armnn::ResolveType<armnn::DataType::Float32>, 4> -SimpleResizeBilinearTest<armnn::DataType::Float32>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::DataLayout dataLayout); - -template LayerTestResult<typename armnn::ResolveType<armnn::DataType::QuantisedAsymm8>, 4> -SimpleResizeBilinearTest<armnn::DataType::QuantisedAsymm8>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::DataLayout dataLayout); - template<armnn::DataType ArmnnType, typename T> LayerTestResult<T, 4> ResizeBilinearSqMinTest( armnn::IWorkloadFactory& workloadFactory, @@ -2666,18 +2642,6 @@ LayerTestResult<T, 4> ResizeBilinearSqMinTest( return result; } -template LayerTestResult<typename armnn::ResolveType<armnn::DataType::Float32>, 4> -ResizeBilinearSqMinTest<armnn::DataType::Float32>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::DataLayout dataLayout); - -template LayerTestResult<typename armnn::ResolveType<armnn::DataType::QuantisedAsymm8>, 4> -ResizeBilinearSqMinTest<armnn::DataType::QuantisedAsymm8>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::DataLayout dataLayout); - template<armnn::DataType ArmnnType, typename T> LayerTestResult<T, 4> ResizeBilinearMinTest( armnn::IWorkloadFactory& workloadFactory, @@ -2774,18 +2738,6 @@ LayerTestResult<T, 4> ResizeBilinearMinTest( return result; } -template LayerTestResult<typename armnn::ResolveType<armnn::DataType::Float32>, 4> -ResizeBilinearMinTest<armnn::DataType::Float32>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::DataLayout dataLayout); - -template LayerTestResult<typename armnn::ResolveType<armnn::DataType::QuantisedAsymm8>, 4> -ResizeBilinearMinTest<armnn::DataType::QuantisedAsymm8>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::DataLayout dataLayout); - template<armnn::DataType ArmnnType, typename T> LayerTestResult<T, 4> ResizeBilinearMagTest( armnn::IWorkloadFactory& workloadFactory, @@ -2889,18 +2841,6 @@ LayerTestResult<T, 4> ResizeBilinearMagTest( return result; } -template LayerTestResult<typename armnn::ResolveType<armnn::DataType::Float32>, 4> -ResizeBilinearMagTest<armnn::DataType::Float32>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::DataLayout dataLayout); - -template LayerTestResult<typename armnn::ResolveType<armnn::DataType::QuantisedAsymm8>, 4> -ResizeBilinearMagTest<armnn::DataType::QuantisedAsymm8>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::DataLayout dataLayout); - template<armnn::DataType ArmnnType, typename T, std::size_t InputDim, std::size_t OutputDim> LayerTestResult<T, OutputDim> MeanTestHelper( armnn::IWorkloadFactory& workloadFactory, |