-
Notifications
You must be signed in to change notification settings - Fork 26
Added partial support for compact datasets. #107
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -98,7 +98,21 @@ def __init__(self, dataobject, pseudo_chunking_size_MB=4): | |
| # throws a flake8 wobbly for Python<3.10; match is Py3.10+ syntax | ||
| match self.layout_class: # noqa | ||
| case 0: #compact storage | ||
| raise NotImplementedError("Compact Storage") | ||
| self.data = None | ||
| layout = None | ||
| for msg in dataobject.msgs: | ||
| if msg["type"] == 8: | ||
| layout = msg | ||
| break | ||
| if layout is None: | ||
| raise ValueError("No layout message in compact dataset?") | ||
| byts = dataobject.msg_data[msg["offset_to_message"]:msg["offset_to_message"]+msg["size"]] | ||
| layout_version = byts[0] | ||
| if layout_version == 1 or layout_version == 2: | ||
| raise NotImplementedError("Compact layout v1 and v2.") | ||
| elif layout_version == 3 or layout_version == 4: | ||
| size = int.from_bytes(byts[2:4], "little") | ||
| self.data = byts[4:4+size] | ||
| case 1: # contiguous storage | ||
| self.data_offset, = struct.unpack_from('<Q', dataobject.msg_data, self.property_offset) | ||
| case 2: # chunked storage | ||
|
|
@@ -161,7 +175,18 @@ def get_data(self, args, fillvalue): | |
| # throws a flake8 wobbly for Python<3.10; match is Py3.10+ syntax | ||
| match self.layout_class: # noqa | ||
| case 0: #compact storage | ||
| raise NotImplementedError("Compact Storage") | ||
| if self.data is None: | ||
|
Collaborator
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. Similarly, this functionality would be better in a method. |
||
| if isinstance(dtype, tuple): | ||
| dtype = np.array(fillvalue).dtype | ||
| return np.full(self.shape, fillvalue, dtype=dtype)[args] | ||
| else: | ||
| view = np.frombuffer( | ||
| self.data, | ||
| dtype=self._dtype, | ||
| ).reshape(self.shape) | ||
| # Create the sub-array | ||
| result = view[args] | ||
| return result | ||
| case 1: # contiguous storage | ||
| if self.data_offset == UNDEFINED_ADDRESS: | ||
| # no storage is backing array, return an array of | ||
|
|
||
Binary file not shown.
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 |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import h5py | ||
| import numpy as np | ||
|
|
||
| f = h5py.File('compact.hdf5', 'w', libver='earliest') | ||
| data = np.array([1, 2, 3, 4], dtype=np.int32) | ||
| dtype = h5py.h5t.NATIVE_INT32 | ||
| space = h5py.h5s.create_simple(data.shape) | ||
| dcpl = h5py.h5p.create(h5py.h5p.DATASET_CREATE) | ||
| dcpl.set_layout(h5py.h5d.COMPACT) | ||
| dset_id = h5py.h5d.create(f.id, b"compact", dtype, space, dcpl=dcpl) | ||
| dset_id.write(h5py.h5s.ALL, h5py.h5s.ALL, data) | ||
|
|
||
| f.close() |
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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import os | ||
|
|
||
| import numpy as np | ||
| from numpy.testing import assert_array_equal | ||
|
|
||
| import pyfive | ||
|
|
||
| DIRNAME = os.path.dirname(__file__) | ||
| DATASET_CHUNKED_HDF5_FILE = os.path.join(DIRNAME, 'compact.hdf5') | ||
|
|
||
|
|
||
| def test_chunked_dataset(): | ||
|
|
||
| with pyfive.File(DATASET_CHUNKED_HDF5_FILE) as hfile: | ||
| data = np.array([1, 2, 3, 4], dtype=np.int32) | ||
|
|
||
| # check data | ||
| dset1 = hfile['compact'] | ||
| assert_array_equal(dset1[...], data) |
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.
I think it would be more consistent with the rest of the code if we pushed the compact handling into a method called from here.