diff options
| author | morgolock <pablo.tello@arm.com> | 2020-08-20 14:51:39 +0100 |
|---|---|---|
| committer | Pablo Marquez <pablo.tello@arm.com> | 2020-08-25 13:17:09 +0000 |
| commit | 5111264954e2d1a4d3e91d23a0869a0d7105be4c (patch) | |
| tree | 57c8db6a8911378129364bc6d826a3c0ef7f9283 /src/runtime/OMP | |
| parent | 96a14008af85725d067cdd8247023474581102ea (diff) | |
| download | ComputeLibrary-5111264954e2d1a4d3e91d23a0869a0d7105be4c.tar.gz | |
COMPMID-3661: Added multidimension support to OMP scheduler.
Change-Id: Iedacf7094896f08d7c2847c8fb99bd7153deba2c
Signed-off-by: morgolock <pablo.tello@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3809
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Diffstat (limited to 'src/runtime/OMP')
| -rw-r--r-- | src/runtime/OMP/OMPScheduler.cpp | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/src/runtime/OMP/OMPScheduler.cpp b/src/runtime/OMP/OMPScheduler.cpp index 11448e595c..4c2f03a53a 100644 --- a/src/runtime/OMP/OMPScheduler.cpp +++ b/src/runtime/OMP/OMPScheduler.cpp @@ -28,7 +28,6 @@ #include "arm_compute/core/Helpers.h" #include "arm_compute/core/Utils.h" #include "arm_compute/runtime/CPUUtils.h" - #include <omp.h> namespace arm_compute @@ -51,36 +50,8 @@ void OMPScheduler::set_num_threads(unsigned int num_threads) void OMPScheduler::schedule(ICPPKernel *kernel, const Hints &hints) { - ARM_COMPUTE_ERROR_ON_MSG(!kernel, "The child class didn't set the kernel"); - ARM_COMPUTE_ERROR_ON_MSG(hints.strategy() == StrategyHint::DYNAMIC, - "Dynamic scheduling is not supported in OMPScheduler"); - - const Window &max_window = kernel->window(); - const unsigned int num_iterations = max_window.num_iterations(hints.split_dimension()); - const unsigned int num_threads = std::min(num_iterations, _num_threads); - - if(!kernel->is_parallelisable() || num_threads == 1) - { - ThreadInfo info; - info.cpu_info = &_cpu_info; - kernel->run(max_window, info); - } - else - { - const unsigned int num_windows = num_threads; - std::vector<IScheduler::Workload> workloads(num_windows); - for(unsigned int t = 0; t < num_windows; t++) - { - //Capture 't' by copy, all the other variables by reference: - workloads[t] = [t, &hints, &max_window, &num_windows, &kernel](const ThreadInfo & info) - { - Window win = max_window.split_window(hints.split_dimension(), t, num_windows); - win.validate(); - kernel->run(win, info); - }; - } - run_workloads(workloads); - } + ITensorPack tensors; + schedule_common(kernel, hints, tensors); } void OMPScheduler::schedule_op(ICPPKernel *kernel, const Hints &hints, ITensorPack &tensors) |