diff options
Diffstat (limited to 'src/backends/backendsCommon/test')
-rwxr-xr-x | src/backends/backendsCommon/test/LayerTests.cpp | 8 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/LstmTestImpl.hpp | 23 |
2 files changed, 14 insertions, 17 deletions
diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp index dad13413b4..bd8b38da01 100755 --- a/src/backends/backendsCommon/test/LayerTests.cpp +++ b/src/backends/backendsCommon/test/LayerTests.cpp @@ -925,8 +925,7 @@ LayerTestResult<float, 2> LstmLayerFloat32NoCifgWithPeepholeWithProjectionTest( -0.0186926f, 0.0193662f, -0.0115437f, 0.00422612f, -0.0345232f, 0.00223253f, -0.00957321f, 0.0210624f, 0.013331f, 0.0150954f, 0.02168f})); - return LstmLayerFloat32NoCifgWithPeepholeWithProjectionTestImpl( - workloadFactory, memoryManager, input, expectedOutput); + return LstmLayerNoCifgWithPeepholeWithProjectionTestImpl(workloadFactory, memoryManager, input, expectedOutput); } LayerTestResult<float, 2> LstmLayerFloat32NoCifgNoPeepholeNoProjectionTest( @@ -6684,7 +6683,6 @@ LayerTestResult<uint8_t, 4> BatchToSpaceNdNhwcUintTest1( std::vector<unsigned int> blockShape({2, 2}); std::vector<std::pair<unsigned int, unsigned int>> crops = {{0, 0}, {0, 0}}; - return BatchToSpaceNdHelper<uint8_t, 4, 4>(workloadFactory, memoryManager, - armnn::DataLayout::NHWC, inputShape, input, blockShape, - crops, outputShape, expectedOutput); + return BatchToSpaceNdHelper<uint8_t, 4, 4>(workloadFactory, memoryManager, armnn::DataLayout::NHWC, inputShape, + input, blockShape, crops, outputShape, expectedOutput); } diff --git a/src/backends/backendsCommon/test/LstmTestImpl.hpp b/src/backends/backendsCommon/test/LstmTestImpl.hpp index dfe24aa541..56f40aba84 100644 --- a/src/backends/backendsCommon/test/LstmTestImpl.hpp +++ b/src/backends/backendsCommon/test/LstmTestImpl.hpp @@ -34,7 +34,7 @@ LayerTestResult<float, 2> LstmNoCifgNoPeepholeNoProjectionTestImpl( armnn::TensorInfo outputStateInTensorInfo({batchSize , outputSize}, armnn::GetDataType<float>()); - armnn::TensorInfo scratchBufferTensorInfo({batchSize, numUnits * 3}, armnn::GetDataType<float>()); + armnn::TensorInfo scratchBufferTensorInfo({batchSize, numUnits * 4}, armnn::GetDataType<float>()); armnn::TensorInfo cellStateOutTensorInfo({batchSize, numUnits}, armnn::GetDataType<float>()); armnn::TensorInfo outputStateOutTensorInfo({batchSize, outputSize}, armnn::GetDataType<float>()); armnn::TensorInfo outputTensorInfo({batchSize, outputSize}, armnn::GetDataType<float>()); @@ -52,7 +52,7 @@ LayerTestResult<float, 2> LstmNoCifgNoPeepholeNoProjectionTestImpl( std::vector<float> outputStateInVector(batchSize * outputSize, 0.f); auto outputStateInTensor = MakeTensor<float,2>(outputStateInTensorInfo, outputStateInVector); - std::vector<float> scratchBufferVector(batchSize * numUnits * 3, 0.f); + std::vector<float> scratchBufferVector(batchSize * numUnits * 4, 0.f); auto scratchBufferTensor = MakeTensor<float,2>(scratchBufferTensorInfo, scratchBufferVector); std::vector<float> outputStateOutVector(batchSize * outputSize, 0.f); @@ -153,8 +153,8 @@ LayerTestResult<float, 2> LstmNoCifgNoPeepholeNoProjectionTestImpl( armnn::ScopedCpuTensorHandle inputToForgetWeightsTensor(tensorInfo8); armnn::ScopedCpuTensorHandle inputToCellWeightsTensor(tensorInfo8); armnn::ScopedCpuTensorHandle inputToOutputWeightsTensor(tensorInfo8); - armnn::ScopedCpuTensorHandle recurrentToForgetWeightsTensor(tensorInfo16); armnn::ScopedCpuTensorHandle recurrentToInputWeightsTensor(tensorInfo16); + armnn::ScopedCpuTensorHandle recurrentToForgetWeightsTensor(tensorInfo16); armnn::ScopedCpuTensorHandle recurrentToCellWeightsTensor(tensorInfo16); armnn::ScopedCpuTensorHandle recurrentToOutputWeightsTensor(tensorInfo16); armnn::ScopedCpuTensorHandle cellToInputWeightsTensor(tensorInfo4); @@ -222,11 +222,10 @@ LayerTestResult<float, 2> LstmNoCifgNoPeepholeNoProjectionTestImpl( LayerTestResult<float, 2> -LstmLayerFloat32NoCifgWithPeepholeWithProjectionTestImpl( - armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, - const boost::multi_array<float, 2>& input, - const boost::multi_array<float, 2>& outputExpected) +LstmLayerNoCifgWithPeepholeWithProjectionTestImpl(armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const boost::multi_array<float, 2>& input, + const boost::multi_array<float, 2>& outputExpected) { unsigned int batchSize = 2; unsigned int outputSize = 16; @@ -237,8 +236,8 @@ LstmLayerFloat32NoCifgWithPeepholeWithProjectionTestImpl( armnn::TensorInfo cellStateInTensorInfo({batchSize , numUnits}, armnn::GetDataType<float>()); armnn::TensorInfo outputStateInTensorInfo({batchSize , outputSize}, armnn::GetDataType<float>()); - // Scratch buffer size without CIFG [batchSize, numUnits * 3] - armnn::TensorInfo scratchBufferTensorInfo({batchSize, numUnits * 3}, armnn::GetDataType<float>()); + // Scratch buffer size without CIFG [batchSize, numUnits * 4] + armnn::TensorInfo scratchBufferTensorInfo({batchSize, numUnits * 4}, armnn::GetDataType<float>()); armnn::TensorInfo cellStateOutTensorInfo({batchSize, numUnits}, armnn::GetDataType<float>()); armnn::TensorInfo outputStateOutTensorInfo({batchSize, outputSize}, armnn::GetDataType<float>()); armnn::TensorInfo outputTensorInfo({batchSize, outputSize}, armnn::GetDataType<float>()); @@ -255,7 +254,7 @@ LstmLayerFloat32NoCifgWithPeepholeWithProjectionTestImpl( std::vector<float> outputStateInVector(batchSize * outputSize, 0.f); auto outputStateInTensor = MakeTensor<float,2>(outputStateInTensorInfo, outputStateInVector); - std::vector<float> scratchBufferVector(batchSize * numUnits * 3, 0.f); + std::vector<float> scratchBufferVector(batchSize * numUnits * 4, 0.f); auto scratchBufferTensor = MakeTensor<float,2>(scratchBufferTensorInfo, scratchBufferVector); std::vector<float> outputStateOutVector(batchSize * outputSize, 0.f); @@ -955,7 +954,7 @@ LayerTestResult<float, 2> LstmLayerWithCifgWithPeepholeNoProjectionTestImpl( armnn::TensorInfo outputStateInTensorInfo({batchSize, outputSize}, armnn::GetDataType<float>()); armnn::TensorInfo cellStateInTensorInfo({batchSize, cellSize}, armnn::GetDataType<float>()); - unsigned int scratchBufferSize = cifgEnabled ? cellSize * 4 : cellSize * 3; + unsigned int scratchBufferSize = cifgEnabled ? cellSize * 3 : cellSize * 4; armnn::TensorInfo scratchBufferTensorInfo({batchSize, scratchBufferSize}, armnn::GetDataType<float>()); armnn::TensorInfo outputStateOutTensorInfo({batchSize, outputSize}, armnn::GetDataType<float>()); armnn::TensorInfo cellStateOutTensorInfo({batchSize, cellSize}, armnn::GetDataType<float>()); |