[OM] Use custom CAPI wrappers for Object. #5275
Merged
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
This adds custom CAPI wrap and unwrap functionality for Object to better align with the std::shared_ptr functionality. Object now enables the shared_from_this functionality, which allows the unwrap function to more seamlessly create shared pointers to the Object with the appropriate reference count. Similarly, the wrap functionality is updated to always allocate new shared pointers, to ensure reference counts are incremented appropriately. This was done at the instantiate API previously, but is now handled generically whenever an Object is wrapped. These changes are required to avoid double frees of Objects in general. A test case has been added that demonstrated the faulty behavior, which now succeeds.
mikeurbach
added a commit
that referenced
this pull request
May 26, 2023
This adds support for Objects in the Fields of other Objects. This is handled in the pure Python layer of the Evaluator API, which is enhanced to support recursively instantiating Objects. The functionality for creating a dataclass instance from an instantiated Object is factored out into a new helper. In the case an Object field is itself an Object, the new helper is called recursively with the child dataclass and the child Object. A simple integration test for this behavior is added. This uncovered undefined behavior in the previous use of shared pointers, so this patch depends on PR #5275.
mikeurbach
added a commit
that referenced
this pull request
May 30, 2023
This adds support for Objects in the Fields of other Objects. This is handled in the pure Python layer of the Evaluator API, which is enhanced to support recursively instantiating Objects. The functionality for creating a dataclass instance from an instantiated Object is factored out into a new helper. In the case an Object field is itself an Object, the new helper is called recursively with the child dataclass and the child Object. A simple integration test for this behavior is added. This uncovered undefined behavior in the previous use of shared pointers, so this patch depends on PR #5275.
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.
This adds custom CAPI wrap and unwrap functionality for Object to better align with the std::shared_ptr functionality. Object now enables the shared_from_this functionality, which allows the unwrap function to more seamlessly create shared pointers to the Object with the appropriate reference count. Similarly, the wrap functionality is updated to always allocate new shared pointers, to ensure reference counts are incremented appropriately. This was done at the instantiate API previously, but is now handled generically whenever an Object is wrapped.
These changes are required to avoid double frees of Objects in general. A test case has been added that demonstrated the faulty behavior, which now succeeds.