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

H5Easy support for complex integral type #828

Merged
merged 6 commits into from
Oct 19, 2023
+28 −2
Merged

H5Easy support for complex integral type #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e16224
H5Easy support for complex integral type
unbtorsten Oct 17, 2023
70bf2e8
add unit tests for scalar as well as vector complex arithmetic types:…
unbtorsten Oct 18, 2023
e235bec
clang reformatting
unbtorsten Oct 18, 2023
bf76dbb
Merge branch 'master' into complex-integral-type
unbtorsten Oct 18, 2023
a002d59
add brackets in an attempt to please MSVC
unbtorsten Oct 18, 2023
cadb79b
rewrite expression in another attempt to help MSVC understand
unbtorsten Oct 18, 2023
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
4 changes: 2 additions & 2 deletions include/highfive/bits/H5DataType_misc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,8 @@ class AtomicType<std::complex<T>>: public DataType {
: DataType(
CompoundType({{"r", create_datatype<T>(), 0}, {"i", create_datatype<T>(), sizeof(T)}},
sizeof(std::complex<T>))) {
static_assert(std::is_floating_point<T>::value,
"std::complex accepts only floating point numbers.");
static_assert(std::is_arithmetic<T>::value,
"std::complex accepts only floating point and integral numbers.");
}
};

Expand Down
26 changes: 26 additions & 0 deletions tests/unit/tests_high_five_easy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,31 +61,57 @@ TEST_CASE("H5Easy_scalar") {
double a = 1.2345;
int b = 12345;
std::string c = "12345";
std::complex<double> d = std::complex<double>(1.2345, -5.4321);
std::complex<int32_t> e = std::complex<int32_t>(12345, -54321);

H5Easy::dump(file, "/path/to/a", a);
H5Easy::dump(file, "/path/to/b", b);
H5Easy::dump(file, "/path/to/c", c);
H5Easy::dump(file, "/path/to/c", c, H5Easy::DumpMode::Overwrite);
H5Easy::dump(file, "/path/to/d", d);
H5Easy::dump(file, "/path/to/e", e);

double a_r = H5Easy::load<double>(file, "/path/to/a");
int b_r = H5Easy::load<int>(file, "/path/to/b");
std::string c_r = H5Easy::load<std::string>(file, "/path/to/c");
std::complex<double> d_r = H5Easy::load<std::complex<double>>(file, "/path/to/d");
std::complex<int32_t> e_r = H5Easy::load<std::complex<int32_t>>(file, "/path/to/e");

CHECK(a == a_r);
CHECK(b == b_r);
CHECK(c == c_r);
CHECK(d == d_r);
CHECK(e == e_r);
}

TEST_CASE("H5Easy_vector1d") {
H5Easy::File file("h5easy_vector1d.h5", H5Easy::File::Overwrite);

std::vector<size_t> a = {1, 2, 3, 4, 5};
std::vector<std::complex<double>> b = {std::complex<double>(1, .1),
std::complex<double>(2, -.4),
std::complex<double>(3, .9),
std::complex<double>(4, -.16),
std::complex<double>(5, .25)};
std::vector<std::complex<int32_t>> c = {std::complex<int32_t>(1, -5),
std::complex<int32_t>(2, -4),
std::complex<int32_t>(3, -3),
std::complex<int32_t>(4, -2),
std::complex<int32_t>(5, -1)};

H5Easy::dump(file, "/path/to/a", a);
H5Easy::dump(file, "/path/to/b", b);
H5Easy::dump(file, "/path/to/c", c);

std::vector<size_t> a_r = H5Easy::load<std::vector<size_t>>(file, "/path/to/a");
std::vector<std::complex<double>> b_r =
H5Easy::load<std::vector<std::complex<double>>>(file, "/path/to/b");
std::vector<std::complex<int32_t>> c_r =
H5Easy::load<std::vector<std::complex<int32_t>>>(file, "/path/to/c");

CHECK(a == a_r);
CHECK(b == b_r);
CHECK(c == c_r);
}

TEST_CASE("H5Easy_vector2d") {
Expand Down
Loading