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

Jump to bottom

Bp4 doclose fix #1567

Closed
wants to merge 13 commits into from
Closed

Bp4 doclose fix #1567

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ffac0fe
Merge pull request #1557 from KyleFromKitware/fix-install-tests
Jun 27, 2019
7ad61fa
Merge pull request #1560 from pnorbert/default-engine-bpfile
Jun 28, 2019
71f7f3f
Merge branch 'release'
Jun 28, 2019
c8ffa4c
Merge pull request #1551 from eisenhauer/StagingCommonTests
Jun 28, 2019
3d90cf2
Merge branch 'release'
Jun 28, 2019
b94ab5a
Merge pull request #1559 from eisenhauer/SstQueueDocs
Jun 28, 2019
a94b67d
Merge branch 'release'
Jun 28, 2019
a9d1c20
Merge pull request #1562 from pnorbert/bp4dbg-array-attr
Jun 28, 2019
7418694
Merge branch 'release'
Jun 28, 2019
1af346c
Merge branch 'release'
Jun 28, 2019
6905e95
fix the bug in doclose function for BP4 engine
lwan86 Jun 28, 2019
9699e6c
clang format
lwan86 Jun 28, 2019
b16b9b1
fix a potential problem in WriteCollectiveMetadataFile() function
lwan86 Jun 28, 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
26 changes: 14 additions & 12 deletions source/adios2/engine/bp4/BP4Writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,13 +331,13 @@ void BP4Writer::DoClose(const int transportIndex)
{
PerformPuts();

DoFlush(false, transportIndex);
// DoFlush(false, transportIndex);

if (m_BP4Serializer.m_CollectiveMetadata &&
m_FileDataManager.AllTransportsClosed())
{
WriteCollectiveMetadataFile(false);
}
// if (m_BP4Serializer.m_CollectiveMetadata &&
// m_FileDataManager.AllTransportsClosed())
// {
// WriteCollectiveMetadataFile(false);
// }
}

DoFlush(true, transportIndex);
Expand Down Expand Up @@ -485,12 +485,14 @@ void BP4Writer::WriteCollectiveMetadataFile(const bool isFinal)
{

TAU_SCOPED_TIMER("BP4Writer::WriteCollectiveMetadataFile");
if (m_BP4Serializer.m_RankMPI == 0)

if (isFinal && m_BP4Serializer.m_MetadataSet.DataPGCount == 0)
{
if (isFinal && m_BP4Serializer.m_MetadataSet.metadataFileLength > 0)
// If data pg count is zero, it means all metadata
// has already been written, don't need to write it again.

if (m_BP4Serializer.m_RankMPI == 0)
{
// If run with BeginStep() and EndStep(), when close, metadata of
// last step has already been written, don't need to write it again.
// But the flag in the header of metadata index table needs to be
// modified to indicate current run is over.
BufferSTL metadataIndex;
Expand All @@ -505,8 +507,8 @@ void BP4Writer::WriteCollectiveMetadataFile(const bool isFinal)
m_FileMetadataIndexManager.WriteFileAt(
metadataIndex.m_Buffer.data(), metadataIndex.m_Position, 56, 0);
m_FileMetadataIndexManager.FlushFiles();
return;
}
return;
}
m_BP4Serializer.AggregateCollectiveMetadata(
m_MPIComm, m_BP4Serializer.m_Metadata, true);
Expand Down Expand Up @@ -543,7 +545,7 @@ void BP4Writer::WriteCollectiveMetadataFile(const bool isFinal)
metadataIndex.m_Position = 0;

uint64_t currentStep;
if (isFinal && m_BP4Serializer.m_MetadataSet.metadataFileLength == 0)
if (isFinal && m_BP4Serializer.m_MetadataSet.DataPGCount > 0)
{
// Not run with BeginStep() and EndStep().
// Only one step of metadata is generated at close.
Expand Down