mtl/ofi: Remove dependence on libfabric's definition of container_of macro #12726
Conversation
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
Previously mtl_ofi_request.h inadvertently used container_of as defined by libfabric in include/rdma/fabric.h, however libfabric is removing that symbol from their headers as part of changes supporting libfabric 2.0 API. (see ofiwg/libfabric#10250). This change defines our own (compatible) container_of macro to remove the external dependence, but only if it is not already defined. Signed-off-by: Luke Robison <[email protected]>
mtl_ofi_request.h previously included mtl_ofi.h, however mtl_ofi.h is in fact the only file to include mtl_ofi_request.h. The standard header guards (MTL_OFI_H_HAS_BEEN_INCLUDED) prevented true circular dependency, and makes the include statement useless. This commit removes the usless include. Signed-off-by: Luke Robison <[email protected]>
|
@wenduwan oh, sorry -- I missed yours. I don't have a strong preference, they both accomplish the same thing. I slightly prefer mine because it has less potential for wider impact and doesn't add an extra header file, but it does repeat itself repeat itself slightly. |
|
I didn't remove the circular dependency in my PR though. |
|
Meh, the circular dependency is just a one-line cleanup. Side note: seems like there is some network problem in the CI runners. Both ROCM and mpi4py jobs timed out getting resources from different domains. The rest of them are happy. |
|
Canceled in favor of #12724 |
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.
Two commits: