diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2022-05-05 15:26:27 +0100 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2022-05-05 14:42:49 +0000 |
| commit | 3a3a6bfaedc64fac3644c8fe88dbfc3947e2b3ab (patch) | |
| tree | 6fc26b803d71fbcfbd16ca8cac0c04e4dfd36095 | |
| parent | 725728e7d46c1e672bbdc72cf86e22db6fb210ee (diff) | |
| download | armnn-3a3a6bfaedc64fac3644c8fe88dbfc3947e2b3ab.tar.gz | |
Revert "IVGCVSW-6937 Add INT32 support to FLOOR"
This reverts commit 38b72e8de898d84a1481e242803da61009719891.
* It is not longer needed as this functionality is cover with the commit:
IVGCVSW-6938 Do not add Floor when FloorDiv is int32 in Tfliteparser
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Iac757cf9b47d2516804dca2efb347cfbd3282f14
| -rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 3 | ||||
| -rw-r--r-- | src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp | 11 | ||||
| -rw-r--r-- | src/backends/reference/RefLayerSupport.cpp | 5 | ||||
| -rw-r--r-- | src/backends/reference/test/RefLayerTests.cpp | 1 |
4 files changed, 6 insertions, 14 deletions
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index a2dcd63726..d89b5899ba 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -1953,8 +1953,7 @@ void FloorQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const DataType::BFloat16, DataType::Float32, DataType::Float16, - DataType::QSymmS16, - DataType::Signed32 + DataType::QSymmS16 }; ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); diff --git a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp index 377c2aaf1a..2bf8c97af5 100644 --- a/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/FloorTestImpl.cpp @@ -19,10 +19,10 @@ LayerTestResult<T, 4> SimpleFloorTest( { IgnoreUnused(memoryManager); armnn::TensorInfo inputTensorInfo({1, 3, 2, 3}, ArmnnType); - inputTensorInfo.SetQuantizationScale(1.0f); + inputTensorInfo.SetQuantizationScale(0.1f); armnn::TensorInfo outputTensorInfo(inputTensorInfo); - outputTensorInfo.SetQuantizationScale(1.0f); + outputTensorInfo.SetQuantizationScale(0.1f); std::vector<T> input = ConvertToDataType<ArmnnType>( { @@ -80,14 +80,9 @@ SimpleFloorTest<armnn::DataType::Float16>( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory); + template LayerTestResult<armnn::ResolveType<armnn::DataType::QSymmS16>, 4> SimpleFloorTest<armnn::DataType::QSymmS16>( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory); - -template LayerTestResult<armnn::ResolveType<armnn::DataType::Signed32>, 4> -SimpleFloorTest<armnn::DataType::Signed32>( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const armnn::ITensorHandleFactory& tensorHandleFactory);
\ No newline at end of file diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp index 919c6db6ff..f921383183 100644 --- a/src/backends/reference/RefLayerSupport.cpp +++ b/src/backends/reference/RefLayerSupport.cpp @@ -1458,12 +1458,11 @@ bool RefLayerSupport::IsFloorSupported(const TensorInfo& input, IgnoreUnused(output); bool supported = true; - std::array<DataType,4> supportedTypes = + std::array<DataType,3> supportedTypes = { DataType::BFloat16, DataType::Float32, - DataType::Float16, - DataType::Signed32 + DataType::Float16 }; supported &= CheckSupportRule(TypeAnyOf(input, supportedTypes), reasonIfUnsupported, diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index 5db335fc15..496b11db91 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -1643,7 +1643,6 @@ ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleFillS32, SimpleFillTest<DataType::Signed32>) // Floor ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleFloor, SimpleFloorTest<DataType::Float32>) ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleFloorFloat16, SimpleFloorTest<DataType::Float16>) -ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleFloorInt32, SimpleFloorTest<DataType::Signed32>) // Reshape ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleReshapeFloat32, SimpleReshapeTest<DataType::Float32>) |