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

refined mpi handshake in preparation for adding mpi join for ssc #2408

Merged
merged 3 commits into from
Aug 4, 2020
Merged

refined mpi handshake in preparation for adding mpi join for ssc #2408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1eed67d
refined mpi handshake in preparation for adding mpi join for ssc
JasonRuonanWang Aug 4, 2020
905358a
fixing windows warnings
JasonRuonanWang Aug 4, 2020
c058098
disable windows for mpi handshake because MPI_Comm_create_group does …
JasonRuonanWang Aug 4, 2020
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
17 changes: 6 additions & 11 deletions source/adios2/engine/ssc/SscReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,19 +240,14 @@ void SscReader::SyncMpiPattern()
{
TAU_SCOPED_TIMER_FUNC();

auto appRankMaps =
helper::Handshake(m_Name, 'r', m_OpenTimeoutSecs, CommAsMPI(m_Comm));

MPI_Group worldGroup;
MPI_Group streamGroup;
MPI_Group readerGroup;
MPI_Comm writerComm;
MPI_Comm readerComm;

MPI_Comm_group(MPI_COMM_WORLD, &worldGroup);
MPI_Group_incl(worldGroup, appRankMaps[1].size(), appRankMaps[1].data(),
&m_MpiAllWritersGroup);
MPI_Group_incl(worldGroup, appRankMaps[0].size(), appRankMaps[0].data(),
&streamGroup);

MPI_Comm_create_group(MPI_COMM_WORLD, streamGroup, 0, &m_StreamComm);
helper::HandshakeComm(m_Name, 'r', m_OpenTimeoutSecs, CommAsMPI(m_Comm),
streamGroup, m_MpiAllWritersGroup, readerGroup,
m_StreamComm, writerComm, readerComm);
}

bool SscReader::SyncWritePattern()
Expand Down
17 changes: 6 additions & 11 deletions source/adios2/engine/ssc/SscWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,19 +186,14 @@ void SscWriter::SyncMpiPattern()
{
TAU_SCOPED_TIMER_FUNC();

auto appRankMaps =
helper::Handshake(m_Name, 'w', m_OpenTimeoutSecs, CommAsMPI(m_Comm));

MPI_Group worldGroup;
MPI_Group streamGroup;
MPI_Group writerGroup;
MPI_Comm writerComm;
MPI_Comm readerComm;

MPI_Comm_group(MPI_COMM_WORLD, &worldGroup);
MPI_Group_incl(worldGroup, appRankMaps[2].size(), appRankMaps[2].data(),
&m_MpiAllReadersGroup);
MPI_Group_incl(worldGroup, appRankMaps[0].size(), appRankMaps[0].data(),
&streamGroup);

MPI_Comm_create_group(MPI_COMM_WORLD, streamGroup, 0, &m_StreamComm);
helper::HandshakeComm(m_Name, 'w', m_OpenTimeoutSecs, CommAsMPI(m_Comm),
streamGroup, writerGroup, m_MpiAllReadersGroup,
m_StreamComm, writerComm, readerComm);
}

void SscWriter::SyncWritePattern(bool finalStep)
Expand Down
30 changes: 26 additions & 4 deletions source/adios2/helper/adiosMpiHandshake.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,32 @@ namespace adios2
namespace helper
{

const std::vector<std::vector<int>> Handshake(const std::string &filename,
const char mode,
const int timeoutSeconds,
MPI_Comm localComm)
#ifndef _WIN32
void HandshakeComm(const std::string &filename, const char mode,
const int timeoutSeconds, MPI_Comm localComm,
MPI_Group &streamGroup, MPI_Group &writerGroup,
MPI_Group &readerGroup, MPI_Comm &streamComm,
MPI_Comm &writerComm, MPI_Comm &readerComm)
{
auto appRankMaps = HandshakeRank(filename, mode, timeoutSeconds, localComm);
MPI_Group worldGroup;
MPI_Comm_group(MPI_COMM_WORLD, &worldGroup);
MPI_Group_incl(worldGroup, static_cast<int>(appRankMaps[0].size()),
appRankMaps[0].data(), &streamGroup);
MPI_Group_incl(worldGroup, static_cast<int>(appRankMaps[1].size()),
appRankMaps[1].data(), &writerGroup);
MPI_Group_incl(worldGroup, static_cast<int>(appRankMaps[2].size()),
appRankMaps[2].data(), &readerGroup);
MPI_Comm_create_group(MPI_COMM_WORLD, streamGroup, 0, &streamComm);
MPI_Comm_create_group(MPI_COMM_WORLD, writerGroup, 0, &writerComm);
MPI_Comm_create_group(MPI_COMM_WORLD, readerGroup, 0, &readerComm);
}
#endif

const std::vector<std::vector<int>> HandshakeRank(const std::string &filename,
const char mode,
const int timeoutSeconds,
MPI_Comm localComm)
{
std::vector<std::vector<int>> ret(3);

Expand Down
16 changes: 12 additions & 4 deletions source/adios2/helper/adiosMpiHandshake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,18 @@ namespace helper
* for stream *filename*. [1] is the vector of all writer ranks for stream
* *filename*. [2] is the vector of all reader ranks for stream *filename*.
*/
const std::vector<std::vector<int>> Handshake(const std::string &filename,
const char mode,
const int timeoutSeconds,
MPI_Comm localComm);
const std::vector<std::vector<int>> HandshakeRank(const std::string &filename,
const char mode,
const int timeoutSeconds,
MPI_Comm localComm);

#ifndef _WIN32
void HandshakeComm(const std::string &filename, const char mode,
const int timeoutSeconds, MPI_Comm localComm,
MPI_Group &streamGroup, MPI_Group &writerGroup,
MPI_Group &readerGroup, MPI_Comm &streamComm,
MPI_Comm &writerComm, MPI_Comm &readerComm);
#endif

} // end namespace helper
} // end namespace adios2
Expand Down