Changeset 1362

Timestamp:

12/06/17 15:22:17 (5 years ago)

Author:

yushan

Message:

unify type : MPI_Message MPI_Info

Location:

XIOS/dev/branch_openmp

Files:

• extern/remap/src/mpi_routing.cpp (modified) (1 diff)
• extern/src_ep_dev/ep_declaration.cpp (modified) (1 diff)
• extern/src_ep_dev/ep_lib.cpp (modified) (1 diff)
• extern/src_ep_dev/ep_memory.cpp (modified) (2 diffs)
• extern/src_ep_dev/ep_message.cpp (modified) (3 diffs)
• extern/src_ep_dev/ep_mpi.hpp (modified) (1 diff)
• extern/src_ep_dev/ep_probe.cpp (modified) (1 diff)
• extern/src_ep_dev/ep_recv.cpp (modified) (5 diffs)
• extern/src_ep_dev/ep_type.cpp (modified) (1 diff)
• extern/src_ep_dev/ep_type.hpp (modified) (5 diffs)
• extern/src_ep_dev/ep_wait.cpp (modified) (3 diffs)
• src/io/inetcdf4.cpp (modified) (1 diff)
• src/io/netCdfInterface.cpp (modified) (2 diffs)
• src/io/onetcdf4.cpp (modified) (2 diffs)

XIOS/dev/branch_openmp/extern/remap/src/mpi_routing.cpp

@@ -152 +152 @@
         {
                 #ifdef _usingEP
-                MPI_Irecv(&sourceRank[i], 1, MPI_INT, -2, 0, communicator, &request[indexRequest]);
+                MPI_Irecv(&sourceRank[i], 1, MPI_INT, -2, 0, communicator, &request[indexRequest++]);
                 #else
-                MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest]);
+                MPI_Irecv(&sourceRank[i], 1, MPI_INT, MPI_ANY_SOURCE, 0, communicator, &request[indexRequest++]);
                 #endif
-                indexRequest++;
-        }
-        MPI_Barrier(communicator);
-        for (int i = 0; i < nbTarget; i++)
-        {
-                MPI_Isend(&mpiRank, 1, MPI_INT, targetRank[i], 0, communicator, &request[indexRequest]);
-                indexRequest++;
+        }
+        MPI_Barrier(communicator);
+        for (int i = 0; i < nbTarget; i++)
+        {
+                MPI_Isend(&mpiRank, 1, MPI_INT, targetRank[i], 0, communicator, &request[indexRequest++]);
         }
         MPI_Waitall(indexRequest, request, status);

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_declaration.cpp

@@ -103 +103 @@
 
 ep_lib::MPI_Request MPI_REQUEST_NULL(MPI_REQUEST_NULL_STD);
-ep_lib::MPI_Info MPI_INFO_NULL(MPI_INFO_NULL_STD);
+ep_lib::MPI_Info MPI_INFO_NULL(&MPI_INFO_NULL_STD);
 
 

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_lib.cpp

@@ -251 +251 @@
 }  
 
-
-
-
-
-
+MPI_Message to_mpi_message(void* message)
+{
+  return *(static_cast< MPI_Message* >(message));
+}
+
+MPI_Info to_mpi_info(void* info)
+{
+  return *(static_cast< MPI_Info* >(info));
+}
+
+
+
+
+

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_memory.cpp

