Changeset 1520 for XIOS/dev/branch_openmp/src

Timestamp:

06/04/18 19:25:08 (6 years ago)

Author:

yushan

Message:

save dev. TO DO : test with xios

Location:

XIOS/dev/branch_openmp/src

Files:

• buffer_client.cpp (modified) (2 diffs)
• context_client.cpp (modified) (1 diff)
• context_server.cpp (modified) (1 diff)
• cxios.cpp (modified) (1 diff)
• event_scheduler.cpp (modified) (1 diff)
• io/inetcdf4.cpp (modified) (2 diffs)
• io/netCdfInterface.cpp (modified) (3 diffs)
• io/onetcdf4.cpp (modified) (3 diffs)
• server.cpp (modified) (1 diff)
• test/test_complete_omp.f90 (modified) (1 diff)
• transformation/domain_algorithm_interpolate.cpp (modified) (1 diff)

XIOS/dev/branch_openmp/src/buffer_client.cpp

@@ -15 +15 @@
   size_t CClientBuffer::maxRequestSize = 0;
 
-  CClientBuffer::CClientBuffer(MPI_Comm in_interComm, int serverRank, StdSize bufferSize, StdSize estimatedMaxEventSize, StdSize maxBufferedEvents): 
-    //interComm(interComm)
-    serverRank(serverRank)
+  CClientBuffer::CClientBuffer(MPI_Comm interComm, int serverRank, StdSize bufferSize, StdSize estimatedMaxEventSize, StdSize maxBufferedEvents): 
+    interComm(interComm)
+    , serverRank(serverRank)
     , bufferSize(bufferSize)
     , estimatedMaxEventSize(estimatedMaxEventSize)
