Merge pull request #1762 from eisenhauer/Peer

Restore Peer Testing
ornladios · Sep 18, 2019 · 13b0e5a · 13b0e5a
2 parents 7bd8b1f + 6342d47
commit 13b0e5a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/source/adios2/toolkit/sst/cp/cp_reader.c b/source/adios2/toolkit/sst/cp/cp_reader.c
@@ -1330,8 +1330,8 @@ static SstStatusValue SstAdvanceStepPeer(SstStream Stream, SstStepMode mode,
         my_info.LatestTimestep = MaxQueuedMetadata(Stream);
         my_info.timeout_sec = timeout_sec;
         my_info.mode = mode;
-        SMPI_Gather(&my_info, sizeof(my_info), MPI_BYTE, global_info,
-                    sizeof(my_info), MPI_BYTE, 0, Stream->mpiComm);
+        SMPI_Gather(&my_info, sizeof(my_info), MPI_CHAR, global_info,
+                    sizeof(my_info), MPI_CHAR, 0, Stream->mpiComm);
         if (Stream->Rank == 0)
         {
             long Biggest = -1;

diff --git a/source/adios2/toolkit/sst/cp/cp_writer.c b/source/adios2/toolkit/sst/cp/cp_writer.c
@@ -1935,6 +1935,8 @@ extern void SstInternalProvideTimestep(
         ReturnData = CP_distributeDataFromRankZero(
             Stream, NULL, Stream->CPInfo->ReturnMetadataInfoFormat,
             &data_block2);
+        Stream->PreviousFormats = AddUniqueFormats(
+            Stream->PreviousFormats, ReturnData->Msg.Formats, /*copy*/ 1);
     }
     free(data_block1);
     PendingReaderCount = ReturnData->PendingReaderCount;

diff --git a/testing/adios2/engine/staging-common/CMakeLists.txt b/testing/adios2/engine/staging-common/CMakeLists.txt
@@ -179,7 +179,7 @@ endif()
 
 #  For the moment, only test the default comm pattern (Peer)
 MutateTestSet( COMM_MIN_SST_TESTS "CommMin" writer "CPCommPattern=Min" "${BASIC_SST_TESTS}" )
-MutateTestSet( COMM_PEER_SST_TESTS "CommPeer" writer "CPCommPattern=Min" "${BASIC_SST_TESTS}" )
+MutateTestSet( COMM_PEER_SST_TESTS "CommPeer" writer "CPCommPattern=Peer" "${BASIC_SST_TESTS}" )
 
 MutateTestSet( FFS_SST_TESTS "FFS" writer "MarshalMethod=FFS" "${COMM_MIN_SST_TESTS};${COMM_PEER_SST_TESTS}" )
 MutateTestSet( BP_SST_TESTS "BP" writer "MarshalMethod=BP" "${COMM_MIN_SST_TESTS};${COMM_PEER_SST_TESTS}" )