diff options
| author | Michalis Spyrou <michalis.spyrou@arm.com> | 2018-11-20 18:38:29 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-11-22 13:22:24 +0000 |
| commit | 2897e61e8fe04aaf95540f4525c3dd3f7f46ebfa (patch) | |
| tree | a887648225c485ddf06363170d6111290b6111eb /src/runtime/NEON | |
| parent | 303f0dbebf631b3db00d9d64e71018abbbe9d4fe (diff) | |
| download | ComputeLibrary-2897e61e8fe04aaf95540f4525c3dd3f7f46ebfa.tar.gz | |
COMPMID-1645 NEL2Normalization for FP32/FP16 & NHWC
Change-Id: I29e35024e29781a6b943b568abec9c73649215e6
Diffstat (limited to 'src/runtime/NEON')
| -rw-r--r-- | src/runtime/NEON/functions/NEL2NormalizeLayer.cpp | 9 | ||||
| -rw-r--r-- | src/runtime/NEON/functions/NEReductionOperation.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/runtime/NEON/functions/NEL2NormalizeLayer.cpp b/src/runtime/NEON/functions/NEL2NormalizeLayer.cpp index d0b80fb1b8..56da966abf 100644 --- a/src/runtime/NEON/functions/NEL2NormalizeLayer.cpp +++ b/src/runtime/NEON/functions/NEL2NormalizeLayer.cpp @@ -26,8 +26,8 @@ #include "arm_compute/core/Helpers.h" #include "arm_compute/runtime/NEON/NEScheduler.h" -using namespace arm_compute; - +namespace arm_compute +{ NEL2NormalizeLayer::NEL2NormalizeLayer(std::shared_ptr<IMemoryManager> memory_manager) : _memory_group(std::move(memory_manager)), _reduce_func(), _normalize_kernel(), _sumsq() { @@ -57,8 +57,8 @@ Status NEL2NormalizeLayer::validate(const ITensorInfo *input, const ITensorInfo ARM_COMPUTE_RETURN_ON_ERROR(NEReductionOperation::validate(input, &sum_sq, axis, ReductionOperation::SUM_SQUARE)); - // Reduce shape on axis (supported axis is 0) - shape.set(0, 1); + // Reduce shape on axis + shape.set(axis, 1); sum_sq.set_tensor_shape(shape); ARM_COMPUTE_RETURN_ON_ERROR(NEL2NormalizeLayerKernel::validate(input, &sum_sq, output, axis, epsilon)); @@ -75,3 +75,4 @@ void NEL2NormalizeLayer::run() _memory_group.release(); } +} // namespace arm_compute diff --git a/src/runtime/NEON/functions/NEReductionOperation.cpp b/src/runtime/NEON/functions/NEReductionOperation.cpp index 188c2bbb18..bb27b5d47a 100644 --- a/src/runtime/NEON/functions/NEReductionOperation.cpp +++ b/src/runtime/NEON/functions/NEReductionOperation.cpp @@ -86,7 +86,7 @@ void NEReductionOperation::configure(ITensor *input, ITensor *output, unsigned i if(axis == 0) { // Configure fill border kernel - BorderSize fill_border_size = (axis == 0) ? _reduction_kernel.border_size() : BorderSize(); + BorderSize fill_border_size = _reduction_kernel.border_size(); BorderMode fill_border_mode = reduction_operation_border_mode(op); _fill_border_kernel.configure(input, fill_border_size, fill_border_mode, PixelValue(static_cast<float>(0.f))); } |