diff options
| author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2018-10-31 11:04:01 +0000 |
|---|---|---|
| committer | David Beck <david.beck@arm.com> | 2018-11-08 11:34:44 +0000 |
| commit | 60578950322491e44b4203fe085c3230ead19c7a (patch) | |
| tree | e68bd71cb7b90d66d69a3de25561e32a13dd4e17 /src/backends/backendsCommon/test/Conv2dTestImpl.hpp | |
| parent | db49a8880ba869627e884b5ba5245a3932de218d (diff) | |
| download | armnn-60578950322491e44b4203fe085c3230ead19c7a.tar.gz | |
IVGCVSW-1709: Clean up memory manager bodge
* Added quick workaround for the memory management errors in the
CL/Neon unit tests
Change-Id: I56250db462cdbdc1acc0a5824807d288fb0c1d11
Diffstat (limited to 'src/backends/backendsCommon/test/Conv2dTestImpl.hpp')
| -rwxr-xr-x | src/backends/backendsCommon/test/Conv2dTestImpl.hpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/backends/backendsCommon/test/Conv2dTestImpl.hpp b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp index aa3a44db5d..03becab73f 100755 --- a/src/backends/backendsCommon/test/Conv2dTestImpl.hpp +++ b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp @@ -213,8 +213,9 @@ LayerTestResult<T, 4> SimpleConvolution2dTestImpl(armnn::IWorkloadFactory& workl CopyDataToITensorHandle(inputHandle.get(), &batchedInput[0][0][0][0]); - workloadFactory.Finalize(); + workloadFactory.Acquire(); workload->Execute(); + workloadFactory.Release(); CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); @@ -304,8 +305,9 @@ LayerTestResult<T, 4> SimpleConvolution2dNhwcTestImpl(armnn::IWorkloadFactory& w CopyDataToITensorHandle(inputHandle.get(), &batchedInput[0][0][0][0]); - workloadFactory.Finalize(); + workloadFactory.Acquire(); workload->Execute(); + workloadFactory.Release(); CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); @@ -445,7 +447,6 @@ LayerTestResult<T, 4> DepthwiseConvolution2dAsymmetricTestImpl(armnn::IWorkloadF CopyDataToITensorHandle(inputHandle.get(), &batchedInput[0][0][0][0]); - workloadFactory.Finalize(); workload->Execute(); CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); @@ -589,7 +590,6 @@ LayerTestResult<T, 4> DepthwiseConvolution2dDepthMul1TestImpl(armnn::IWorkloadFa CopyDataToITensorHandle(inputHandle.get(), &input[0][0][0][0]); - workloadFactory.Finalize(); workload->Execute(); CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); @@ -791,7 +791,6 @@ LayerTestResult<T, 4> DepthwiseConvolution2dTestImpl(armnn::IWorkloadFactory& wo CopyDataToITensorHandle(inputHandle.get(), &input[0][0][0][0]); - workloadFactory.Finalize(); workload->Execute(); CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); @@ -891,7 +890,6 @@ LayerTestResult<T, 4> DepthwiseConvolution2dNhwcTestImpl(armnn::IWorkloadFactory CopyDataToITensorHandle(inputHandle.get(), &batchedInput[0][0][0][0]); - workloadFactory.Finalize(); workload->Execute(); CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); @@ -1007,8 +1005,9 @@ LayerTestResult<T,4> Convolution1dTestImpl(armnn::IWorkloadFactory& workloadFact CopyDataToITensorHandle(inputHandle.get(), inputData.data()); - workloadFactory.Finalize(); + workloadFactory.Acquire(); workload->Execute(); + workloadFactory.Release(); // Output LayerTestResult<T,4> ret(outputInfo); @@ -1105,9 +1104,10 @@ LayerTestResult<T,4> CompareConvolution2dTestImpl(armnn::IWorkloadFactory& workl CopyDataToITensorHandle(inputHandle.get(), &input[0][0][0][0]); CopyDataToITensorHandle(inputHandleRef.get(), &input[0][0][0][0]); - workloadFactory.Finalize(); + workloadFactory.Acquire(); workload->Execute(); - refWorkloadFactory.Finalize(); + workloadFactory.Release(); + workloadRef->Execute(); CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); @@ -1228,9 +1228,7 @@ LayerTestResult<T, 4> CompareDepthwiseConvolution2dTestImpl(armnn::IWorkloadFact CopyDataToITensorHandle(inputHandle.get(), &input[0][0][0][0]); CopyDataToITensorHandle(inputHandleRef.get(), &input[0][0][0][0]); - workloadFactory.Finalize(); workload->Execute(); - refWorkloadFactory.Finalize(); workloadRef->Execute(); CopyDataFromITensorHandle(&ret.output[0][0][0][0], outputHandle.get()); |