-
Notifications
You must be signed in to change notification settings - Fork 52
Introduce more flexible storeChunk() syntax, use to add ADIOS2 memory selection #1620
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
Open
franzpoeschel
wants to merge
11
commits into
openPMD:dev
Choose a base branch
from
franzpoeschel:adios2-memory-selection
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
727cbbc to
ddcdfc9
Compare
c05d535 to
ba7c582
Compare
ba7c582 to
d7eb891
Compare
332932f to
efb0876
Compare
efb0876 to
39e3d71
Compare
47d497b to
b2bc355
Compare
b699520 to
3430b6d
Compare
9b5acff to
bd7b378
Compare
208c381 to
e51e635
Compare
c8be94b to
8e455b4
Compare
8e455b4 to
430fe3b
Compare
430fe3b to
e98c840
Compare
190674f to
e04f76d
Compare
b99bb95 to
d05e029
Compare
54eb6e8 to
0d3e248
Compare
| RecordComponent::loadChunkAllocate_impl(internal::LoadStoreConfig cfg) | ||
| { | ||
| using T = std::remove_extent_t<T_with_extent>; | ||
| // static_assert(!std::is_same_v<T, std::string>, "EVIL"); |
Check notice
Code scanning / CodeQL
Commented-out code Note
This comment appears to contain commented-out code.
| std::static_pointer_cast<T>(std::move(ptr)), | ||
| std::move(offset), | ||
| std::move(extent)); | ||
| // static_assert(!std::is_same_v<T_with_extent, std::string>, "EVIL"); |
Check notice
Code scanning / CodeQL
Commented-out code Note
This comment appears to contain commented-out code.
0d3e248 to
66caf5f
Compare
66caf5f to
3e8f374
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
We currently don't support memory selections yet, e.g. when you have a 2D memory buffer but want to write only an arbitrary block from it. That block is then non-contiguous, but ADIOS2 has so-called memory selections to support this.
We currently don't have an API that would be able to expose this (except in Python where the native Python buffer protocol is powerful enough to express this; we currently throw an error when detecting this
strides in selection are inefficient, not implemented!). Since theloadChunk()/storeChunk()API is somewhat convoluted by now anyway, I didn't want to add even further overloads.Instead, this PR proposes a new syntax for setting up load/store calls:
RecordComponent E_y; E_y.prepareLoadStore() .offset({0, 5}) // optional .extent({1,5}) // optional .enqueueLoad<int>(); // -> std::shared_ptr<int> E_y.prepareLoadStore() .offset({0, 5}) // optional .extent({1,5}) // optional .enqueueLoadVariant(); // ->std::variant<std::shared_ptr<char>, ...> E_y.prepareLoadStore() .offset({0, 5}) // optional .extent({1,5}) // optional .enqueueStore<int>(); // -> DynamicMemoryView<int>, i.e. Span API std::shared_ptr<int> data; E_y.prepareLoadStore() .offset({0, 5}) // optional .extent({1,5}) // optional .withSharedPtr(data) // or withUniquePtr(), withRawPtr(), withContiguousContainer() .memorySelection({{1,1},{5,5}}) // call only available after having called withSharedPtr() .enqueueStore(); // -> void, no template parameter needed since withSharedPtr(data) already gives the type E_y.prepareLoadStore() .withSharedPtr(data) // or withUniquePtr(), withRawPtr(), withContiguousContainer() .enqueueLoad(); // load the whole dataset into the bufferThis API makes it easier to add functionality without going through every single overload and adapting it. Further, it makes the API more consistent, e.g. offset and extent are now always optional and not just for those calls that implement a default logic.
With this PR, the old API calls are now fully implemented via the new API, giving it a good test coverage.
TODO:
.noop_future()to disable future return types.