IVGCVSW-4889/IVGCVSW-4890 CL/Neon UnitTests for align_corners & half_pixels
*Add more UnitTests to the reference implemenation.
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Idbce68baa76b049e5f741f790a5cfd75acb54a95
diff --git a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp
index 72507d3..0b02c1f 100644
--- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp
+++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2019 Arm Ltd. All rights reserved.
+// Copyright © 2019 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
@@ -816,6 +816,30 @@
float outQuantScale,
int32_t outQuantOffset);
+template LayerTestResult<armnn::ResolveType<armnn::DataType::Float16>, 4>
+HalfPixelCentersResizeBilinearTest<armnn::DataType::Float16>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::Float16>, 4>
+AlignCornersResizeBilinearTest<armnn::DataType::Float16>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::Float16>, 4>
+HalfPixelCentersResizeNearestNeighbourTest<armnn::DataType::Float16>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::Float16>, 4>
+AlignCornersResizeNearestNeighbourTest<armnn::DataType::Float16>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
// QAsymm8
template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmU8>, 4>
ResizeBilinearNopTest<armnn::DataType::QAsymmU8>(
@@ -881,6 +905,30 @@
float outQuantScale,
int32_t outQuantOffset);
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmS8>, 4>
+HalfPixelCentersResizeBilinearTest<armnn::DataType::QAsymmS8>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmS8>, 4>
+AlignCornersResizeBilinearTest<armnn::DataType::QAsymmS8>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmS8>, 4>
+HalfPixelCentersResizeNearestNeighbourTest<armnn::DataType::QAsymmS8>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmS8>, 4>
+AlignCornersResizeNearestNeighbourTest<armnn::DataType::QAsymmS8>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
// QAsymmS8
template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmS8>, 4>
ResizeBilinearNopTest<armnn::DataType::QAsymmS8>(
@@ -946,6 +994,30 @@
float outQuantScale,
int32_t outQuantOffset);
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmU8>, 4>
+HalfPixelCentersResizeBilinearTest<armnn::DataType::QAsymmU8>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmU8>, 4>
+AlignCornersResizeBilinearTest<armnn::DataType::QAsymmU8>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmU8>, 4>
+HalfPixelCentersResizeNearestNeighbourTest<armnn::DataType::QAsymmU8>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmU8>, 4>
+AlignCornersResizeNearestNeighbourTest<armnn::DataType::QAsymmU8>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
// QSymm16
template LayerTestResult<armnn::ResolveType<armnn::DataType::QSymmS16>, 4>
ResizeBilinearNopTest<armnn::DataType::QSymmS16>(
@@ -1010,3 +1082,27 @@
int32_t inQuantOffset,
float outQuantScale,
int32_t outQuantOffset);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QSymmS16>, 4>
+HalfPixelCentersResizeBilinearTest<armnn::DataType::QSymmS16>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QSymmS16>, 4>
+AlignCornersResizeBilinearTest<armnn::DataType::QSymmS16>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QSymmS16>, 4>
+HalfPixelCentersResizeNearestNeighbourTest<armnn::DataType::QSymmS16>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
+
+template LayerTestResult<armnn::ResolveType<armnn::DataType::QSymmS16>, 4>
+AlignCornersResizeNearestNeighbourTest<armnn::DataType::QSymmS16>(
+ armnn::IWorkloadFactory& workloadFactory,
+ const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
+ const armnn::DataLayout dataLayout);
\ No newline at end of file
diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp
index 2f2aa17..ac22d99 100644
--- a/src/backends/cl/test/ClLayerTests.cpp
+++ b/src/backends/cl/test/ClLayerTests.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
@@ -813,6 +813,25 @@
ResizeBilinearMinTest<DataType::QAsymmU8>,
DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinear,
+ HalfPixelCentersResizeBilinearTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinear,
+ AlignCornersResizeBilinearTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearInt8,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearInt8,
+ AlignCornersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearUint8,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearUint8,
+ AlignCornersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+
// Resize Bilinear - NHWC
ARMNN_AUTO_TEST_CASE(ResizeBilinearNopNhwc,
ResizeBilinearNopTest<DataType::Float32>,
@@ -851,6 +870,25 @@
ResizeBilinearMinTest<DataType::QAsymmU8>,
DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearNhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::Float32>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearNhwc,
+ AlignCornersResizeBilinearTest<DataType::Float32>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearInt8Nhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearInt8Nhwc,
+ AlignCornersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearUint8Nhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearUint8Nhwc,
+ AlignCornersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NHWC)
+
// Resize NearestNeighbor - NCHW
ARMNN_AUTO_TEST_CASE(SimpleResizeNearestNeighbor,
SimpleResizeNearestNeighborTest<DataType::Float32>,
@@ -898,6 +936,25 @@
ResizeNearestNeighborMagTest<DataType::QAsymmU8>,
DataLayout::NCHW, 0.1f, 50, 0.1f, 50)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbour,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbour,
+ AlignCornersResizeNearestNeighbourTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourInt8,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourInt8,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourUint8,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourUint8,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+
// Resize NearestNeighbor - NHWC
ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborNopNhwc,
ResizeNearestNeighborNopTest<DataType::Float32>,
@@ -945,6 +1002,25 @@
ResizeNearestNeighborMagTest<DataType::QAsymmU8>,
DataLayout::NHWC, 0.1f, 50, 0.1f, 50)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourNhwc,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::Float32>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourNhwc,
+ AlignCornersResizeNearestNeighbourTest<DataType::Float32>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourInt8Nhwc,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourInt8Nhwc,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourUint8Nhwc,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourUint8Nhwc,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NHWC)
+
// Rsqrt
ARMNN_AUTO_TEST_CASE(Rsqrt2d, Rsqrt2dTest<DataType::Float32>)
ARMNN_AUTO_TEST_CASE(Rsqrt3d, Rsqrt3dTest<DataType::Float32>)
diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp
index acadf6e..de4a305 100644
--- a/src/backends/neon/test/NeonLayerTests.cpp
+++ b/src/backends/neon/test/NeonLayerTests.cpp
@@ -1,5 +1,5 @@
//
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
@@ -851,6 +851,25 @@
ResizeBilinearMagTest<DataType::QAsymmU8>,
DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinear,
+ HalfPixelCentersResizeBilinearTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinear,
+ AlignCornersResizeBilinearTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearInt8,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearInt8,
+ AlignCornersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearUint8,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearUint8,
+ AlignCornersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+
// Resize Bilinear - NHWC data layout
ARMNN_AUTO_TEST_CASE(ResizeBilinearNopNhwc,
ResizeBilinearNopTest<DataType::Float32>,
@@ -884,6 +903,25 @@
ResizeBilinearMagTest<DataType::QAsymmU8>,
DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearNhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::Float32>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearNhwc,
+ AlignCornersResizeBilinearTest<DataType::Float32>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearInt8Nhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearInt8Nhwc,
+ AlignCornersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearUint8Nhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearUint8Nhwc,
+ AlignCornersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NHWC)
+
// Resize NearestNeighbor - NCHW
ARMNN_AUTO_TEST_CASE(SimpleResizeNearestNeighbor,
SimpleResizeNearestNeighborTest<DataType::Float32>,
@@ -917,6 +955,25 @@
ResizeNearestNeighborMagTest<DataType::QAsymmU8>,
DataLayout::NCHW, 0.1f, 50, 0.1f, 50)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbour,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbour,
+ AlignCornersResizeNearestNeighbourTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourInt8,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourInt8,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourUint8,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourUint8,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+
// Resize NearestNeighbor - NHWC
ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborNopNhwc,
ResizeNearestNeighborNopTest<DataType::Float32>,
@@ -950,6 +1007,25 @@
ResizeNearestNeighborMagTest<DataType::QAsymmU8>,
DataLayout::NHWC, 0.1f, 50, 0.1f, 50)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourNhwc,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::Float32>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourNhwc,
+ AlignCornersResizeNearestNeighbourTest<DataType::Float32>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourInt8Nhwc,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourInt8Nhwc,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourUint8Nhwc,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourUint8Nhwc,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NHWC)
+
// Slice
ARMNN_AUTO_TEST_CASE(Slice4dFloat32, Slice4dFloat32Test)
ARMNN_AUTO_TEST_CASE(Slice3dFloat32, Slice3dFloat32Test)
diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp
index 53df9a3..df1997d 100644
--- a/src/backends/reference/test/RefLayerTests.cpp
+++ b/src/backends/reference/test/RefLayerTests.cpp
@@ -912,9 +912,33 @@
ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinear,
HalfPixelCentersResizeBilinearTest<DataType::Float32>,
DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearFloat16,
+ HalfPixelCentersResizeBilinearTest<DataType::Float16>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearInt8,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearUint8,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearUint16,
+ HalfPixelCentersResizeBilinearTest<DataType::QSymmS16>,
+ DataLayout::NCHW)
ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinear,
AlignCornersResizeBilinearTest<DataType::Float32>,
DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearFloat16,
+ AlignCornersResizeBilinearTest<DataType::Float16>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearInt8,
+ AlignCornersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearUint8,
+ AlignCornersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearUint16,
+ AlignCornersResizeBilinearTest<DataType::QSymmS16>,
+ DataLayout::NCHW)
// Resize Bilinear - NHWC
ARMNN_AUTO_TEST_CASE(ResizeBilinearNopNhwc,
@@ -992,6 +1016,36 @@
ARMNN_AUTO_TEST_CASE(ResizeBilinearMagUint16Nhwc,
ResizeBilinearNopTest<DataType::QSymmS16>,
DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearNhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearFloat16Nhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::Float16>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearInt8Nhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearUint8Nhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearUint16Nhwc,
+ HalfPixelCentersResizeBilinearTest<DataType::QSymmS16>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearNhwc,
+ AlignCornersResizeBilinearTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearFloat16Nhwc,
+ AlignCornersResizeBilinearTest<DataType::Float16>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearInt8Nhwc,
+ AlignCornersResizeBilinearTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearUint8Nhwc,
+ AlignCornersResizeBilinearTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearUint16Nhwc,
+ AlignCornersResizeBilinearTest<DataType::QSymmS16>,
+ DataLayout::NCHW)
// Resize NearestNeighbor - NCHW
ARMNN_AUTO_TEST_CASE(SimpleResizeNearestNeighbor,
@@ -1057,9 +1111,33 @@
ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbour,
HalfPixelCentersResizeNearestNeighbourTest<DataType::Float32>,
DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourFloat16,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::Float16>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourInt8,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourUint8,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourUint16,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QSymmS16>,
+ DataLayout::NCHW)
ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbour,
AlignCornersResizeNearestNeighbourTest<DataType::Float32>,
DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourFloat16,
+ AlignCornersResizeNearestNeighbourTest<DataType::Float16>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourInt8,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourUint8,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourUint16,
+ AlignCornersResizeNearestNeighbourTest<DataType::QSymmS16>,
+ DataLayout::NCHW)
// Resize NearestNeighbor - NHWC
ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborNopNhwc,
@@ -1122,6 +1200,36 @@
ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborMagUint16Nhwc,
ResizeNearestNeighborNopTest<DataType::QSymmS16>,
DataLayout::NHWC)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourNchw,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourFloat16Nchw,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::Float16>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourInt8Nchw,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourUint8Nchw,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourUint16Nchw,
+ HalfPixelCentersResizeNearestNeighbourTest<DataType::QSymmS16>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourNchw,
+ AlignCornersResizeNearestNeighbourTest<DataType::Float32>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourFloat16Nchw,
+ AlignCornersResizeNearestNeighbourTest<DataType::Float16>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourInt8Nchw,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmS8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourUint8Nchw,
+ AlignCornersResizeNearestNeighbourTest<DataType::QAsymmU8>,
+ DataLayout::NCHW)
+ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourUint16Nchw,
+ AlignCornersResizeNearestNeighbourTest<DataType::QSymmS16>,
+ DataLayout::NCHW)
// Fake Quantization
ARMNN_AUTO_TEST_CASE(FakeQuantization, FakeQuantizationTest)