scc: Fix windows MPI type warnings

ornladios · Mar 29, 2022 · 80d7cda · 80d7cda
1 parent c0bb6f3
commit 80d7cda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/source/adios2/engine/ssc/SscReaderNaive.cpp b/source/adios2/engine/ssc/SscReaderNaive.cpp
@@ -35,12 +35,12 @@ StepStatus SscReaderNaive::BeginStep(const StepMode stepMode,
 
     ++m_CurrentStep;
 
-    size_t globalSize;
+    int globalSize;
 
     if (m_ReaderRank == 0)
     {
-        MPI_Recv(&globalSize, 1, MPI_UNSIGNED_LONG_LONG,
-                 m_WriterMasterStreamRank, 0, m_StreamComm, MPI_STATUS_IGNORE);
+        MPI_Recv(&globalSize, 1, MPI_INT, m_WriterMasterStreamRank, 0,
+                 m_StreamComm, MPI_STATUS_IGNORE);
         m_Buffer.resize(globalSize);
         //        MPI_Recv(m_Buffer.data(), globalSize, MPI_CHAR,
         //        m_WriterMasterStreamRank, 0, m_StreamComm, MPI_STATUS_IGNORE);
@@ -51,7 +51,7 @@ StepStatus SscReaderNaive::BeginStep(const StepMode stepMode,
         std::memcpy(m_Buffer.data(), tmp.data(), globalSize);
     }
 
-    MPI_Bcast(&globalSize, 1, MPI_UNSIGNED_LONG_LONG, 0, m_ReaderComm);
+    MPI_Bcast(&globalSize, 1, MPI_INT, 0, m_ReaderComm);
     if (m_ReaderRank != 0)
     {
         m_Buffer.resize(globalSize);

diff --git a/source/adios2/engine/ssc/SscWriterNaive.cpp b/source/adios2/engine/ssc/SscWriterNaive.cpp
@@ -58,8 +58,7 @@ void SscWriterNaive::EndStep(const bool writerLocked)
     std::vector<int> localSizes(m_WriterSize);
     MPI_Gather(&localSize, 1, MPI_INT, localSizes.data(), 1, MPI_INT, 0,
                m_WriterComm);
-    size_t globalSize =
-        std::accumulate(localSizes.begin(), localSizes.end(), 0);
+    int globalSize = std::accumulate(localSizes.begin(), localSizes.end(), 0);
     ssc::Buffer globalBuffer(globalSize);
 
     std::vector<int> displs(m_WriterSize);
@@ -73,8 +72,8 @@ void SscWriterNaive::EndStep(const bool writerLocked)
 
     if (m_WriterRank == 0)
     {
-        MPI_Send(&globalSize, 1, MPI_UNSIGNED_LONG_LONG,
-                 m_ReaderMasterStreamRank, 0, m_StreamComm);
+        MPI_Send(&globalSize, 1, MPI_INT, m_ReaderMasterStreamRank, 0,
+                 m_StreamComm);
         MPI_Send(globalBuffer.data(), globalSize, MPI_CHAR,
                  m_ReaderMasterStreamRank, 0, m_StreamComm);
     }
@@ -83,12 +82,12 @@ void SscWriterNaive::EndStep(const bool writerLocked)
 void SscWriterNaive::Close(const int transportIndex)
 {
 
-    uint64_t globalSize = 1;
+    int globalSize = 1;
     ssc::Buffer globalBuffer(globalSize);
     if (m_WriterRank == 0)
     {
-        MPI_Send(&globalSize, 1, MPI_UNSIGNED_LONG_LONG,
-                 m_ReaderMasterStreamRank, 0, m_StreamComm);
+        MPI_Send(&globalSize, 1, MPI_INT, m_ReaderMasterStreamRank, 0,
+                 m_StreamComm);
         MPI_Send(globalBuffer.data(), globalSize, MPI_CHAR,
                  m_ReaderMasterStreamRank, 0, m_StreamComm);
     }