From b9c8963c3d393baf27edf37ab732fa76ee53af50 Mon Sep 17 00:00:00 2001 From: jimfly01 Date: Fri, 26 Oct 2018 16:50:13 +0100 Subject: IVGCVSW-2074: Updated the DepthwiseConvolution2dDepthMul1 for NHWC Change-Id: Ibaa0b909680a6f2a155e4ca6fa24e1144d6e6e73 --- src/backends/neon/test/NeonLayerTests.cpp | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'src/backends/neon/test') diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 8fda825618..53dad94099 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -92,11 +92,27 @@ BOOST_AUTO_TEST_CASE(Conv2dUtils) } // Depthwise Convolution -ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dDepthMul1, DepthwiseConvolution2dDepthMul1Test, true) +ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dDepthMul1, + DepthwiseConvolution2dDepthMul1Test, true, armnn::DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE(UnbiasedDepthwiseConvolution2dDepthMul1, + DepthwiseConvolution2dDepthMul1Test, false, armnn::DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dDepthMul1Uint8, + DepthwiseConvolution2dDepthMul1Uint8Test, true, armnn::DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE(UnbiasedDepthwiseConvolution2dDepthMul1Uint8, + DepthwiseConvolution2dDepthMul1Uint8Test, false, armnn::DataLayout::NCHW) + +// NHWC Depthwise Convolution +ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dDepthMul1NHhwc, + DepthwiseConvolution2dDepthMul1Test, true, armnn::DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE(UnbiasedDepthwiseConvolution2dDepthMul1Nhwc, + DepthwiseConvolution2dDepthMul1Test, false, armnn::DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dDepthMul1Uint8Nhwc, + DepthwiseConvolution2dDepthMul1Uint8Test, true, armnn::DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE(UnbiasedDepthwiseConvolution2dDepthMul1Uint8Nhwc, + DepthwiseConvolution2dDepthMul1Uint8Test, false, armnn::DataLayout::NHWC) + ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dDepthNhwc, DepthwiseConvolution2dDepthNhwcTest, false) -ARMNN_AUTO_TEST_CASE(UnbiasedDepthwiseConvolution2dDepthMul1, DepthwiseConvolution2dDepthMul1Test, false) -ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dDepthMul1Uint8, DepthwiseConvolution2dDepthMul1Uint8Test, true) -ARMNN_AUTO_TEST_CASE(UnbiasedDepthwiseConvolution2dDepthMul1Uint8, DepthwiseConvolution2dDepthMul1Uint8Test, false) + ARMNN_AUTO_TEST_CASE(DepthwiseConvolution2dAsymmetric, DepthwiseConvolution2dAsymmetricTest, true, armnn::DataLayout::NCHW) -- cgit v1.2.1