@@ -27 +27 @@
     , pending(false)
   {
-    interComm = in_interComm;
-    *(static_cast< ::MPI_Comm*>(interComm.mpi_comm)) = *(static_cast< ::MPI_Comm*>(in_interComm.mpi_comm));
-    *(static_cast< ::MPI_Comm*>(interComm.ep_comm_ptr->intercomm->mpi_inter_comm)) = *(static_cast< ::MPI_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/context_client.cpp

@@ -28 +28 @@
       intraComm = intraComm_;
       interComm = interComm_;
-      *(static_cast< ::MPI_Comm* >(intraComm.mpi_comm)) = *(static_cast< ::MPI_Comm* >(intraComm_.mpi_comm));
-      *(static_cast< ::MPI_Comm* >(interComm.mpi_comm)) = *(static_cast< ::MPI_Comm* >(interComm_.mpi_comm));
-      *(static_cast< ::MPI_Comm* >(interComm.ep_comm_ptr->intercomm->mpi_inter_comm)) = *(static_cast< ::MPI_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/context_server.cpp

@@ -126 +126 @@
     {
        StdSize buffSize = 0;
-       MPI_Recv(&buffSize, 1, MPI_LONG, rank, 20, interComm, &status);
+       MPI_Request request;
+       MPI_Irecv(&buffSize, 1, MPI_LONG, rank, 20, interComm, &request);
+       MPI_Wait(&request, &status);
+       //MPI_Recv(&buffSize, 1, MPI_LONG, rank, 20, interComm, &status);
        mapBufferSize_.insert(std::make_pair(rank, buffSize));
        it=(buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer(buffSize)))).first;

XIOS/dev/branch_openmp/src/cxios.cpp

@@ -106 +106 @@
     {
       MPI_Comm *ep_comm;
-      MPI_Comm_create_endpoints(MPI_COMM_WORLD.mpi_comm, 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/event_scheduler.cpp

@@ -140 +140 @@
       if (received)
       {
+        printf("probed a message coming from parent\n"),
         recvRequest=new SPendingRequest ;
         MPI_Irecv(recvRequest->buffer, 3, MPI_UNSIGNED_LONG, -2, 1, communicator, &(recvRequest->request)) ;

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

@@ -2 +2 @@
 #include "netCdfInterface.hpp"
 #include "netCdf_cf_constant.hpp"
-
+#include "ep_mpi.hpp"
 #include <boost/algorithm/string.hpp>
 
@@ -26 +26 @@
     // even if Parallel NetCDF ends up being used.
     if (mpi)
-      CNetCdfInterface::openPar(filename, NC_NOWRITE | NC_MPIIO, *(static_cast<MPI_Comm*>(comm->mpi_comm)), *(static_cast<MPI_Info*>(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, to_mpi_comm((*comm)->mpi_comm), to_mpi_info(info_null), this->ncidp);
     else
       CNetCdfInterface::open(filename, NC_NOWRITE, this->ncidp);

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

@@ -10 +10 @@
 #include "netCdfInterface.hpp"
 #include "netCdfException.hpp"
-
+#include "ep_mpi.hpp"
 namespace xios
 {
@@ -49 +49 @@
 int CNetCdfInterface::createPar(const StdString& fileName, int cMode, MPI_Comm comm, MPI_Info info, int& ncId)
 {
-  //int status = xios::nc_create_par(fileName.c_str(), cMode, comm, MPI_INFO_NULL.mpi_info, &ncId);
-  int status = xios::nc_create_par(fileName.c_str(), cMode, comm, *(static_cast< MPI_Info* >(MPI_INFO_NULL.mpi_info)), &ncId);
+  int status = xios::nc_create_par(fileName.c_str(), cMode, comm, to_mpi_info(MPI_INFO_NULL), &ncId);
   if (NC_NOERR != status)
   {
@@ -105 +104 @@
   int status;
   #pragma omp critical (_netcdf)
-  status = xios::nc_open_par(fileName.c_str(), oMode, comm, *(static_cast< MPI_Info* >(MPI_INFO_NULL.mpi_info)), &ncId);
+  status = xios::nc_open_par(fileName.c_str(), oMode, comm, to_mpi_info(MPI_INFO_NULL), &ncId);
   
   if (NC_NOERR != status)

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

@@ -3 +3 @@
 #include "onetcdf4.hpp"
 #include "group_template.hpp"
-//#include "mpi.hpp"
+#include "ep_mpi.hpp"
 #include "netcdf.hpp"
 #include "netCdfInterface.hpp"
@@ -59 +59 @@
             CTimer::get("Files : create").resume();
             if (wmpi)
-               CNetCdfInterface::createPar(filename, mode, *(static_cast<MPI_Comm*>(comm->mpi_comm)), *(static_cast<MPI_Info*>(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, to_mpi_comm((*comm)->mpi_comm), to_mpi_info(info_null), this->ncidp);
             else
                CNetCdfInterface::create(filename, mode, this->ncidp);
@@ -72 +71 @@
             CTimer::get("Files : open").resume();
             if (wmpi)
-               CNetCdfInterface::openPar(filename, mode, *(static_cast<MPI_Comm*>(comm->mpi_comm)), *(static_cast<MPI_Info*>(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, to_mpi_comm((*comm)->mpi_comm), to_mpi_info(info_null), this->ncidp);
             else
                CNetCdfInterface::open(filename, mode, this->ncidp);

XIOS/dev/branch_openmp/src/server.cpp

@@ -654 +654 @@
        if (flag==true)
        {
+         int my_count;
          counts.push_back(0);
          MPI_Get_count(&status,MPI_CHAR,&(counts.back())) ;

XIOS/dev/branch_openmp/src/test/test_complete_omp.f90

@@ -248 +248 @@
 !####################################################################################
 
-    DO ts=1,24*2
-    !DO ts=1,24
+    !DO ts=1,24*2
+    DO ts=1,24
 
       CALL xios_get_handle("atmosphere",ctx_hdl)

XIOS/dev/branch_openmp/src/transformation/domain_algorithm_interpolate.cpp

@@ -406 +406 @@
   CContext* context = CContext::getCurrent();
   CContextClient* client=context->client;
-  int mykey;
-  ep_lib::MPI_Comm_rank(client->intraComm, &mykey);
-
-  ep_lib::MPI_Comm poleComme;
-  //ep_lib::MPI_Comm_split(client->intraComm, interMapValuePole.empty() ? 0 : 1, 0, &poleComme);
-  ep_lib::MPI_Comm_split(client->intraComm, interMapValuePole.empty() ? 0 : 1, mykey, &poleComme);
-  if (!poleComme.is_null())
+  //int mykey;
+  //ep_lib::MPI_Comm_rank(client->intraComm, &mykey);
+
+  ep_lib::MPI_Comm poleComme = MPI_COMM_NULL;
+  ep_lib::MPI_Comm_split(client->intraComm, interMapValuePole.empty() ? 0 : 1, 0, &poleComme);
+  //ep_lib::MPI_Comm_split(client->intraComm, interMapValuePole.empty() ? 0 : 1, mykey, &poleComme);
+  //if (!poleComme.is_null())
+  if (poleComme!=MPI_COMM_NULL)
   {
     int nbClientPole;