aboutsummaryrefslogtreecommitdiff
path: root/src/backends/cl/test/ClLayerTests.cpp
diff options
context:
space:
mode:
authorjimfly01 <jim.flynn@arm.com>2018-10-26 16:50:13 +0100
committerMatteo Martincigh <matteo.martincigh@arm.com>2018-11-01 12:14:22 +0000
commitb9c8963c3d393baf27edf37ab732fa76ee53af50 (patch)
tree545713a0e0896cabfc107c30a6310a26bf3b67e6 /src/backends/cl/test/ClLayerTests.cpp
parent7af00da9068c71ae6f66eaa488048feea62e7aa9 (diff)
downloadarmnn-b9c8963c3d393baf27edf37ab732fa76ee53af50.tar.gz
IVGCVSW-2074: Updated the DepthwiseConvolution2dDepthMul1 for NHWC
Change-Id: Ibaa0b909680a6f2a155e4ca6fa24e1144d6e6e73
Diffstat (limited to 'src/backends/cl/test/ClLayerTests.cpp')
-rwxr-xr-xsrc/backends/cl/test/ClLayerTests.cpp24
1 files changed, 20 insertions, 4 deletions
diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp
index f2a28ec06e..4e7f785bbb 100755
--- a/src/backends/cl/test/ClLayerTests.cpp
+++ b/src/backends/cl/test/ClLayerTests.cpp
@@ -69,11 +69,27 @@ ARMNN_AUTO_TEST_CASE(UnbiasedConvolution2dSquareNhwc, SimpleConvolution2d3x3Test
ARMNN_AUTO_TEST_CASE(SimpleConvolution2dSquareNhwc, SimpleConvolution2d3x3NhwcTest, false)
// 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(DepthwiseConvolution2dDepthMul1Nhwc,
+ 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)