diff options
author | Ferran Balaguer <ferran.balaguer@arm.com> | 2019-06-24 12:43:38 +0100 |
---|---|---|
committer | Ferran Balaguer Arm <ferran.balaguer@arm.com> | 2019-06-26 15:22:31 +0000 |
commit | b2b5a26e7b7250532df189cd7cf7cf1d4b528a28 (patch) | |
tree | 6cbb1d44f074455a58ab00c2f6edd5ab5c3e8ebe /src/backends/backendsCommon/test | |
parent | 5191033c76330509666e0993857b7286e2a325fc (diff) | |
download | armnn-b2b5a26e7b7250532df189cd7cf7cf1d4b528a28.tar.gz |
Update the CL pin to the latest master
* Update SoftMaxUint8Workload for CL and NEON to deal with
quantization parameters as vectors.
* Change Sigmoid Activation function QAsymm8 tests to use
scale=1.f/256.f and offset=0 as quatization output parameters.
!android-nn-driver:1417
Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Change-Id: Ief91f10193fbbbad0c0124ece41f0bf4e0dcd992
Diffstat (limited to 'src/backends/backendsCommon/test')
-rw-r--r-- | src/backends/backendsCommon/test/ActivationTestImpl.hpp | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/src/backends/backendsCommon/test/ActivationTestImpl.hpp b/src/backends/backendsCommon/test/ActivationTestImpl.hpp index 9088d18858..282e6438d0 100644 --- a/src/backends/backendsCommon/test/ActivationTestImpl.hpp +++ b/src/backends/backendsCommon/test/ActivationTestImpl.hpp @@ -392,9 +392,11 @@ LayerTestResult<T, 4> SimpleActivationTest( armnn::ActivationFunction activationFunction, float activationParameterA, float activationParameterB, - float qScale, - int32_t qOffset, + float scale, + int32_t offset, const std::vector<float>& inputData, + float outScale, + int32_t outOffset, const std::vector<float>& outputExpectedData) { constexpr static unsigned int inputWidth = 16u; @@ -413,15 +415,15 @@ LayerTestResult<T, 4> SimpleActivationTest( // Set quantization parameters if the requested type is a quantized type. if(armnn::IsQuantizedType<T>()) { - inputTensorInfo.SetQuantizationScale(qScale); - inputTensorInfo.SetQuantizationOffset(qOffset); - outputTensorInfo.SetQuantizationScale(qScale); - outputTensorInfo.SetQuantizationOffset(qOffset); + inputTensorInfo.SetQuantizationScale(scale); + inputTensorInfo.SetQuantizationOffset(offset); + outputTensorInfo.SetQuantizationScale(outScale); + outputTensorInfo.SetQuantizationOffset(outOffset); } LayerTestResult<T, 4> result(inputTensorInfo); - auto input = MakeTensor<T, 4>(inputTensorInfo, QuantizedVector<T>(qScale, qOffset, inputData)); + auto input = MakeTensor<T, 4>(inputTensorInfo, QuantizedVector<T>(scale, offset, inputData)); std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); @@ -448,7 +450,8 @@ LayerTestResult<T, 4> SimpleActivationTest( CopyDataFromITensorHandle(&result.output[0][0][0][0], outputHandle.get()); // Calculated manually. - result.outputExpected = MakeTensor<T, 4>(outputTensorInfo, QuantizedVector<T>(qScale, qOffset, outputExpectedData)); + result.outputExpected = MakeTensor<T, 4>(outputTensorInfo, QuantizedVector<T>(outScale, outOffset, + outputExpectedData)); return result; } @@ -483,6 +486,8 @@ LayerTestResult<T, 4> SimpleSigmoidTestCommon( qScale, qOffset, inputData, + 1.f / 256.f, + 0, outputExpectedData); } @@ -537,6 +542,8 @@ LayerTestResult<T, 4> ReLuTestCommon( qScale, qOffset, inputData, + qScale, + qOffset, outputExpectedData); } @@ -594,6 +601,8 @@ LayerTestResult<T, 4> BoundedReLuTestCommon( qScale, qOffset, inputData, + qScale, + qOffset, outputExpectedData); } @@ -636,6 +645,8 @@ LayerTestResult<T, 4> SoftReLuTestCommon( qScale, qOffset, inputData, + qScale, + qOffset, outputExpectedData); } @@ -691,6 +702,8 @@ LayerTestResult<T, 4> LeakyReLuTestCommon( qScale, qOffset, inputData, + qScale, + qOffset, outputExpectedData); } @@ -745,6 +758,8 @@ LayerTestResult<T, 4> AbsTestCommon( qScale, qOffset, inputData, + qScale, + qOffset, outputExpectedData); } @@ -799,6 +814,8 @@ LayerTestResult<T, 4> SqrtTestCommon( qScale, qOffset, inputData, + qScale, + qOffset, outputExpectedData); } @@ -853,6 +870,8 @@ LayerTestResult<T, 4> SquareTestCommon( qScale, qOffset, inputData, + qScale, + qOffset, outputExpectedData); } @@ -909,6 +928,8 @@ LayerTestResult<T, 4> TanhTestCommon( qScale, qOffset, inputData, + qScale, + qOffset, outputExpectedData); } |