Changeset 1355 for XIOS/dev/branch_openmp/src

Timestamp:

12/05/17 16:24:42 (7 years ago)

Author:

yushan

Message:

unify MPI_Comm type

Location:

XIOS/dev/branch_openmp/src

Files:

• buffer_client.cpp (modified) (2 diffs)
• buffer_client.hpp (modified) (1 diff)
• context_client.cpp (modified) (1 diff)
• cxios.cpp (modified) (1 diff)
• io/inetcdf4.cpp (modified) (1 diff)
• io/onetcdf4.cpp (modified) (2 diffs)

XIOS/dev/branch_openmp/src/buffer_client.cpp

@@ -15 +15 @@
   size_t CClientBuffer::maxRequestSize = 0;
 
-  CClientBuffer::CClientBuffer(MPI_Comm interComm, int serverRank, StdSize bufferSize, StdSize estimatedMaxEventSize, StdSize maxBufferedEvents)
-    : interComm(interComm)
-    , serverRank(serverRank)
+  CClientBuffer::CClientBuffer(MPI_Comm in_interComm, int serverRank, StdSize bufferSize, StdSize estimatedMaxEventSize, StdSize maxBufferedEvents): 
+    //interComm(interComm)
+    serverRank(serverRank)
     , bufferSize(bufferSize)
     , estimatedMaxEventSize(estimatedMaxEventSize)
@@ -27 +27 @@
     , pending(false)
   {
+    interComm = in_interComm;
+    *(interComm.mpi_comm) = *(in_interComm.mpi_comm);
+    *(interComm.ep_comm_ptr->intercomm->mpi_inter_comm) = *(in_interComm.ep_comm_ptr->intercomm->mpi_inter_comm);
     buffer[0] = new char[bufferSize]; // transform it with MPI_ALLOC_MEM later
     buffer[1] = new char[bufferSize];

XIOS/dev/branch_openmp/src/buffer_client.hpp

@@ -40 +40 @@
 
       CBufferOut* retBuffer;
-      const ep_lib::MPI_Comm interComm;
+      ep_lib::MPI_Comm interComm;
   };
 }

XIOS/dev/branch_openmp/src/context_client.cpp

@@ -27 +27 @@
       intraComm = intraComm_;
       interComm = interComm_;
+      *(intraComm.mpi_comm) = *(intraComm_.mpi_comm);
+      *(interComm.mpi_comm) = *(interComm_.mpi_comm);
+      *(interComm.ep_comm_ptr->intercomm->mpi_inter_comm) = *(interComm_.ep_comm_ptr->intercomm->mpi_inter_comm);
+      //MPI_Comm_dup(intraComm_, &intraComm);
+      //MPI_Comm_dup(interComm_, &interComm);
       MPI_Comm_rank(intraComm, &clientRank);
       MPI_Comm_size(intraComm, &clientSize);

XIOS/dev/branch_openmp/src/cxios.cpp

@@ -93 +93 @@
     {
       MPI_Comm *ep_comm;
-      MPI_Comm_create_endpoints(MPI_COMM_WORLD, num_ep, info, ep_comm);  // servers should reach here too.
+      MPI_Comm_create_endpoints(MPI_COMM_WORLD.mpi_comm, num_ep, info, ep_comm);  // servers should reach here too.
       passage = ep_comm;  
     }

XIOS/dev/branch_openmp/src/io/inetcdf4.cpp

@@ -23 +23 @@
     // even if Parallel NetCDF ends up being used.
     if (mpi)
-      //CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, *comm, info_null, this->ncidp);
-      CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, static_cast<MPI_Comm>(comm->mpi_comm), info_null.mpi_info, this->ncidp);
+      CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, static_cast<MPI_Comm>(*(comm->mpi_comm)), info_null.mpi_info, this->ncidp);
+      //CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, *(static_cast<MPI_Comm*>(comm->mpi_comm)), info_null.mpi_info, this->ncidp);
     else
       CNetCdfInterface::open(filename, NC_NOWRITE, this->ncidp);

XIOS/dev/branch_openmp/src/io/onetcdf4.cpp

@@ -58 +58 @@
             CTimer::get("Files : create").resume();
             if (wmpi)
-               CNetCdfInterface::createPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), info_null.mpi_info, this->ncidp);
+               CNetCdfInterface::createPar(filename, mode, static_cast<MPI_Comm>(*(comm->mpi_comm)), info_null.mpi_info, this->ncidp);
+               //CNetCdfInterface::createPar(filename, mode, *(static_cast<MPI_Comm*>(comm->mpi_comm)), info_null.mpi_info, this->ncidp);
             else
                CNetCdfInterface::create(filename, mode, this->ncidp);
@@ -70 +71 @@
             CTimer::get("Files : open").resume();
             if (wmpi)
-               CNetCdfInterface::openPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), info_null.mpi_info, this->ncidp);
+               CNetCdfInterface::openPar(filename, mode, static_cast<MPI_Comm>(*(comm->mpi_comm)), info_null.mpi_info, this->ncidp);
+               //CNetCdfInterface::openPar(filename, mode, *(static_cast<MPI_Comm*>(comm->mpi_comm)), info_null.mpi_info, this->ncidp);
             else
                CNetCdfInterface::open(filename, mode, this->ncidp);