[hip] Remove deprecated hip APIs, simplify urContext #1830
+99
−138
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
JackAKirk
changed the title
JackAKirk
changed the title
|
intel/llvm tested with these changes here: intel/llvm#14476 |
frasercrmck
reviewed
Jul 8, 2024
source/adapters/hip/device.hpp
Outdated
| namespace { | ||
| /// Scoped Device is used across all UR HIP plugin implementation to activate | ||
| /// the native Device on the current thread. The ScopedDevice does not | ||
| /// reinstate the previous device as all operations in the hip adapter that |
There was a problem hiding this comment.
Looks like this was copied from an older comment but we have HIP and hip in the same comment. I think HIP is best?
There was a problem hiding this comment.
Thanks, I've used HIP consistently now.
frasercrmck
approved these changes
Jul 8, 2024
github-actions
bot
added
hip
EwanC
approved these changes
Jul 9, 2024
JackAKirk
added
ready to merge
kbenzie
approved these changes
Jul 11, 2024
JackAKirk
added
ready to merge
JackAKirk
changed the title
hdelan
approved these changes
Jul 15, 2024
source/adapters/hip/context.hpp
Outdated
| std::vector<ur_device_handle_t> Devices; | ||
|
|
||
| std::atomic_uint32_t RefCount; | ||
|
|
||
| ur_context_handle_t_(const ur_device_handle_t *Devs, uint32_t NumDevices) | ||
| : Devices{Devs, Devs + NumDevices}, RefCount{1} { | ||
| for (auto &Dev : Devices) { | ||
| urDeviceRetain(Dev); |
There was a problem hiding this comment.
Why no longer retaining ur devices?
There was a problem hiding this comment.
I've added it back.
| if (!hDevice) { | ||
| throw UR_RESULT_ERROR_INVALID_DEVICE; | ||
| } | ||
| UR_CHECK_ERROR(hipSetDevice(hDevice->getIndex())); |
Mostly these APIs were completely redundant already. HIP amd doesn't have have a context concept. Signed-off-by: JackAKirk <[email protected]>
Signed-off-by: JackAKirk <[email protected]>
Signed-off-by: JackAKirk <[email protected]>
hip -> HIP in comment. Signed-off-by: JackAKirk <[email protected]>
Signed-off-by: JackAKirk <[email protected]>
Signed-off-by: JackAKirk <[email protected]>
Signed-off-by: JackAKirk <[email protected]>
Signed-off-by: JackAKirk <[email protected]>
The test should have been checking for success or unsupported, since most backends don't support context interop. Signed-off-by: JackAKirk <[email protected]>
Signed-off-by: JackAKirk <[email protected]>
|
@JackAKirk Please make sure intel/llvm#14476 is updated and passing CI, so we could merge this. Thanks! |
|
I've removed ready to merge since the intel/llvm PR isn't passing testing and is still awaiting approvals. Once these are in place, add the ready to merge label again. |
|
This updates a context test to pass if the interface is unsupported, which cleans up the native_cpu match file that doesn't support certain context interfaces. |
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.
hip amd does not have a native context type other than to support the cuContext type on Nvidia devices. hip plans to completely remove usage of this type anyway, with all corresponding APIs marked deprecated.
This PR future-proofs our hip implementation for when these deprecated APIs become unsupported. It also simplifies the urContext type.
This updates a context test to pass if the interface is unsupported, which cleans up the native_cpu match file that doesn't support certain context interfaces.