@@ -10 +10 @@
   int MPI_Alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr)
   {
-    ::MPI_Alloc_mem(size.mpi_aint, static_cast< ::MPI_Info>(info.mpi_info), baseptr);
+    ::MPI_Alloc_mem(size.mpi_aint, *(static_cast< ::MPI_Info*>(info.mpi_info)), baseptr);
     //::MPI_Alloc_mem(size.mpi_aint, MPI_INFO_NULL_STD, baseptr);
     return 0;
@@ -17 +17 @@
   int MPI_Alloc_mem(unsigned long size, MPI_Info info, void *baseptr)
   {
-    ::MPI_Alloc_mem(size, static_cast< ::MPI_Info>(info.mpi_info), baseptr);
+    ::MPI_Alloc_mem(size, *(static_cast< ::MPI_Info*>(info.mpi_info)), baseptr);
     //::MPI_Alloc_mem(size, MPI_INFO_NULL_STD, baseptr);
     return 0;

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_message.cpp

@@ -69 +69 @@
 
         MPI_Message *msg_block = new MPI_Message; 
-        msg_block->mpi_message = message;  
+        msg_block->mpi_message = new ::MPI_Message;
+        *(static_cast< ::MPI_Message*>(msg_block->mpi_message)) = message;  
         msg_block->ep_tag = bitset<15>(status.MPI_TAG >> 16).to_ulong(); 
         int src_loc       = bitset<8> (status.MPI_TAG >> 8) .to_ulong(); 
@@ -135 +136 @@
 
         MPI_Message *msg_block = new MPI_Message;
-
-        msg_block->mpi_message = message;
+        msg_block->mpi_message = new ::MPI_Message;
+        *(static_cast< ::MPI_Message*>(msg_block->mpi_message)) = message;
         msg_block->ep_tag = bitset<15>(status.MPI_TAG >> 16).to_ulong();
         int src_loc       = bitset<8> (status.MPI_TAG >> 8) .to_ulong();
@@ -188 +189 @@
 
         MPI_Message *msg_block = new MPI_Message;
-       
-        msg_block->mpi_message = message;
+        msg_block->mpi_message = new ::MPI_Message;
+        *(static_cast< ::MPI_Message*>(msg_block->mpi_message)) = message;
         msg_block->ep_tag = bitset<15>(status.MPI_TAG >> 16).to_ulong();
         int src_loc       = bitset<8> (status.MPI_TAG >> 8) .to_ulong();

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_mpi.hpp

@@ -7 +7 @@
 MPI_Op       to_mpi_op(ep_lib::MPI_Op op);
 MPI_Comm     to_mpi_comm(void* comm);
+MPI_Message  to_mpi_message(void* message);
+MPI_Info     to_mpi_info(void* info);
 
 #endif // EP_MPI_HPP_INCLUDED

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_probe.cpp

@@ -85 +85 @@
       status->ep_tag = tag;
 
-      message->mpi_message = mpi_message;
+      message->mpi_message = new ::MPI_Message;
+      *(static_cast< ::MPI_Message*>(message->mpi_message)) = mpi_message;
       message->ep_src = src;
       message->ep_tag = tag;

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_recv.cpp

@@ -89 +89 @@
     EP_PendingRequests->push_back(request);
 
+
     Request_Check();
 
@@ -101 +102 @@
 
     ::MPI_Request mpi_request;
-    ::MPI_Message mpi_message = static_cast< ::MPI_Message >(message->mpi_message);
-                
-    ::MPI_Imrecv(buf, count, to_mpi_type(datatype), &mpi_message, &mpi_request);
+    //::MPI_Message mpi_message = *(static_cast< ::MPI_Message* >(message->mpi_message));
+    ::MPI_Imrecv(buf, count, to_mpi_type(datatype), static_cast< ::MPI_Message* >(message->mpi_message), &mpi_request);         
+    //::MPI_Imrecv(buf, count, to_mpi_type(datatype), &mpi_message, &mpi_request);
 
     request->mpi_request = mpi_request;
@@ -109 +110 @@
     request->ep_tag = message->ep_tag;
     request->ep_src = message->ep_src;
+    
+    delete message->mpi_message;
 
     return 0;
@@ -119 +122 @@
 
     ::MPI_Status mpi_status;
-    ::MPI_Message mpi_message = static_cast< ::MPI_Message >(message->mpi_message);
-    
-    ::MPI_Mrecv(buf, count, to_mpi_type(datatype), &mpi_message, &mpi_status);
+    //::MPI_Message mpi_message = *(static_cast< ::MPI_Message* >(message->mpi_message));
+    ::MPI_Mrecv(buf, count, to_mpi_type(datatype), static_cast< ::MPI_Message* >(message->mpi_message), &mpi_status);
+    //::MPI_Mrecv(buf, count, to_mpi_type(datatype), &mpi_message, &mpi_status);
 
     status->mpi_status = new ::MPI_Status(mpi_status);
@@ -127 +130 @@
     status->ep_datatype = datatype;
     status->ep_tag = message->ep_tag;
+
+    delete message->mpi_message;
 
     //check_sum_recv(buf, count, datatype, message->ep_src, message->ep_tag);

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_type.cpp

@@ -48 +48 @@
     intercomm = NULL;
   }
+
+  MPI_Message::MPI_Message(void* message)
+  {
+    mpi_message = new ::MPI_Message;
+    *(static_cast< ::MPI_Message*>(mpi_message)) = *(static_cast< ::MPI_Message*>(message));
+  }
+
+  MPI_Info::MPI_Info(void* info)
+  {
+    mpi_info = new ::MPI_Info;
+    *(static_cast< ::MPI_Info*>(mpi_info)) = *(static_cast< ::MPI_Info*>(info));
+  }
+  
+//  MPI_Request::MPI_Request(void* request)
+//  {
+//    mpi_request = new ::MPI_Request;
+//    *(static_cast< ::MPI_Request*>(mpi_request)) = *(static_cast< ::MPI_Request*>(request));
+//  }
 
 

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_type.hpp

@@ -67 +67 @@
     public:
 
-      int mpi_message;
+      void* mpi_message;
       int ep_src;
       int ep_tag;
@@ -73 +73 @@
 
       MPI_Message() {}
-      MPI_Message(int message): mpi_message(message) {}
+      MPI_Message(void* message);
   };
 
@@ -201 +201 @@
     EP_Comm ep_comm_ptr;
     MPI_Comm *mem_bridge;
-    int* mpi_bridge;
+    void* mpi_bridge;
 
     MPI_Comm();  
@@ -219 +219 @@
     public:
 
-      int mpi_info;
+      void* mpi_info;
 
       MPI_Info(){ }
-      MPI_Info(int info): mpi_info(info) {}
+      MPI_Info(void* info);
   };
 
@@ -242 +242 @@
 
       MPI_Request() {}
-      MPI_Request(int request): mpi_request(request) {}
+      MPI_Request(int request):mpi_request(request) {}
       bool operator == (MPI_Request right);
 

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_wait.cpp

@@ -35 +35 @@
     ::MPI_Status mpi_status;
     ::MPI_Wait(&(request->mpi_request), &mpi_status);
-      
+
+   
+           
+ 
     // request->mpi_request = mpi_request;
 
@@ -42 +45 @@
     status->ep_tag = request->ep_tag;
     status->ep_datatype = request->ep_datatype;
+    
+
 
     return MPI_SUCCESS;
@@ -93 +98 @@
     delete[] mpi_status;
     
+    
     return MPI_SUCCESS;
   }  /* end of mpi_waitall*/

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, *(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)), *(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);
     else

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

@@ -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, 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);
   if (NC_NOERR != status)
   {
@@ -104 +105 @@
   int status;
   #pragma omp critical (_netcdf)
-  status = xios::nc_open_par(fileName.c_str(), oMode, comm, MPI_INFO_NULL.mpi_info, &ncId);
+  status = xios::nc_open_par(fileName.c_str(), oMode, comm, *(static_cast< MPI_Info* >(MPI_INFO_NULL.mpi_info)), &ncId);
   
   if (NC_NOERR != status)

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)), *(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);
             else
@@ -71 +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)), *(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);
             else