-
Notifications
You must be signed in to change notification settings - Fork 794
[SYCL] windows shutdown fix #17124
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.
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
Closed
cperkinsintel
wants to merge
6
commits into
intel:sycl
from
cperkinsintel:cperkins-windows-shutdown-fix
Closed
[SYCL] windows shutdown fix #17124
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
cba2b47
fix for windows shutdown, minus some reviewer feedback. See sycl/doc…
cperkinsintel 9130945
resolve cherry-pick
cperkinsintel 97a3ab5
Merge branch 'sycl' into cperkins-windows-shutdown-fix-plus-latest-SYCL
cperkinsintel fc42629
fix for windows. Should probabaly be removed from Linux too, more tes…
cperkinsintel 11795f3
Merge branch 'sycl' into cperkins-windows-shutdown-fix
cperkinsintel 3541e75
Merge branch 'sycl' into cperkins-windows-shutdown-fix
cperkinsintel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -264,7 +264,17 @@ class queue_impl { | |
| destructorNotification(); | ||
| #endif | ||
| throw_asynchronous(); | ||
| getAdapter()->call<UrApiKind::urQueueRelease>(MQueues[0]); | ||
| auto status = | ||
| getAdapter()->call_nocheck<UrApiKind::urQueueRelease>(MQueues[0]); | ||
| // If loader is already closed, it'll return a not-initialized status | ||
| // which the UR should convert to SUCCESS code. But that isn't always | ||
| // working on Windows. This is a temporary workaround until that is fixed. | ||
| // TODO: Remove this workaround when UR is fixed, and restore | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. could we please create a JIRA task for this todo (blocked by UR issue)? |
||
| // ->call<>() instead of ->call_nocheck<>() above. | ||
| if (status != UR_RESULT_SUCCESS && | ||
| status != UR_RESULT_ERROR_UNINITIALIZED) { | ||
| __SYCL_CHECK_UR_CODE_NO_EXC(status); | ||
| } | ||
| } catch (std::exception &e) { | ||
| __SYCL_REPORT_EXCEPTION_TO_STREAM("exception in ~queue_impl", e); | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
std::string constructor copies char arrays, strcmp would be better.