From ec36d3ee6619f1e777aa82c694ee2ec0433fc770 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Fri, 28 Aug 2020 13:17:05 +0100 Subject: IVGCVSW-5256 Use CreateTensorHandle() function from TensorHandleFactory in the tests for layers Q,R & T Signed-off-by: Finn Williams Change-Id: I6fc613d31785298a0b7ed18f1abdd59bafed1e8e --- src/backends/neon/test/NeonLayerTests.cpp | 660 +++++++++++++++--------------- 1 file changed, 330 insertions(+), 330 deletions(-) (limited to 'src/backends/neon/test') diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 974473dbf2..20afbcb701 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -743,10 +743,10 @@ ARMNN_AUTO_TEST_CASE_WITH_THF(NotEqualBroadcast1ElementUint8, NotEqualBroadcast1 ARMNN_AUTO_TEST_CASE_WITH_THF(NotEqualBroadcast1dVectorUint8, NotEqualBroadcast1dVectorUint8Test) // Reshape -ARMNN_AUTO_TEST_CASE(SimpleReshapeFloat32, SimpleReshapeTest) -ARMNN_AUTO_TEST_CASE(SimpleReshapeInt8, SimpleReshapeTest) -ARMNN_AUTO_TEST_CASE(SimpleReshapeUint8, SimpleReshapeTest) -ARMNN_AUTO_TEST_CASE(Reshape5d, Reshape5dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleReshapeFloat32, SimpleReshapeTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleReshapeInt8, SimpleReshapeTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleReshapeUint8, SimpleReshapeTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Reshape5d, Reshape5dTest) // Pad ARMNN_AUTO_TEST_CASE_WITH_THF(PadFloat322d, PadFloat322dTest) @@ -840,202 +840,202 @@ ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleNormalizationWithin, SimpleNormalizationWith ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleNormalizationAcrossNhwc, SimpleNormalizationAcrossNhwcTest) // Resize Bilinear - NCHW data layout -ARMNN_AUTO_TEST_CASE(SimpleResizeBilinear, SimpleResizeBilinearTest, DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeBilinearNop, ResizeBilinearNopTest, DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeBilinearSqMin, ResizeBilinearSqMinTest, DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeBilinearMin, ResizeBilinearMinTest, DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeBilinearMag, ResizeBilinearMagTest, DataLayout::NCHW) - -ARMNN_AUTO_TEST_CASE(SimpleResizeBilinearUint8, - SimpleResizeBilinearTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeBilinearNopUint8, - ResizeBilinearNopTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeBilinearSqMinUint8, - ResizeBilinearSqMinTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeBilinearMinUint8, - ResizeBilinearMinTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeBilinearMagUint8, - ResizeBilinearMagTest, - DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleResizeBilinear, SimpleResizeBilinearTest, DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearNop, ResizeBilinearNopTest, DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearSqMin, ResizeBilinearSqMinTest, DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearMin, ResizeBilinearMinTest, DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearMag, ResizeBilinearMagTest, DataLayout::NCHW) + +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleResizeBilinearUint8, + SimpleResizeBilinearTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearNopUint8, + ResizeBilinearNopTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearSqMinUint8, + ResizeBilinearSqMinTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearMinUint8, + ResizeBilinearMinTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearMagUint8, + ResizeBilinearMagTest, + DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinear, - HalfPixelCentersResizeBilinearTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinear, - AlignCornersResizeBilinearTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearInt8, - HalfPixelCentersResizeBilinearTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearInt8, - AlignCornersResizeBilinearTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearUint8, - HalfPixelCentersResizeBilinearTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearUint8, - AlignCornersResizeBilinearTest, - DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeBilinear, + HalfPixelCentersResizeBilinearTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeBilinear, + AlignCornersResizeBilinearTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeBilinearInt8, + HalfPixelCentersResizeBilinearTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeBilinearInt8, + AlignCornersResizeBilinearTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeBilinearUint8, + HalfPixelCentersResizeBilinearTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeBilinearUint8, + AlignCornersResizeBilinearTest, + DataLayout::NCHW) // Resize Bilinear - NHWC data layout -ARMNN_AUTO_TEST_CASE(ResizeBilinearNopNhwc, - ResizeBilinearNopTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(SimpleResizeBilinearNhwc, - SimpleResizeBilinearTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeBilinearSqMinNhwc, - ResizeBilinearSqMinTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeBilinearMinNhwc, - ResizeBilinearMinTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeBilinearMagNhwc, - ResizeBilinearMagTest, - DataLayout::NHWC) - -ARMNN_AUTO_TEST_CASE(ResizeBilinearNopUint8Nhwc, - ResizeBilinearNopTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(SimpleResizeBilinearUint8Nhwc, - SimpleResizeBilinearTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeBilinearSqMinUint8Nhwc, - ResizeBilinearSqMinTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeBilinearMinUint8Nhwc, - ResizeBilinearMinTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeBilinearMagUint8Nhwc, - ResizeBilinearMagTest, - DataLayout::NHWC) - -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearNhwc, - HalfPixelCentersResizeBilinearTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearNhwc, - AlignCornersResizeBilinearTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearInt8Nhwc, - HalfPixelCentersResizeBilinearTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearInt8Nhwc, - AlignCornersResizeBilinearTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeBilinearUint8Nhwc, - HalfPixelCentersResizeBilinearTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeBilinearUint8Nhwc, - AlignCornersResizeBilinearTest, - DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearNopNhwc, + ResizeBilinearNopTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleResizeBilinearNhwc, + SimpleResizeBilinearTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearSqMinNhwc, + ResizeBilinearSqMinTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearMinNhwc, + ResizeBilinearMinTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearMagNhwc, + ResizeBilinearMagTest, + DataLayout::NHWC) + +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearNopUint8Nhwc, + ResizeBilinearNopTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleResizeBilinearUint8Nhwc, + SimpleResizeBilinearTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearSqMinUint8Nhwc, + ResizeBilinearSqMinTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearMinUint8Nhwc, + ResizeBilinearMinTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeBilinearMagUint8Nhwc, + ResizeBilinearMagTest, + DataLayout::NHWC) + +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeBilinearNhwc, + HalfPixelCentersResizeBilinearTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeBilinearNhwc, + AlignCornersResizeBilinearTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeBilinearInt8Nhwc, + HalfPixelCentersResizeBilinearTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeBilinearInt8Nhwc, + AlignCornersResizeBilinearTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeBilinearUint8Nhwc, + HalfPixelCentersResizeBilinearTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeBilinearUint8Nhwc, + AlignCornersResizeBilinearTest, + DataLayout::NHWC) // Resize NearestNeighbor - NCHW -ARMNN_AUTO_TEST_CASE(SimpleResizeNearestNeighbor, - SimpleResizeNearestNeighborTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborNop, - ResizeNearestNeighborNopTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborSqMin, - ResizeNearestNeighborSqMinTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborMin, - ResizeNearestNeighborMinTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborMag, - ResizeNearestNeighborMagTest, - DataLayout::NCHW, 0.1f, 50, 0.1f, 50) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleResizeNearestNeighbor, + SimpleResizeNearestNeighborTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborNop, + ResizeNearestNeighborNopTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborSqMin, + ResizeNearestNeighborSqMinTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborMin, + ResizeNearestNeighborMinTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborMag, + ResizeNearestNeighborMagTest, + DataLayout::NCHW, 0.1f, 50, 0.1f, 50) -ARMNN_AUTO_TEST_CASE(SimpleResizeNearestNeighborUint8, - SimpleResizeNearestNeighborTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborNopUint8, - ResizeNearestNeighborNopTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborSqMinUint8, - ResizeNearestNeighborSqMinTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborMinUint8, - ResizeNearestNeighborMinTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborMagUint8, - ResizeNearestNeighborMagTest, - DataLayout::NCHW, 0.1f, 50, 0.1f, 50) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleResizeNearestNeighborUint8, + SimpleResizeNearestNeighborTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborNopUint8, + ResizeNearestNeighborNopTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborSqMinUint8, + ResizeNearestNeighborSqMinTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborMinUint8, + ResizeNearestNeighborMinTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborMagUint8, + ResizeNearestNeighborMagTest, + DataLayout::NCHW, 0.1f, 50, 0.1f, 50) -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbour, - HalfPixelCentersResizeNearestNeighbourTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbour, - AlignCornersResizeNearestNeighbourTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourInt8, - HalfPixelCentersResizeNearestNeighbourTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourInt8, - AlignCornersResizeNearestNeighbourTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourUint8, - HalfPixelCentersResizeNearestNeighbourTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourUint8, - AlignCornersResizeNearestNeighbourTest, - DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeNearestNeighbour, + HalfPixelCentersResizeNearestNeighbourTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeNearestNeighbour, + AlignCornersResizeNearestNeighbourTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeNearestNeighbourInt8, + HalfPixelCentersResizeNearestNeighbourTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeNearestNeighbourInt8, + AlignCornersResizeNearestNeighbourTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeNearestNeighbourUint8, + HalfPixelCentersResizeNearestNeighbourTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeNearestNeighbourUint8, + AlignCornersResizeNearestNeighbourTest, + DataLayout::NCHW) // Resize NearestNeighbor - NHWC -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborNopNhwc, - ResizeNearestNeighborNopTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(SimpleResizeNearestNeighborNhwc, - SimpleResizeNearestNeighborTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborSqMinNhwc, - ResizeNearestNeighborSqMinTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborMinNhwc, - ResizeNearestNeighborMinTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborMagNhwc, - ResizeNearestNeighborMagTest, - DataLayout::NHWC, 0.1f, 50, 0.1f, 50) - -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborNopUint8Nhwc, - ResizeNearestNeighborNopTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(SimpleResizeNearestNeighborUint8Nhwc, - SimpleResizeNearestNeighborTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborSqMinUint8Nhwc, - ResizeNearestNeighborSqMinTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborMinUint8Nhwc, - ResizeNearestNeighborMinTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(ResizeNearestNeighborMagUint8Nhwc, - ResizeNearestNeighborMagTest, - DataLayout::NHWC, 0.1f, 50, 0.1f, 50) - -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourNhwc, - HalfPixelCentersResizeNearestNeighbourTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourNhwc, - AlignCornersResizeNearestNeighbourTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourInt8Nhwc, - HalfPixelCentersResizeNearestNeighbourTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourInt8Nhwc, - AlignCornersResizeNearestNeighbourTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(HalfPixelCentersResizeNearestNeighbourUint8Nhwc, - HalfPixelCentersResizeNearestNeighbourTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(AlignCornersResizeNearestNeighbourUint8Nhwc, - AlignCornersResizeNearestNeighbourTest, - DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborNopNhwc, + ResizeNearestNeighborNopTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleResizeNearestNeighborNhwc, + SimpleResizeNearestNeighborTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborSqMinNhwc, + ResizeNearestNeighborSqMinTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborMinNhwc, + ResizeNearestNeighborMinTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborMagNhwc, + ResizeNearestNeighborMagTest, + DataLayout::NHWC, 0.1f, 50, 0.1f, 50) + +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborNopUint8Nhwc, + ResizeNearestNeighborNopTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleResizeNearestNeighborUint8Nhwc, + SimpleResizeNearestNeighborTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborSqMinUint8Nhwc, + ResizeNearestNeighborSqMinTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborMinUint8Nhwc, + ResizeNearestNeighborMinTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(ResizeNearestNeighborMagUint8Nhwc, + ResizeNearestNeighborMagTest, + DataLayout::NHWC, 0.1f, 50, 0.1f, 50) + +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeNearestNeighbourNhwc, + HalfPixelCentersResizeNearestNeighbourTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeNearestNeighbourNhwc, + AlignCornersResizeNearestNeighbourTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeNearestNeighbourInt8Nhwc, + HalfPixelCentersResizeNearestNeighbourTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeNearestNeighbourInt8Nhwc, + AlignCornersResizeNearestNeighbourTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(HalfPixelCentersResizeNearestNeighbourUint8Nhwc, + HalfPixelCentersResizeNearestNeighbourTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(AlignCornersResizeNearestNeighbourUint8Nhwc, + AlignCornersResizeNearestNeighbourTest, + DataLayout::NHWC) // Slice ARMNN_AUTO_TEST_CASE(Slice4dFloat32, Slice4dFloat32Test) @@ -1111,8 +1111,8 @@ ARMNN_AUTO_TEST_CASE_WITH_THF(StridedSlice2dUint8, StridedSlice2dUint8Test) ARMNN_AUTO_TEST_CASE_WITH_THF(StridedSlice2dReverseUint8, StridedSlice2dReverseUint8Test) // Quantize -ARMNN_AUTO_TEST_CASE(QuantizeSimpleUint8, QuantizeSimpleUint8Test) -ARMNN_AUTO_TEST_CASE(QuantizeClampUint8, QuantizeClampUint8Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(QuantizeSimpleUint8, QuantizeSimpleUint8Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(QuantizeClampUint8, QuantizeClampUint8Test) // PReLU ARMNN_AUTO_TEST_CASE_WITH_THF(PreluFloat32, PreluTest) @@ -1127,146 +1127,146 @@ ARMNN_AUTO_TEST_CASE_WITH_THF(StackOutput3DInputs3, StackOutput3DInputs3Float32T ARMNN_AUTO_TEST_CASE_WITH_THF(StackOutput5D, StackOutput5DFloat32Test) // Transpose -ARMNN_AUTO_TEST_CASE(SimpleTransposeFloat32, SimpleTransposeTest) -ARMNN_AUTO_TEST_CASE(TransposeFloat32ValueSet1Test, TransposeValueSet1Test) -ARMNN_AUTO_TEST_CASE(TransposeFloat32ValueSet2Test, TransposeValueSet2Test) -ARMNN_AUTO_TEST_CASE(TransposeFloat32ValueSet3Test, TransposeValueSet3Test) -ARMNN_AUTO_TEST_CASE(SimpleTransposeQASymms8, SimpleTransposeTest) -ARMNN_AUTO_TEST_CASE(TransposeQASymmS8ValueSet1Test, TransposeValueSet1Test) -ARMNN_AUTO_TEST_CASE(TransposeQASymmS8ValueSet2Test, TransposeValueSet2Test) -ARMNN_AUTO_TEST_CASE(TransposeQASymmS8ValueSet3Test, TransposeValueSet3Test) -ARMNN_AUTO_TEST_CASE(SimpleTransposeQASymm8, SimpleTransposeTest) -ARMNN_AUTO_TEST_CASE(TransposeQASymm8ValueSet1Test, TransposeValueSet1Test) -ARMNN_AUTO_TEST_CASE(TransposeQASymm8ValueSet2Test, TransposeValueSet2Test) -ARMNN_AUTO_TEST_CASE(TransposeQASymm8ValueSet3Test, TransposeValueSet3Test) -ARMNN_AUTO_TEST_CASE(SimpleTransposeQSymm16, SimpleTransposeTest) -ARMNN_AUTO_TEST_CASE(TransposeQSymm16ValueSet1Test, TransposeValueSet1Test) -ARMNN_AUTO_TEST_CASE(TransposeQSymm16ValueSet2Test, TransposeValueSet2Test) -ARMNN_AUTO_TEST_CASE(TransposeQSymm16ValueSet3Test, TransposeValueSet3Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleTransposeFloat32, SimpleTransposeTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeFloat32ValueSet1Test, TransposeValueSet1Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeFloat32ValueSet2Test, TransposeValueSet2Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeFloat32ValueSet3Test, TransposeValueSet3Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleTransposeQASymms8, SimpleTransposeTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeQASymmS8ValueSet1Test, TransposeValueSet1Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeQASymmS8ValueSet2Test, TransposeValueSet2Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeQASymmS8ValueSet3Test, TransposeValueSet3Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleTransposeQASymm8, SimpleTransposeTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeQASymm8ValueSet1Test, TransposeValueSet1Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeQASymm8ValueSet2Test, TransposeValueSet2Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeQASymm8ValueSet3Test, TransposeValueSet3Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleTransposeQSymm16, SimpleTransposeTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeQSymm16ValueSet1Test, TransposeValueSet1Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeQSymm16ValueSet2Test, TransposeValueSet2Test) +ARMNN_AUTO_TEST_CASE_WITH_THF(TransposeQSymm16ValueSet3Test, TransposeValueSet3Test) // TransposeConvolution2d -ARMNN_AUTO_TEST_CASE(SimpleTransposeConvolution2dFloatNchw, - SimpleTransposeConvolution2dTest, - true, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(SimpleTransposeConvolution2dFloatNhwc, - SimpleTransposeConvolution2dTest, - true, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(SimpleTransposeConvolution2dUint8Nchw, - SimpleTransposeConvolution2dTest, - true, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(SimpleTransposeConvolution2dUint8Nhwc, - SimpleTransposeConvolution2dTest, - true, - DataLayout::NHWC) - -ARMNN_AUTO_TEST_CASE(UnbiasedSimpleTransposeConvolution2dFloatNchw, - SimpleTransposeConvolution2dTest, - false, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(UnbiasedSimpleTransposeConvolution2dFloatNhwc, - SimpleTransposeConvolution2dTest, - true, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(UnbiasedSimpleTransposeConvolution2dUint8Nchw, - SimpleTransposeConvolution2dTest, - true, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(UnbiasedSimpleTransposeConvolution2dUint8Nhwc, - SimpleTransposeConvolution2dTest, - true, - DataLayout::NHWC) - -ARMNN_AUTO_TEST_CASE(PaddedTransposeConvolution2dFloatNchw, - PaddedTransposeConvolution2dTest, - true, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(PaddedTransposeConvolution2dFloatNhwc, - PaddedTransposeConvolution2dTest, - true, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(PaddedTransposeConvolution2dUint8Nchw, - PaddedTransposeConvolution2dTest, - true, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(PaddedTransposeConvolution2dUint8Nhwc, - PaddedTransposeConvolution2dTest, - true, - DataLayout::NHWC) - -ARMNN_AUTO_TEST_CASE(UnbiasedPaddedTransposeConvolution2dFloatNchw, - PaddedTransposeConvolution2dTest, - false, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(UnbiasedPaddedTransposeConvolution2dFloatNhwc, - PaddedTransposeConvolution2dTest, - true, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(UnbiasedPaddedTransposeConvolution2dInt8Nchw, - PaddedTransposeConvolution2dTest, - true, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(UnbiasedPaddedTransposeConvolution2dInt8Nhwc, - PaddedTransposeConvolution2dTest, - true, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(UnbiasedPaddedTransposeConvolution2dUint8Nchw, - PaddedTransposeConvolution2dTest, - true, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(UnbiasedPaddedTransposeConvolution2dUint8Nhwc, - PaddedTransposeConvolution2dTest, - true, - DataLayout::NHWC) - -ARMNN_AUTO_TEST_CASE(StridedTransposeConvolution2dFloatNchw, - StridedTransposeConvolution2dTest, - true, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(StridedTransposeConvolution2dFloatNhwc, - StridedTransposeConvolution2dTest, - true, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(StridedTransposeConvolution2dUint8Nchw, - StridedTransposeConvolution2dTest, - true, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(StridedTransposeConvolution2dUint8Nhwc, - StridedTransposeConvolution2dTest, - true, - DataLayout::NHWC) - -ARMNN_AUTO_TEST_CASE(UnbiasedStridedTransposeConvolution2dFloatNchw, - StridedTransposeConvolution2dTest, - false, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(UnbiasedStridedTransposeConvolution2dFloatNhwc, - StridedTransposeConvolution2dTest, - true, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(UnbiasedStridedTransposeConvolution2dUint8Nchw, - StridedTransposeConvolution2dTest, - true, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(UnbiasedStridedTransposeConvolution2dUint8Nhwc, - StridedTransposeConvolution2dTest, - true, - DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleTransposeConvolution2dFloatNchw, + SimpleTransposeConvolution2dTest, + true, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleTransposeConvolution2dFloatNhwc, + SimpleTransposeConvolution2dTest, + true, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleTransposeConvolution2dUint8Nchw, + SimpleTransposeConvolution2dTest, + true, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleTransposeConvolution2dUint8Nhwc, + SimpleTransposeConvolution2dTest, + true, + DataLayout::NHWC) + +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedSimpleTransposeConvolution2dFloatNchw, + SimpleTransposeConvolution2dTest, + false, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedSimpleTransposeConvolution2dFloatNhwc, + SimpleTransposeConvolution2dTest, + true, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedSimpleTransposeConvolution2dUint8Nchw, + SimpleTransposeConvolution2dTest, + true, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedSimpleTransposeConvolution2dUint8Nhwc, + SimpleTransposeConvolution2dTest, + true, + DataLayout::NHWC) + +ARMNN_AUTO_TEST_CASE_WITH_THF(PaddedTransposeConvolution2dFloatNchw, + PaddedTransposeConvolution2dTest, + true, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(PaddedTransposeConvolution2dFloatNhwc, + PaddedTransposeConvolution2dTest, + true, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(PaddedTransposeConvolution2dUint8Nchw, + PaddedTransposeConvolution2dTest, + true, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(PaddedTransposeConvolution2dUint8Nhwc, + PaddedTransposeConvolution2dTest, + true, + DataLayout::NHWC) + +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedPaddedTransposeConvolution2dFloatNchw, + PaddedTransposeConvolution2dTest, + false, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedPaddedTransposeConvolution2dFloatNhwc, + PaddedTransposeConvolution2dTest, + true, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedPaddedTransposeConvolution2dInt8Nchw, + PaddedTransposeConvolution2dTest, + true, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedPaddedTransposeConvolution2dInt8Nhwc, + PaddedTransposeConvolution2dTest, + true, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedPaddedTransposeConvolution2dUint8Nchw, + PaddedTransposeConvolution2dTest, + true, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedPaddedTransposeConvolution2dUint8Nhwc, + PaddedTransposeConvolution2dTest, + true, + DataLayout::NHWC) + +ARMNN_AUTO_TEST_CASE_WITH_THF(StridedTransposeConvolution2dFloatNchw, + StridedTransposeConvolution2dTest, + true, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(StridedTransposeConvolution2dFloatNhwc, + StridedTransposeConvolution2dTest, + true, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(StridedTransposeConvolution2dUint8Nchw, + StridedTransposeConvolution2dTest, + true, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(StridedTransposeConvolution2dUint8Nhwc, + StridedTransposeConvolution2dTest, + true, + DataLayout::NHWC) + +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedStridedTransposeConvolution2dFloatNchw, + StridedTransposeConvolution2dTest, + false, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedStridedTransposeConvolution2dFloatNhwc, + StridedTransposeConvolution2dTest, + true, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedStridedTransposeConvolution2dUint8Nchw, + StridedTransposeConvolution2dTest, + true, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(UnbiasedStridedTransposeConvolution2dUint8Nhwc, + StridedTransposeConvolution2dTest, + true, + DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(MultiChannelTransposeConvolution2dFloatNchw, - MultiChannelTransposeConvolution2dTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(MultiChannelTransposeConvolution2dFloatNhwc, - MultiChannelTransposeConvolution2dTest, - DataLayout::NHWC) -ARMNN_AUTO_TEST_CASE(MultiChannelTransposeConvolution2dUint8Nchw, - MultiChannelTransposeConvolution2dTest, - DataLayout::NCHW) -ARMNN_AUTO_TEST_CASE(MultiChannelTransposeConvolution2dUint8Nhwc, - MultiChannelTransposeConvolution2dTest, - DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(MultiChannelTransposeConvolution2dFloatNchw, + MultiChannelTransposeConvolution2dTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(MultiChannelTransposeConvolution2dFloatNhwc, + MultiChannelTransposeConvolution2dTest, + DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE_WITH_THF(MultiChannelTransposeConvolution2dUint8Nchw, + MultiChannelTransposeConvolution2dTest, + DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE_WITH_THF(MultiChannelTransposeConvolution2dUint8Nhwc, + MultiChannelTransposeConvolution2dTest, + DataLayout::NHWC) // Abs ARMNN_AUTO_TEST_CASE_WITH_THF(Abs2d, Abs2dTest) -- cgit v1.2.1