Skip to content

Commit

Permalink
More migration to read_raw. (#945)
Browse files Browse the repository at this point in the history
  • Loading branch information
1uc authored Feb 8, 2024
1 parent cfe8557 commit 7ba4849
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions include/highfive/h5easy_bits/H5Easy_Eigen.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ struct io_impl<T, typename std::enable_if<std::is_base_of<Eigen::DenseBase<T>, T
DataSet dataset = file.getDataSet(path);
std::vector<typename T::Index> dims = shape(file, path, dataset, T::RowsAtCompileTime);
T data(dims[0], dims[1]);
dataset.read(data.data());
dataset.read_raw(data.data());
if (data.IsVectorAtCompileTime || data.IsRowMajor) {
return data;
}
Expand Down Expand Up @@ -130,7 +130,7 @@ struct io_impl<T, typename std::enable_if<std::is_base_of<Eigen::DenseBase<T>, T
DataSpace dataspace = attribute.getSpace();
std::vector<typename T::Index> dims = shape(file, path, dataspace, T::RowsAtCompileTime);
T data(dims[0], dims[1]);
attribute.read(data.data());
attribute.read_raw(data.data());
if (data.IsVectorAtCompileTime || data.IsRowMajor) {
return data;
}
Expand Down
4 changes: 2 additions & 2 deletions include/highfive/h5easy_bits/H5Easy_opencv.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct io_impl<T, typename std::enable_if<is_opencv<T>::value>::type> {
DataSet dataset = file.getDataSet(path);
std::vector<int> dims = shape(file, path, dataset.getDimensions());
T data(dims[0], dims[1]);
dataset.read(reinterpret_cast<value_type*>(data.data));
dataset.read_raw(reinterpret_cast<value_type*>(data.data));
return data;
}

Expand Down Expand Up @@ -89,7 +89,7 @@ struct io_impl<T, typename std::enable_if<is_opencv<T>::value>::type> {
DataSpace dataspace = attribute.getSpace();
std::vector<int> dims = shape(file, path, dataspace.getDimensions());
T data(dims[0], dims[1]);
attribute.read(reinterpret_cast<value_type*>(data.data));
attribute.read_raw(reinterpret_cast<value_type*>(data.data));
return data;
}
};
Expand Down
4 changes: 2 additions & 2 deletions include/highfive/h5easy_bits/H5Easy_xtensor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct io_impl<T, typename std::enable_if<xt::is_xexpression<T>::value>::type> {
DataSet dataset = file.getDataSet(path);
std::vector<size_t> dims = dataset.getDimensions();
T data = T::from_shape(dims);
dataset.read(data.data());
dataset.read_raw(data.data());
return data;
}

Expand Down Expand Up @@ -73,7 +73,7 @@ struct io_impl<T, typename std::enable_if<xt::is_xexpression<T>::value>::type> {
DataSpace dataspace = attribute.getSpace();
std::vector<size_t> dims = dataspace.getDimensions();
T data = T::from_shape(dims);
attribute.read(data.data());
attribute.read_raw(data.data());
return data;
}
};
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/tests_high_five_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2433,7 +2433,7 @@ TEST_CASE("HighFiveFixedString") {
#if HIGHFIVE_CXX_STD >= 17
{
auto expected = std::string(value.size(), '-');
ds.read(expected.data(), datatype);
ds.read_raw(expected.data(), datatype);

REQUIRE(expected == value);
}
Expand Down

0 comments on commit 7ba4849

Please sign in to comment.