Introduce priorities in ThreadPool #2092
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JanuszL
reviewed
Jul 7, 2020
dali/pipeline/util/thread_pool.h
Outdated
| * @brief Adds work to the queue with optional priority. | ||
| * The work only gets queued and it will only start after invoking | ||
| * `RunAll` (wakes up all threads to complete all remaining works) or | ||
| * `RunWork` (wakes up a single thread to complete one work unit). |
There was a problem hiding this comment.
I don't see RunWork implemented.
There was a problem hiding this comment.
Yeah, it should be DoWorkWithID
JanuszL
reviewed
Jul 7, 2020
dali/pipeline/util/thread_pool.h
Outdated
| return a.first < b.first; | ||
| } | ||
| }; | ||
| std::queue<Work> work_queue__; |
JanuszL
reviewed
Jul 7, 2020
dali/pipeline/util/thread_pool.cc
Outdated
|
|
||
| void ThreadPool::DoWorkWithID(Work work, int64_t priority) { | ||
| AddWork(std::move(work), priority); | ||
| adding_work_ = false; |
JanuszL
reviewed
Jul 7, 2020
dali/pipeline/util/thread_pool.cc
Outdated
| tl_errors_[i].pop(); | ||
| throw std::runtime_error(error); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void ThreadPool::RunAll(bool wait) { | ||
| adding_work_ = false; |
JanuszL
reviewed
Jul 7, 2020
| adding_work_ = true; | ||
| } | ||
|
|
||
| void ThreadPool::DoWorkWithID(Work work, int64_t priority) { |
There was a problem hiding this comment.
How about:
void ThreadPool::DoWorkWithID(Work work, int64_t priority, bool hold_work = false) {
AddWork(std::move(work), priority, hold_work );
condition_.notify_one();
}
void ThreadPool::AddWork(Work work, int64_t priority, bool hold_work = true) {
std::lock_guard<std::mutex> lock(mutex_);
work_queue_.push({priority, std::move(work)});
work_complete_ = false;
adding_work_ = hold_work ;
}
JanuszL
approved these changes
Jul 7, 2020
banasraf
reviewed
Jul 9, 2020
dali/pipeline/util/thread_pool.cc
Outdated
| std::lock_guard<std::mutex> lock(mutex_); | ||
| adding_work_ = false; | ||
| } | ||
| condition_.notify_all(); |
There was a problem hiding this comment.
I think it can be notify_one(). Worker threads already have a mechanism to notify a next worker if there is a task pending. In case the number of jobs is smaller than number of workers notify_all() would wake more threads than needed.
Signed-off-by: Joaquin Anton <janton@nvidia.com>
Signed-off-by: Joaquin Anton <janton@nvidia.com>
Signed-off-by: Joaquin Anton <janton@nvidia.com>
jantonguirao
force-pushed
the
thread_pool_priority
branch
from
6bf0eeb
to
03aa05d
Compare
banasraf
approved these changes
Jul 9, 2020
|
!build |
|
CI MESSAGE: [1455543]: BUILD STARTED |
|
CI MESSAGE: [1455543]: BUILD FAILED |
Signed-off-by: Joaquin Anton <janton@nvidia.com>
|
!build |
|
CI MESSAGE: [1455678]: BUILD STARTED |
|
CI MESSAGE: [1455678]: BUILD PASSED |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Joaquin Anton janton@nvidia.com
Why we need this PR?
What happened in this PR?
Fill relevant points, put NA otherwise. Replace anything inside []
Added a priority queue in ThreadPool
Added a new pattern of using ThreadPool:
AddWorkwill add work to the queue but won't start processing it, andRunAllwill wake up all the threads to process the remaining work, which will be picked in order according to the task priorityThread pool
Thread pool implementation
Unit tests and benchmark added
Doxygen
TODO as a follow-up: Modify all uses of ThreadPool in DALI operators to use the new AddWork/RunAll pattern
JIRA TASK: [DALI-1473]