diff options
author | Michalis Spyrou <michalis.spyrou@arm.com> | 2017-09-29 11:24:55 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 490bf2e8e87999c6e5a32bd734595cb2906c7c57 (patch) | |
tree | 4e43121fc5155f85ea239e9edf40d3f8773ffa25 /src/runtime/NEON/functions | |
parent | 040bffe16e2dc80e6c1d66ecf62aff9702a5d78e (diff) | |
download | ComputeLibrary-490bf2e8e87999c6e5a32bd734595cb2906c7c57.tar.gz |
COMPMID-417 Fix bare metal build for armv7a
Change-Id: I566a41061b75c3a1dad5374fcdc84372e6cfbe89
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/89670
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions')
7 files changed, 8 insertions, 8 deletions
diff --git a/src/runtime/NEON/functions/NECannyEdge.cpp b/src/runtime/NEON/functions/NECannyEdge.cpp index 9be1df6ea4..c27ff2f935 100644 --- a/src/runtime/NEON/functions/NECannyEdge.cpp +++ b/src/runtime/NEON/functions/NECannyEdge.cpp @@ -162,7 +162,7 @@ void NECannyEdge::configure(ITensor *input, ITensor *output, int32_t upper_thr, _edge_trace.configure(&_nonmax, output); // Fill border with "No edge" to stop recursion in edge trace - _border_edge_trace.configure(&_nonmax, _edge_trace.border_size(), BorderMode::CONSTANT, 0); + _border_edge_trace.configure(&_nonmax, _edge_trace.border_size(), BorderMode::CONSTANT, static_cast<float>(0.f)); // Allocate intermediate tensors _nonmax.allocator()->allocate(); diff --git a/src/runtime/NEON/functions/NEDepthConcatenate.cpp b/src/runtime/NEON/functions/NEDepthConcatenate.cpp index ddf7e90faa..90eee4f45f 100644 --- a/src/runtime/NEON/functions/NEDepthConcatenate.cpp +++ b/src/runtime/NEON/functions/NEDepthConcatenate.cpp @@ -52,7 +52,7 @@ void NEDepthConcatenate::configure(std::vector<ITensor *> inputs_vector, ITensor for(unsigned int i = 0; i < _num_inputs; ++i) { _concat_kernels_vector[i].configure(inputs_vector.at(i), depth_offset, output); - _border_handlers_vector[i].configure(inputs_vector.at(i), _concat_kernels_vector[i].border_size(), BorderMode::CONSTANT, PixelValue(0)); + _border_handlers_vector[i].configure(inputs_vector.at(i), _concat_kernels_vector[i].border_size(), BorderMode::CONSTANT, PixelValue(static_cast<float>(0.f))); depth_offset += inputs_vector.at(i)->info()->dimension(2); } diff --git a/src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp b/src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp index b831a6a7be..52a4cc158f 100644 --- a/src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEDirectConvolutionLayer.cpp @@ -82,7 +82,7 @@ void NEDirectConvolutionLayer::configure(ITensor *input, const ITensor *weights, } // Add zero padding XY - _input_border_handler.configure(input, _conv_kernel.border_size(), BorderMode::CONSTANT, PixelValue(0)); + _input_border_handler.configure(input, _conv_kernel.border_size(), BorderMode::CONSTANT, PixelValue(static_cast<float>(0.f))); } void NEDirectConvolutionLayer::run() diff --git a/src/runtime/NEON/functions/NEIntegralImage.cpp b/src/runtime/NEON/functions/NEIntegralImage.cpp index 2e94ed5f9a..fa8aaeb5dd 100644 --- a/src/runtime/NEON/functions/NEIntegralImage.cpp +++ b/src/runtime/NEON/functions/NEIntegralImage.cpp @@ -36,5 +36,5 @@ void NEIntegralImage::configure(const ITensor *input, ITensor *output) auto k = arm_compute::support::cpp14::make_unique<NEIntegralImageKernel>(); k->configure(input, output); _kernel = std::move(k); - _border_handler.configure(output, _kernel->border_size(), BorderMode::CONSTANT, 0); + _border_handler.configure(output, _kernel->border_size(), BorderMode::CONSTANT, static_cast<float>(0.f)); } diff --git a/src/runtime/NEON/functions/NENonMaximaSuppression3x3.cpp b/src/runtime/NEON/functions/NENonMaximaSuppression3x3.cpp index 3b59820d09..0854c9d16c 100644 --- a/src/runtime/NEON/functions/NENonMaximaSuppression3x3.cpp +++ b/src/runtime/NEON/functions/NENonMaximaSuppression3x3.cpp @@ -38,10 +38,10 @@ void NENonMaximaSuppression3x3::configure(ITensor *input, ITensor *output, Borde if(border_mode != BorderMode::UNDEFINED) { - _border_handler.configure(input, BorderSize(1), BorderMode::CONSTANT, 0); + _border_handler.configure(input, BorderSize(1), BorderMode::CONSTANT, static_cast<float>(0.f)); } else { - _border_handler.configure(input, BorderSize(1), BorderMode::UNDEFINED, 0); + _border_handler.configure(input, BorderSize(1), BorderMode::UNDEFINED, static_cast<float>(0.f)); } } diff --git a/src/runtime/NEON/functions/NEPoolingLayer.cpp b/src/runtime/NEON/functions/NEPoolingLayer.cpp index 4c4e11f7db..de04f36961 100644 --- a/src/runtime/NEON/functions/NEPoolingLayer.cpp +++ b/src/runtime/NEON/functions/NEPoolingLayer.cpp @@ -37,5 +37,5 @@ void NEPoolingLayer::configure(ITensor *input, ITensor *output, const PoolingLay // Configure border depending on operation required BorderMode border_mode = (pool_info.pool_type() == PoolingType::MAX) ? BorderMode::REPLICATE : BorderMode::CONSTANT; - _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(0)); + _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(static_cast<float>(0.f))); } diff --git a/src/runtime/NEON/functions/NEReductionOperation.cpp b/src/runtime/NEON/functions/NEReductionOperation.cpp index 45c3e5dbc9..f1a9145f74 100644 --- a/src/runtime/NEON/functions/NEReductionOperation.cpp +++ b/src/runtime/NEON/functions/NEReductionOperation.cpp @@ -74,7 +74,7 @@ void NEReductionOperation::configure(ITensor *input, ITensor *output, unsigned i // Configure fill border kernel BorderSize fill_border_size = (axis == 0) ? _reduction_kernel.border_size() : BorderSize(); BorderMode fill_border_mode = reduction_operation_border_mode(op); - _fill_border_kernel.configure(input, fill_border_size, fill_border_mode, PixelValue(0)); + _fill_border_kernel.configure(input, fill_border_size, fill_border_mode, PixelValue(static_cast<float>(0.f))); } void NEReductionOperation::run() |