Add ConstTensorsAsInput support for Conv3d

 * Constant weights and biases are now stored as Constant layers.
 * Updated Serializer, Deserializer and unit tests to reflect this.
 * Updated TfLiteParser.
 * Updated Ref backend to handle constant weights and
   bias as inputs rather than reading from member variables.
 * Added Conv3d EndToEnd test.
 * Added NCDHW DataLayout and unit tests.

Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: I10cdd354ca5f1c748730f92ffdb36bf810f83c8e

1 files changed, 40 insertions, 20 deletions

diff --git a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp
index a07c183c76..c612e19c9b 100644
--- a/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp
+++ b/src/backends/backendsCommon/test/layerTests/Conv3dTestImpl.hpp
@@ -24,118 +24,138 @@ LayerTestResult<float, 5> SimpleConvolution3d3x3x3Float32Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<int8_t , 5> SimpleConvolution3d3x3x3Int8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<uint8_t, 5> SimpleConvolution3d3x3x3Uint8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<int16_t, 5> SimpleConvolution3d3x3x3Int16Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<float, 5> Convolution3d2x2x2Strides3x5x5Float32Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<int8_t , 5> Convolution3d2x2x2Strides3x5x5Int8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<uint8_t, 5> Convolution3d2x2x2Strides3x5x5Uint8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<int16_t, 5> Convolution3d2x2x2Strides3x5x5Int16Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<float, 5> Convolution3d2x2x2Dilation2x2x2Float32Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<int8_t , 5> Convolution3d2x2x2Dilation2x2x2Int8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<uint8_t, 5> Convolution3d2x2x2Dilation2x2x2Uint8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<int16_t, 5> Convolution3d2x2x2Dilation2x2x2Int16Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<float, 5> Convolution3dPaddingSame3x3x3Float32Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<int8_t , 5> Convolution3dPaddingSame3x3x3Int8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<uint8_t, 5> Convolution3dPaddingSame3x3x3Uint8Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<int16_t, 5> Convolution3dPaddingSame3x3x3Int16Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<float, 5> Convolution3dStrideDilationPadding3x3x3Float32Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<float, 5> Convolution3d2x2x2Stride3x3x3SmallFloat32Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<armnn::Half, 5> Convolution3d2x3x3Float16Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);
 
 LayerTestResult<armnn::Half, 5> Convolution3d2x2x2SmallFloat16Test(
         armnn::IWorkloadFactory& workloadFactory,
         const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager,
         const armnn::ITensorHandleFactory& tensorHandleFactory,
-        bool biasEnabled);
+        bool biasEnabled,
+        armnn::DataLayout dataLayout);