Skip to content

[SYCL] Don't use C++17 CTAD causing post-commit failures #7635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2022
Merged

[SYCL] Don't use C++17 CTAD causing post-commit failures #7635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sycl/plugins/cuda/pi_cuda.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ struct _pi_queue {

template <typename T> bool all_of(T &&f) {
{
std::lock_guard compute_guard(compute_stream_mutex_);
std::lock_guard<std::mutex> compute_guard(compute_stream_mutex_);
unsigned int end =
std::min(static_cast<unsigned int>(compute_streams_.size()),
num_compute_streams_);
Expand All @@ -510,7 +510,7 @@ struct _pi_queue {
return false;
}
{
std::lock_guard transfer_guard(transfer_stream_mutex_);
std::lock_guard<std::mutex> transfer_guard(transfer_stream_mutex_);
unsigned int end =
std::min(static_cast<unsigned int>(transfer_streams_.size()),
num_transfer_streams_);
Expand Down
4 changes: 2 additions & 2 deletions sycl/plugins/hip/pi_hip.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ struct _pi_queue {

template <typename T> bool all_of(T &&f) {
{
std::lock_guard compute_guard(compute_stream_mutex_);
std::lock_guard<std::mutex> compute_guard(compute_stream_mutex_);
unsigned int end =
std::min(static_cast<unsigned int>(compute_streams_.size()),
num_compute_streams_);
Expand All @@ -489,7 +489,7 @@ struct _pi_queue {
return false;
}
{
std::lock_guard transfer_guard(transfer_stream_mutex_);
std::lock_guard<std::mutex> transfer_guard(transfer_stream_mutex_);
unsigned int end =
std::min(static_cast<unsigned int>(transfer_streams_.size()),
num_transfer_streams_);
Expand Down
4 changes: 2 additions & 2 deletions sycl/source/detail/queue_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ bool queue_impl::ext_oneapi_empty() const {
// If we have in-order queue where events are not discarded then just check
// the status of the last event.
if (isInOrder() && !MDiscardEvents) {
std::lock_guard Lock(MLastEventMtx);
std::lock_guard<std::mutex> Lock(MLastEventMtx);
return MLastEvent.get_info<info::event::command_execution_status>() ==
info::event_command_status::complete;
}
Expand All @@ -421,7 +421,7 @@ bool queue_impl::ext_oneapi_empty() const {

// We may have events like host tasks which are not submitted to the backend
// queue so we need to get their status separately.
std::lock_guard Lock(MMutex);
std::lock_guard<std::mutex> Lock(MMutex);
for (event Event : MEventsShared)
if (Event.get_info<info::event::command_execution_status>() !=
info::event_command_status::complete)
Expand Down