diff options
| author | Pablo Tello <pablo.tello@arm.com> | 2017-09-15 16:14:55 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
| commit | 9e40cf7c21ed0136150101d6c930417d475ecff1 (patch) | |
| tree | d5c2494556396a73204d6b278c507bd119ac6b6d | |
| parent | 5eab6c72d20c1edccfb177d5f5458b45c2714e3b (diff) | |
| download | ComputeLibrary-9e40cf7c21ed0136150101d6c930417d475ecff1.tar.gz | |
COMPMID-417: Fixed broken scons script to build bare_metal and related compiler errors.
Change-Id: I5f2d6c8b199698a5c2622254696da7034cef1b50
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/87928
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
| -rw-r--r-- | SConstruct | 8 | ||||
| -rw-r--r-- | arm_compute/core/NEON/kernels/NEMinMaxLayerKernel.h | 6 | ||||
| -rw-r--r-- | src/core/NEON/kernels/NEMinMaxLayerKernel.cpp | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index b46f775541..50370d34c3 100644 --- a/SConstruct +++ b/SConstruct @@ -124,9 +124,10 @@ elif env['arch'] == 'arm64-v8a': elif env['arch'] == 'arm64-v8.2-a': env.Append(CXXFLAGS = ['-march=armv8.2-a+fp16+simd']) env.Append(CPPDEFINES = ['ARM_COMPUTE_ENABLE_FP16']) - - if env['os'] in ['linux', 'bare_metal']: + if env['os'] == 'linux': prefix = "aarch64-linux-gnu-" + elif env['os'] == 'bare_metal': + prefix = "aarch64-elf-" elif env['os'] == 'android': prefix = "aarch64-linux-android-" elif env['arch'] == 'x86_32': @@ -218,4 +219,5 @@ if env['opencl']: if env['examples']: SConscript('./examples/SConscript', variant_dir='#build/%s/examples' % env['build_dir'], duplicate=0) -SConscript('./tests/SConscript', variant_dir='#build/%s/tests' % env['build_dir'], duplicate=0) +if env['os'] != 'bare_metal': + SConscript('./tests/SConscript', variant_dir='#build/%s/tests' % env['build_dir'], duplicate=0) diff --git a/arm_compute/core/NEON/kernels/NEMinMaxLayerKernel.h b/arm_compute/core/NEON/kernels/NEMinMaxLayerKernel.h index 5e01acf3e6..c5ead905ca 100644 --- a/arm_compute/core/NEON/kernels/NEMinMaxLayerKernel.h +++ b/arm_compute/core/NEON/kernels/NEMinMaxLayerKernel.h @@ -26,9 +26,9 @@ #define __ARM_COMPUTE_NEMINMAXLAYERKERNEL_H__ #include "arm_compute/core/NEON/INEKernel.h" +#include "support/Mutex.h" #include <cstdint> -#include <mutex> namespace arm_compute { @@ -71,7 +71,7 @@ private: void update_min_max(float *out_ptr, float min, float max); const ITensor *_input; ITensor *_output; - std::mutex _mtx; + Mutex _mtx; }; } -#endif /* __ARM_COMPUTE_NEMINMAXLAYERKERNEL_H__ */
\ No newline at end of file +#endif /* __ARM_COMPUTE_NEMINMAXLAYERKERNEL_H__ */ diff --git a/src/core/NEON/kernels/NEMinMaxLayerKernel.cpp b/src/core/NEON/kernels/NEMinMaxLayerKernel.cpp index 5e6c48f4c2..a81725fe84 100644 --- a/src/core/NEON/kernels/NEMinMaxLayerKernel.cpp +++ b/src/core/NEON/kernels/NEMinMaxLayerKernel.cpp @@ -178,7 +178,7 @@ void NEMinMaxLayerKernel::reset() void NEMinMaxLayerKernel::update_min_max(float *out_ptr, float min, float max) { - std::lock_guard<std::mutex> lock(_mtx); + std::lock_guard<Mutex> lock(_mtx); const float32x2_t old_min = vld1_dup_f32(out_ptr); const float32x2_t old_max = vld1_dup_f32(out_ptr + 1); @@ -187,4 +187,4 @@ void NEMinMaxLayerKernel::update_min_max(float *out_ptr, float min, float max) vst1_f32(out_ptr, vzip_f32(new_min, new_max).val[0]); } -} // namespace arm_compute
\ No newline at end of file +} // namespace arm_compute |