Skip to content

Commit 38d3852

Browse files
committed
Revert "wip: debugging state"
This reverts commit 2df195749b53b0a54832585899bd469d35f81d6d.
1 parent 1e8a6b7 commit 38d3852

File tree

4 files changed

+12
-18
lines changed

4 files changed

+12
-18
lines changed

src/RecordComponent.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,15 @@ namespace
238238
RecordComponent &RecordComponent::resetDataset(Dataset d)
239239
{
240240
auto &rc = get();
241-
// auto cleanup = defer([&rc, this]() {
242-
// if (rc.m_dataset.has_value() &&
243-
// rc.m_dataset->dtype != Datatype::UNDEFINED &&
244-
// IOHandler()->m_seriesStatus != internal::SeriesStatus::Parsing)
245-
// {
246-
// seriesFlush_impl</* flush_entire_series = */ false>(
247-
// {FlushLevel::SkeletonOnly}, /* flush_io_handler = */ true);
248-
// }
249-
// });
241+
auto cleanup = defer([&rc, this]() {
242+
if (rc.m_dataset.has_value() &&
243+
rc.m_dataset->dtype != Datatype::UNDEFINED &&
244+
IOHandler()->m_seriesStatus != internal::SeriesStatus::Parsing)
245+
{
246+
seriesFlush_impl</* flush_entire_series = */ false>(
247+
{FlushLevel::SkeletonOnly}, /* flush_io_handler = */ true);
248+
}
249+
});
250250
if (written())
251251
{
252252
if (!rc.m_dataset.has_value())

src/auxiliary/Mpi.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ std::vector<std::string> distributeStringsToAllRanks(
9494
int *sizesBuffer = new int[size];
9595
int *displs = new int[size];
9696

97-
MPI_Barrier(communicator);
98-
9997
MPI_Allgather(
10098
&sendLength, 1, MPI_INT, sizesBuffer, 1, MPI_INT, communicator);
10199

test/CatchRunner.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ int main(int argc, char *argv[])
2929

3030
Catch::Session session;
3131
// session.configData().runOrder = Catch::TestRunOrder::Declared;
32-
session.configData().rngSeed = 3036063643;
33-
// MPI_Bcast(
34-
// &session.configData().rngSeed, 1, MPI_UINT32_T, 0, MPI_COMM_WORLD);
32+
MPI_Bcast(
33+
&session.configData().rngSeed, 1, MPI_UINT32_T, 0, MPI_COMM_WORLD);
3534
int result = session.applyCommandLine(argc, argv);
3635
if (result == 0)
3736
{

test/ParallelIOTest.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2559,13 +2559,10 @@ void run_test()
25592559
E_x.storeChunk(data, {unsigned(mpi_rank * 2), 0}, {1, 10});
25602560
E_x.storeChunk(data, {unsigned(mpi_rank * 2 + 1), 0}, {1, 10});
25612561
series.flush();
2562-
series.close();
25632562
}
2564-
MPI_Barrier(MPI_COMM_WORLD);
25652563

25662564
{
2567-
Series series(
2568-
filename, openPMD::Access::READ_ONLY /* , MPI_COMM_WORLD */);
2565+
Series series(filename, openPMD::Access::READ_ONLY, MPI_COMM_WORLD);
25692566
/*
25702567
* Inquire the writing application's "MPI rank -> hostname" mapping.
25712568
* The reading application needs to know about its own mapping.

0 commit comments

Comments
 (0)