Skip to content

Issue 510: improve checks in Dataset.write/Dataset.read for 1D objects #511

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

Merged
eugenwintersberger merged 1 commit into from
Oct 23, 2021
+25 −17
Merged

Issue 510: improve checks in Dataset.write/Dataset.read for 1D objects #511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 25 additions & 17 deletions src/h5cpp/node/dataset.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,13 +867,17 @@ void Dataset::read(T &data,const dataspace::Selection &selection,
try{
const dataspace::Hyperslab & hyper = dynamic_cast<const dataspace::Hyperslab &>(selection);
auto dims = hyper.block();
auto count = hyper.count();
for(Dimensions::size_type i = 0; i != dims.size(); i++)
dims[i] *= count[i];

dataspace::Simple selected_space(dims);
if (selected_space.size() == memory_space.size())
read(data,memory_type,selected_space,file_space,dtpl);
if(dims.size() > 1) {
auto count = hyper.count();
for(Dimensions::size_type i = 0; i != dims.size(); i++)
dims[i] *= count[i];

dataspace::Simple selected_space(dims);
if (selected_space.size() == memory_space.size())
read(data,memory_type,selected_space,file_space,dtpl);
else
read(data,memory_type,memory_space,file_space,dtpl);
}
else
read(data,memory_type,memory_space,file_space,dtpl);
}
Expand Down Expand Up @@ -921,17 +925,21 @@ void Dataset::write(const T &data,const dataspace::Selection &selection,
try{

const dataspace::Hyperslab & hyper = dynamic_cast<const dataspace::Hyperslab &>(selection);
const dataspace::Simple & mem_space = dataspace::Simple(memory_space);

auto dims = hyper.block();
auto count = hyper.count();
for(Dimensions::size_type i = 0; i != dims.size(); i++)
dims[i] *= count[i];
dataspace::Simple selected_space(dims);
if(selected_space.rank() > 1 &&
mem_space.rank() == 1 &&
selected_space.size() == memory_space.size())
write(data,memory_type,selected_space,file_space,dtpl);
if(dims.size() > 1) {
const dataspace::Simple & mem_space = dataspace::Simple(memory_space);

auto count = hyper.count();
for(Dimensions::size_type i = 0; i != dims.size(); i++)
dims[i] *= count[i];
dataspace::Simple selected_space(dims);
if(selected_space.rank() > 1 &&
mem_space.rank() == 1 &&
selected_space.size() == memory_space.size())
write(data,memory_type,selected_space,file_space,dtpl);
else
write(data,memory_type,memory_space,file_space,dtpl);
}
else
write(data,memory_type,memory_space,file_space,dtpl);

Expand Down