Skip to content

Remove dummy dataset writing from RecordComponent::flush() #528

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
ax3l merged 2 commits into from
Jul 1, 2019
Merged

Remove dummy dataset writing from RecordComponent::flush() #528

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
c229e18
Remove dummy dataset writing from RecordComponent::flush()
franzpoeschel Jun 17, 2019
2f67a6c
Remove fileBased_write_empty test
franzpoeschel Jun 27, 2019
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
15 changes: 0 additions & 15 deletions src/RecordComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,21 +137,6 @@ RecordComponent::flush(std::string const& name)
dCreate.compression = m_dataset->compression;
dCreate.transform = m_dataset->transform;
IOHandler->enqueue(IOTask(this, dCreate));
if( m_chunks->empty() )
{
/* Ensure at least one WRITE_DATASET per dataset occurs
* ADIOS1 backend only creates a dataset after at least once cell has been written */
Parameter< Operation::WRITE_DATASET > dWrite;
auto uptr = auxiliary::allocatePtr(dCreate.dtype, 1);
std::shared_ptr< void > data{std::move(uptr)};
dWrite.data = data;
dWrite.dtype = dCreate.dtype;
if( dWrite.dtype == Datatype::UNDEFINED )
throw std::runtime_error("Dataset has not been defined for Record Component " + name);
dWrite.extent = Extent(getDimensionality(), 1);
dWrite.offset = Offset(getDimensionality(), 0);
m_chunks->push(IOTask(this, dWrite));
}
}
}

Expand Down
185 changes: 1 addition & 184 deletions test/SerialIOTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,128 +645,6 @@ TEST_CASE( "write_test", "[serial]" )
}
}

