diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2021-02-09 10:28:54 +0000 |
---|---|---|
committer | Sadik Armagan <sadik.armagan@arm.com> | 2021-02-09 10:31:14 +0000 |
commit | a2747487fbe7eb6d9f5357c6d16c32355ed6e01c (patch) | |
tree | 6f6f8b38100d16f1ec8a0e5be71e8e6ae1cc600a /src/backends/reference | |
parent | ac001eebca101f2df4973d2f1d8cfca026e07419 (diff) | |
download | armnn-a2747487fbe7eb6d9f5357c6d16c32355ed6e01c.tar.gz |
MLCE-347 'REDUCE_MIN, REDUCE_MAX, REDUCE_SUM Support'
* Added TfLiteParser support for REDUCE_MIN and REDUCE_MAX operators
* Added ACL workloads support for REDUCE_MIN, REDUCE_MAX, and REDUCE_SUM operators
* Added TfLite Delegate support for REDUCE_MIN, REDUCE_MAX, and REDUCE_SUM operators
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I8085d59946bfd4ab78a59a61f899031ae53371a8
Diffstat (limited to 'src/backends/reference')
-rw-r--r-- | src/backends/reference/test/RefLayerTests.cpp | 9 | ||||
-rw-r--r-- | src/backends/reference/workloads/Reduce.cpp | 78 |
2 files changed, 55 insertions, 32 deletions
diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index d5e0f8290b..161476ed98 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -2241,4 +2241,13 @@ ARMNN_AUTO_TEST_CASE_WITH_THF(ReduceSumSingleAxisFloat32_2, ReduceSumSingleAxisT ARMNN_AUTO_TEST_CASE_WITH_THF(ReduceSumSingleAxisFloat32_3, ReduceSumSingleAxisTest3<DataType::Float32>) ARMNN_AUTO_TEST_CASE_WITH_THF(ReduceSumMultipleAxisFloat32, ReduceSumMultipleAxisTest<DataType::Float32>) +// ReduceMax +ARMNN_AUTO_TEST_CASE_WITH_THF(ReduceMaxFloat32, ReduceMaxSimpleTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE_WITH_THF(ReduceMaxNegativeAxisFloat32, ReduceMaxNegativeAxisTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE_WITH_THF(ReduceMax2Float32, ReduceMaxSimpleTest2<DataType::Float32>) + +// ReduceMin +ARMNN_AUTO_TEST_CASE_WITH_THF(ReduceMinFloat32, ReduceMinSimpleTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE_WITH_THF(ReduceMinNegativeAxisFloat32, ReduceMinNegativeAxisTest<DataType::Float32>) + BOOST_AUTO_TEST_SUITE_END() diff --git a/src/backends/reference/workloads/Reduce.cpp b/src/backends/reference/workloads/Reduce.cpp index 5375c7163a..31c6262c9a 100644 --- a/src/backends/reference/workloads/Reduce.cpp +++ b/src/backends/reference/workloads/Reduce.cpp @@ -75,33 +75,27 @@ void Reduce(const TensorInfo& inputInfo, const std::vector<uint32_t> axis, const ReduceOperation reduceOperation) { - unsigned int inputNumDims = inputInfo.GetNumDimensions(); - unsigned int outputNumDims = outputInfo.GetNumDimensions(); - - armnn::TensorShape outputDims = outputInfo.GetShape(); armnn::TensorShape inputDims = inputInfo.GetShape(); + unsigned int inputNumDims = inputInfo.GetNumDimensions(); + unsigned int numOutputs = outputInfo.GetNumElements(); - // Initialise output data. - unsigned int numOutputs = 1; - for (unsigned int idx = 0; idx < outputNumDims; ++idx) + // Initialise temp output + std::vector<float> tempOut(numOutputs); + if (reduceOperation == ReduceOperation::Max || reduceOperation == ReduceOperation::Min) { - numOutputs *= outputDims[idx]; + for (unsigned int idx = 0; idx < numOutputs; ++idx) + { + input[idx]; + tempOut[idx] = input.Get(); + } } - - std::vector<float> tempSum(numOutputs); - for (unsigned int idx = 0; idx < numOutputs; ++idx) + else { - output[idx]; - output.Set(0.0f); - tempSum[idx] = 0.0f; + std::fill(tempOut.begin(), tempOut.end(), 0.0); } - // Initialise temp index. - std::vector<unsigned int> tempIndex(inputNumDims); - for (unsigned int idx = 0; idx < inputNumDims; ++idx) - { - tempIndex[idx] = 0; - } + // Initialise temp index + std::vector<unsigned int> tempIndex(inputNumDims, 0); std::vector<unsigned int> resolvedAxis = axis; if (resolvedAxis.empty()) @@ -113,17 +107,35 @@ void Reduce(const TensorInfo& inputInfo, } auto numResolvedAxis = armnn::numeric_cast<unsigned int>(resolvedAxis.size()); - // Iterates through input_data and sum up the reduced axis. + // Iterates through input_data and operates over the reduced axis for (bool hasNext = true; hasNext; hasNext = NextIndex(inputNumDims, inputDims, tempIndex)) { unsigned int inputOffset = ReducedOutputOffset(inputNumDims, inputDims, tempIndex, 0, {}); unsigned int outputOffset = ReducedOutputOffset(inputNumDims, inputDims, tempIndex, numResolvedAxis, resolvedAxis); input[inputOffset]; - tempSum[outputOffset] += input.Get(); + auto inputValue = input.Get(); + if (reduceOperation == ReduceOperation::Max) + { + if (inputValue > tempOut[outputOffset]) + { + tempOut[outputOffset] = inputValue; + } + } + else if (reduceOperation == ReduceOperation::Min) + { + if (inputValue < tempOut[outputOffset]) + { + tempOut[outputOffset] = inputValue; + } + } + else + { + tempOut[outputOffset] += inputValue; + } } - // Takes average by num of elements added to get mean. + // Takes average by num of elements added to get MEAN size_t numElementsInAxis = 1; for (unsigned int idx = 0; idx < numResolvedAxis; ++idx) { @@ -132,19 +144,21 @@ void Reduce(const TensorInfo& inputInfo, (std::numeric_limits<float>::max() / armnn::numeric_cast<float>(numElementsInAxis))); numElementsInAxis *= current; } - if (numElementsInAxis > 0) { - for (unsigned int idx = 0; idx < numOutputs; ++idx) + + for (unsigned int idx = 0; idx < numOutputs; ++idx) + { + output[idx]; + if (reduceOperation == ReduceOperation::Mean) { - output[idx]; - if (reduceOperation == ReduceOperation::Sum) - { - output.Set(tempSum[idx]); - } - else if (reduceOperation == ReduceOperation::Mean) + if (numElementsInAxis > 0) { - output.Set(tempSum[idx] / armnn::numeric_cast<float>(numElementsInAxis)); + output.Set(tempOut[idx] / armnn::numeric_cast<float>(numElementsInAxis)); } } + else + { + output.Set(tempOut[idx]); + } } } |