diff options
| author | Pablo Marquez Tello <pablo.tello@arm.com> | 2023-12-05 15:44:50 +0000 |
|---|---|---|
| committer | Pablo Marquez Tello <pablo.tello@arm.com> | 2023-12-06 15:05:15 +0000 |
| commit | 17e116e90e6b962a09c133c646b6ad7884e94693 (patch) | |
| tree | 7c0bba172a510fb0793d2052b3ce5f1d3174abc9 /src/runtime | |
| parent | fadc9b1e0bba90d6a91beb65466b2a0895b3a5e4 (diff) | |
| download | ComputeLibrary-17e116e90e6b962a09c133c646b6ad7884e94693.tar.gz | |
Revert "thread_local _custom_scheduler"
This reverts commit ded5b182675e3166e947a8eb637b5b1e925816ab.
Resolves COMPMID-6735
Signed-off-by: Pablo Marquez Tello <pablo.tello@arm.com>
Change-Id: I9b69ca1ec80a671171d3f52081c4b8c61a676617
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10838
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: <felixjohnny.thomasmathibalan@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/Scheduler.cpp | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/runtime/Scheduler.cpp b/src/runtime/Scheduler.cpp index 6d961f29a5..3f1e96968a 100644 --- a/src/runtime/Scheduler.cpp +++ b/src/runtime/Scheduler.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2017-2020, 2023 Arm Limited. + * Copyright (c) 2017-2020, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -40,18 +40,14 @@ using namespace arm_compute; #if !ARM_COMPUTE_CPP_SCHEDULER && ARM_COMPUTE_OPENMP_SCHEDULER Scheduler::Type Scheduler::_scheduler_type = Scheduler::Type::OMP; #elif ARM_COMPUTE_CPP_SCHEDULER && !ARM_COMPUTE_OPENMP_SCHEDULER -Scheduler::Type Scheduler::_scheduler_type = Scheduler::Type::CPP; +Scheduler::Type Scheduler::_scheduler_type = Scheduler::Type::CPP; #elif ARM_COMPUTE_CPP_SCHEDULER && ARM_COMPUTE_OPENMP_SCHEDULER Scheduler::Type Scheduler::_scheduler_type = Scheduler::Type::CPP; #else /* ARM_COMPUTE_*_SCHEDULER */ Scheduler::Type Scheduler::_scheduler_type = Scheduler::Type::ST; #endif /* ARM_COMPUTE_*_SCHEDULER */ -#ifndef ARM_COMPUTE_THREAD_LOCAL_SCHEDULER std::shared_ptr<IScheduler> Scheduler::_custom_scheduler = nullptr; -#else // ARM_COMPUTE_THREAD_LOCAL_SCHEDULER -std::shared_ptr<IScheduler> thread_local Scheduler::_custom_scheduler = nullptr; -#endif // ARM_COMPUTE_THREAD_LOCAL_SCHEDULER namespace { @@ -78,30 +74,6 @@ void Scheduler::set(Type t) _scheduler_type = t; } -bool Scheduler::is_set() -{ - if (_scheduler_type == Type::CUSTOM) - { - return _custom_scheduler != nullptr; - } - else - { - return !_schedulers.empty(); - } -} - -unsigned int Scheduler::num_threads() -{ - if (Scheduler::is_set()) - { - return Scheduler::get().num_threads(); - } - else - { - return CPUInfo::get().get_cpu_num(); - } -} - bool Scheduler::is_available(Type t) { if (t == Type::CUSTOM) |