inline
void fileBased_write_empty_test(const std::string & backend)
{
if( auxiliary::directory_exists("../samples/subdir") )
auxiliary::remove_directory("../samples/subdir");

Dataset dset = Dataset(Datatype::DOUBLE, {2});
{
Series o = Series("../samples/subdir/serial_fileBased_write%T." + backend, AccessType::CREATE);

ParticleSpecies& e_1 = o.iterations[1].particles["e"];
e_1["position"][RecordComponent::SCALAR].resetDataset(dset);
e_1["positionOffset"][RecordComponent::SCALAR].resetDataset(dset);
o.iterations[1].setTime(1.f);
ParticleSpecies& e_2 = o.iterations[2].particles["e"];
e_2["position"][RecordComponent::SCALAR].resetDataset(dset);
e_2["positionOffset"][RecordComponent::SCALAR].resetDataset(dset);
o.iterations[2].setTime(2.f);
ParticleSpecies& e_3 = o.iterations[3].particles["e"];
e_3["position"][RecordComponent::SCALAR].resetDataset(dset);
e_3["positionOffset"][RecordComponent::SCALAR].resetDataset(dset);
o.iterations[3].setTime(3.f);
}

REQUIRE(auxiliary::directory_exists("../samples/subdir"));
REQUIRE(auxiliary::file_exists("../samples/subdir/serial_fileBased_write1." + backend));
REQUIRE(auxiliary::file_exists("../samples/subdir/serial_fileBased_write2." + backend));
REQUIRE(auxiliary::file_exists("../samples/subdir/serial_fileBased_write3." + backend));

{
Series o = Series("../samples/subdir/serial_fileBased_write%T." + backend, AccessType::READ_ONLY);

REQUIRE(o.iterations.size() == 3);
REQUIRE(o.iterations.count(1) == 1);
REQUIRE(o.iterations.count(2) == 1);
REQUIRE(o.iterations.count(3) == 1);

REQUIRE(o.iterations[1].time< float >() == 1.f);
REQUIRE(o.iterations[2].time< float >() == 2.f);
REQUIRE(o.iterations[3].time< float >() == 3.f);

REQUIRE(o.iterations[1].particles.size() == 1);
REQUIRE(o.iterations[1].particles.count("e") == 1);
REQUIRE(o.iterations[2].particles.size() == 1);
REQUIRE(o.iterations[2].particles.count("e") == 1);
REQUIRE(o.iterations[3].particles.size() == 1);
REQUIRE(o.iterations[3].particles.count("e") == 1);

REQUIRE(o.iterations[1].particles["e"].size() == 2);
REQUIRE(o.iterations[1].particles["e"].count("position") == 1);
REQUIRE(o.iterations[1].particles["e"].count("positionOffset") == 1);
REQUIRE(o.iterations[2].particles["e"].size() == 2);
REQUIRE(o.iterations[2].particles["e"].count("position") == 1);
REQUIRE(o.iterations[2].particles["e"].count("positionOffset") == 1);
REQUIRE(o.iterations[3].particles["e"].size() == 2);
REQUIRE(o.iterations[3].particles["e"].count("position") == 1);
REQUIRE(o.iterations[3].particles["e"].count("positionOffset") == 1);

REQUIRE(o.iterations[1].particles["e"]["position"].size() == 1);
REQUIRE(o.iterations[1].particles["e"]["position"].count(RecordComponent::SCALAR) == 1);
REQUIRE(o.iterations[1].particles["e"]["positionOffset"].size() == 1);
REQUIRE(o.iterations[1].particles["e"]["positionOffset"].count(RecordComponent::SCALAR) == 1);
REQUIRE(o.iterations[1].particles["e"]["position"][RecordComponent::SCALAR].getDatatype() == Datatype::DOUBLE);
REQUIRE(o.iterations[1].particles["e"]["position"][RecordComponent::SCALAR].getDimensionality() == 1);
REQUIRE(o.iterations[1].particles["e"]["position"][RecordComponent::SCALAR].getExtent() == Extent{2});
REQUIRE(o.iterations[2].particles["e"]["position"].size() == 1);
REQUIRE(o.iterations[2].particles["e"]["position"].count(RecordComponent::SCALAR) == 1);
REQUIRE(o.iterations[2].particles["e"]["positionOffset"].size() == 1);
REQUIRE(o.iterations[2].particles["e"]["positionOffset"].count(RecordComponent::SCALAR) == 1);
REQUIRE(o.iterations[2].particles["e"]["position"][RecordComponent::SCALAR].getDatatype() == Datatype::DOUBLE);
REQUIRE(o.iterations[2].particles["e"]["position"][RecordComponent::SCALAR].getDimensionality() == 1);
REQUIRE(o.iterations[2].particles["e"]["position"][RecordComponent::SCALAR].getExtent() == Extent{2});
REQUIRE(o.iterations[3].particles["e"]["position"].size() == 1);
REQUIRE(o.iterations[3].particles["e"]["position"].count(RecordComponent::SCALAR) == 1);
REQUIRE(o.iterations[3].particles["e"]["positionOffset"].size() == 1);
REQUIRE(o.iterations[3].particles["e"]["positionOffset"].count(RecordComponent::SCALAR) == 1);
REQUIRE(o.iterations[3].particles["e"]["position"][RecordComponent::SCALAR].getDatatype() == Datatype::DOUBLE);
REQUIRE(o.iterations[3].particles["e"]["position"][RecordComponent::SCALAR].getDimensionality() == 1);
REQUIRE(o.iterations[3].particles["e"]["position"][RecordComponent::SCALAR].getExtent() == Extent{2});
}

{
Series o = Series("../samples/subdir/serial_fileBased_write%T." + backend, AccessType::READ_WRITE);
ParticleSpecies& e_4 = o.iterations[4].particles["e"];
e_4["position"][RecordComponent::SCALAR].resetDataset(dset);
e_4["positionOffset"][RecordComponent::SCALAR].resetDataset(dset);
o.iterations[4].setTime(4.f);
}

{
Series o = Series("../samples/subdir/serial_fileBased_write%T." + backend, AccessType::READ_ONLY);

REQUIRE(o.iterations.size() == 4);
REQUIRE(o.iterations.count(4) == 1);

REQUIRE(o.iterations[4].time< float >() == 4.f);

REQUIRE(o.iterations[4].particles.size() == 1);
REQUIRE(o.iterations[4].particles.count("e") == 1);

REQUIRE(o.iterations[4].particles["e"].size() == 2);
REQUIRE(o.iterations[4].particles["e"].count("position") == 1);
REQUIRE(o.iterations[4].particles["e"].count("positionOffset") == 1);

REQUIRE(o.iterations[4].particles["e"]["position"].size() == 1);
REQUIRE(o.iterations[4].particles["e"]["position"].count(RecordComponent::SCALAR) == 1);
REQUIRE(o.iterations[4].particles["e"]["positionOffset"].size() == 1);
REQUIRE(o.iterations[4].particles["e"]["positionOffset"].count(RecordComponent::SCALAR) == 1);
REQUIRE(o.iterations[4].particles["e"]["position"][RecordComponent::SCALAR].getDatatype() == Datatype::DOUBLE);
REQUIRE(o.iterations[4].particles["e"]["position"][RecordComponent::SCALAR].getDimensionality() == 1);
REQUIRE(o.iterations[4].particles["e"]["position"][RecordComponent::SCALAR].getExtent() == Extent{2});
}
}

