Skip to content
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.

Sign up for GitHub

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

report layout chunk prop, not cpl if both present #180

Merged
merged 2 commits into from
Mar 29, 2024
Merged

report layout chunk prop, not cpl if both present #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9160dd9
report layout chunk prop, not cpl if both present
jreadey Mar 28, 2024
1da9e7f
fix flake8 errors
jreadey Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions h5pyd/_hl/objectid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,14 @@ def rank(self):
@property
def layout(self):
layout = None
dcpl = self.dcpl_json
if dcpl and 'layout' in dcpl:
layout = dcpl['layout']
elif 'layout' in self.obj_json:

if 'layout' in self.obj_json:
layout = self.obj_json['layout']
else:
dcpl = self.dcpl_json
if dcpl and 'layout' in dcpl:
layout = dcpl['layout']

return layout

@property
Expand Down
4 changes: 3 additions & 1 deletion test/apps/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ def get_test_filenames():
"scale_offset.h5",
"fletcher32.h5",
"undecodable_attr.h5",
"diamond.h5"
"diamond.h5",
"small1dchunk.h5",
"small2dchunk.h5"
)


Expand Down
Loading