Skip to content

Array adapter unit test with potential fix #600

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
SkyToGround merged 2 commits into from
May 23, 2022
Merged

Array adapter unit test with potential fix #600

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
2f4d64e
array adapter unit test with potential fix.
SkyToGround May 19, 2022
dc0a075
fix conan github tests
jkotan May 23, 2022
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
8 changes: 2 additions & 6 deletions .github/workflows/cmake-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ jobs:
strategy:
matrix:
shared: ["shared", "static"]
boost: [
# "boost",
"stdfs"]
boost: ["boost", "stdfs"]
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -141,9 +139,7 @@ jobs:
strategy:
matrix:
shared: ["shared", "static"]
boost: [
# "boost",
"stdfs"]
boost: ["boost", "stdfs"]
mpi: ["serial", "mpi"]
runs-on: macos-10.15
steps:
Expand Down
5 changes: 1 addition & 4 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ def build_requirements(self):
def config_options(self):
if self.settings.os == "Windows":
del self.options.with_mpi
del self.options.with_boost
if self.settings.os == "Macos":
del self.options.with_boost

def configure(self):
if self.options.get_safe("with_mpi", False):
Expand All @@ -42,7 +39,7 @@ def requirements(self):
elif self.settings.os == "Macos":
self.requires("boost/1.77.0")
else:
self.requires("boost/1.77.0@#35c2c19753eaadacfb846c7198919da7")
self.requires("boost/1.77.0")
if self.options.get_safe("with_mpi", False):
self.requires("openmpi/4.1.0")

Expand Down
6 changes: 2 additions & 4 deletions src/h5cpp/utilities/array_adapter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,8 @@ class TypeTrait<ArrayAdapter<T>>
return Simple(adapter_dimensions,adapter_dimensions);
}

const static DataspaceType & get(const ArrayAdapter<T> &adapter, dataspace::DataspacePool &) {
Dimensions adapter_dimensions = get_dimensions(adapter);
const static DataspaceType & cref_ = Simple(adapter_dimensions,adapter_dimensions);
return cref_;
const static DataspaceType & get(const ArrayAdapter<T> &adapter, dataspace::DataspacePool &pool) {
return pool.getSimple(get_dimensions(adapter));
}

static void* ptr(ArrayAdapter<T> &adapter)
Expand Down
9 changes: 9 additions & 0 deletions test/utilities/array_adapter_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,15 @@ SCENARIO("writing and reading data using an ArrayAdapter") {
}
}
}
THEN("we do multiple writes to the dataset") {
size_t b_size_2 = 3;
double w_buffer_2[] = {3.14, 1.2345, 5.4321};
auto another_dataset = node::Dataset(root, "data2", datatype::create<double>(), dataspace::Simple(Dimensions{b_size_2 + 1}));
auto write_adapter1 = ArrayAdapter<double>(w_buffer_2, 1);
auto write_adapter2 = ArrayAdapter<double>(w_buffer_2, b_size_2);
dataset.write(write_adapter1, hdf5::dataspace::Hyperslab{{0}, {1}});
dataset.write(write_adapter2, hdf5::dataspace::Hyperslab{{1}, {b_size_2}});
}
}
GIVEN("an attribute in the file") {
auto attribute = root.attributes.create("data", type, space);
Expand Down