TEST_CASE( "fileBased_write_empty_test", "[serial]" )
{
for (auto const & t: backends)
{
fileBased_write_empty_test(std::get<0>(t));
}
}

inline
void fileBased_write_test(const std::string & backend)
{
Expand Down Expand Up @@ -1995,26 +1873,6 @@ TEST_CASE( "hzdr_hdf5_sample_content_test", "[serial][hdf5]" )
}
}

TEST_CASE( "hdf5_dtype_test", "[serial][hdf5]" )
{
dtype_test("h5");
}

TEST_CASE( "hdf5_write_test", "[serial][hdf5]" )
{
write_test("h5");
}

TEST_CASE( "hdf5_fileBased_write_empty_test", "[serial][hdf5]" )
{
fileBased_write_empty_test("h5");
}

TEST_CASE( "hdf5_fileBased_write_test", "[serial][hdf5]" )
{
fileBased_write_test("h5");
}

TEST_CASE( "hdf5_bool_test", "[serial][hdf5]" )
{
bool_test("h5");
Expand All @@ -2029,47 +1887,13 @@ TEST_CASE( "hdf5_deletion_test", "[serial][hdf5]" )
{
deletion_test("h5");
}

TEST_CASE( "hdf5_110_optional_paths", "[serial][hdf5]" )
{
optional_paths_110_test("h5");
}

TEST_CASE( "hdf5_constant_scalar", "[serial][hdf5]" )
{
constant_scalar("h5");
}

TEST_CASE( "hdf5_particle_patches", "[serial][hdf5]" )
{
particle_patches("h5");
}
#else
TEST_CASE( "no_serial_hdf5", "[serial][hdf5]" )
{
REQUIRE(true);
}
#endif
#if openPMD_HAVE_ADIOS1
TEST_CASE( "adios1_dtype_test", "[serial][adios1]" )
{
dtype_test(".bp");
}

TEST_CASE( "adios1_write_test", "[serial][adios1]")
{
write_test("bp");
}

TEST_CASE( "adios1_fileBased_write_empty_test", "[serial][adios1]" )
{
fileBased_write_empty_test("bp");
}

TEST_CASE( "adios1_fileBased_write_test", "[serial][adios1]" )
{
fileBased_write_test("bp");
}

TEST_CASE( "hzdr_adios1_sample_content_test", "[serial][adios1]" )
{
Expand Down Expand Up @@ -2231,14 +2055,7 @@ TEST_CASE( "hzdr_adios1_sample_content_test", "[serial][adios1]" )
return;
}
}
TEST_CASE( "adios1_constant_scalar", "[serial][adios1]" )
{
constant_scalar("bp");
}
TEST_CASE( "adios1_particle_patches", "[serial][adios1]" )
{
particle_patches("bp");
}

#else
TEST_CASE( "no_serial_adios1", "[serial][adios]")
{
Expand Down