diff options
author | Michalis Spyrou <michalis.spyrou@arm.com> | 2017-08-31 15:11:41 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 07781ac8e49ed802d962419a2fd08910d68f9bf5 (patch) | |
tree | a2679d2710e6ba9d9e23b5c5aa188fdf79f7b9bd /src | |
parent | 95643d83d8f4d0431b3983f771ca749963f6a966 (diff) | |
download | ComputeLibrary-07781ac8e49ed802d962419a2fd08910d68f9bf5.tar.gz |
COMPMID-518 - Bare metal support
Change-Id: Ida6d3dc46476fd9a67b5860e5e5bf8b848a8ac23
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/85981
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/CPP/kernels/CPPCornerCandidatesKernel.cpp | 6 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEHOGDetectorKernel.cpp | 2 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEHistogramKernel.cpp | 2 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEMeanStdDevKernel.cpp | 2 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEMinMaxLocationKernel.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/core/CPP/kernels/CPPCornerCandidatesKernel.cpp b/src/core/CPP/kernels/CPPCornerCandidatesKernel.cpp index 84e12d4ead..c7ac753672 100644 --- a/src/core/CPP/kernels/CPPCornerCandidatesKernel.cpp +++ b/src/core/CPP/kernels/CPPCornerCandidatesKernel.cpp @@ -37,12 +37,12 @@ using namespace arm_compute; namespace { -inline void check_corner(float x, float y, float strength, InternalKeypoint *output, int32_t *num_corner_candidates, std::mutex *corner_candidates_mutex) +inline void check_corner(float x, float y, float strength, InternalKeypoint *output, int32_t *num_corner_candidates, arm_compute::Mutex *corner_candidates_mutex) { if(strength != 0.0f) { /* Set index and update num_corner_candidate */ - std::unique_lock<std::mutex> lock(*corner_candidates_mutex); + std::unique_lock<arm_compute::Mutex> lock(*corner_candidates_mutex); const int32_t idx = *num_corner_candidates; @@ -55,7 +55,7 @@ inline void check_corner(float x, float y, float strength, InternalKeypoint *out } } -inline void corner_candidates(const float *__restrict input, InternalKeypoint *__restrict output, int32_t x, int32_t y, int32_t *num_corner_candidates, std::mutex *corner_candidates_mutex) +inline void corner_candidates(const float *__restrict input, InternalKeypoint *__restrict output, int32_t x, int32_t y, int32_t *num_corner_candidates, arm_compute::Mutex *corner_candidates_mutex) { check_corner(x, y, *input, output, num_corner_candidates, corner_candidates_mutex); } diff --git a/src/core/NEON/kernels/NEHOGDetectorKernel.cpp b/src/core/NEON/kernels/NEHOGDetectorKernel.cpp index 4af22bca75..9dd50ca294 100644 --- a/src/core/NEON/kernels/NEHOGDetectorKernel.cpp +++ b/src/core/NEON/kernels/NEHOGDetectorKernel.cpp @@ -176,7 +176,7 @@ void NEHOGDetectorKernel::run(const Window &window) win.idx_class = _idx_class; win.score = score; - std::unique_lock<std::mutex> lock(_mutex); + std::unique_lock<arm_compute::Mutex> lock(_mutex); _detection_windows->push_back(win); lock.unlock(); } diff --git a/src/core/NEON/kernels/NEHistogramKernel.cpp b/src/core/NEON/kernels/NEHistogramKernel.cpp index 9e967ec4f5..2018651083 100644 --- a/src/core/NEON/kernels/NEHistogramKernel.cpp +++ b/src/core/NEON/kernels/NEHistogramKernel.cpp @@ -44,7 +44,7 @@ class Coordinates; inline void NEHistogramKernel::merge_histogram(uint32_t *global_hist, const uint32_t *local_hist, size_t bins) { - std::lock_guard<std::mutex> lock(_hist_mtx); + std::lock_guard<arm_compute::Mutex> lock(_hist_mtx); const unsigned int v_end = (bins / 4) * 4; diff --git a/src/core/NEON/kernels/NEMeanStdDevKernel.cpp b/src/core/NEON/kernels/NEMeanStdDevKernel.cpp index 579c46fa3d..cb32a3b45b 100644 --- a/src/core/NEON/kernels/NEMeanStdDevKernel.cpp +++ b/src/core/NEON/kernels/NEMeanStdDevKernel.cpp @@ -141,7 +141,7 @@ void NEMeanStdDevKernel::run(const Window &window) const float num_pixels = _input->info()->dimension(0) * _input->info()->dimension(1); // Merge sum and calculate mean and stddev - std::unique_lock<std::mutex> lock(_mtx); + std::unique_lock<arm_compute::Mutex> lock(_mtx); *_global_sum += vget_lane_u64(local_sum, 0); diff --git a/src/core/NEON/kernels/NEMinMaxLocationKernel.cpp b/src/core/NEON/kernels/NEMinMaxLocationKernel.cpp index a6da7f415d..24c7af7af7 100644 --- a/src/core/NEON/kernels/NEMinMaxLocationKernel.cpp +++ b/src/core/NEON/kernels/NEMinMaxLocationKernel.cpp @@ -115,7 +115,7 @@ void NEMinMaxKernel::reset() template <typename T> void NEMinMaxKernel::update_min_max(const T min, const T max) { - std::lock_guard<std::mutex> lock(_mtx); + std::lock_guard<arm_compute::Mutex> lock(_mtx); using type = typename std::conditional<std::is_same<T, float>::value, float, int32_t>::type; |