Changeset 1068 for XIOS/dev/branch_yushan/src

Timestamp:

03/09/17 12:19:33 (7 years ago)

Author:

yushan

Message:

minor modification for using intelmpi

Location:

XIOS/dev/branch_yushan/src

Files:

• client.cpp (modified) (2 diffs)
• cxios.cpp (modified) (1 diff)
• interface/c/icdata.cpp (modified) (2 diffs)
• interface/c/oasis_cinterface.cpp (modified) (3 diffs)
• io/onetcdf4.cpp (modified) (3 diffs)

XIOS/dev/branch_yushan/src/client.cpp

@@ -230 +230 @@
       MPI_Comm_rank(intraComm,&rank) ;
       
-      printf("CClient::finalize called isServer = %d\n", CXios::isServer);
+      //printf("CClient::finalize called isServer = %d\n", CXios::isServer);
  
       if (!CXios::isServer)
@@ -238 +238 @@
         {
           MPI_Send(&msg,1,MPI_INT,0,0,interComm) ;
-          printf(" CClient : send finalize sign to server 0\n");
+          //printf(" CClient : send finalize sign to server 0\n");
         }
       }

XIOS/dev/branch_yushan/src/cxios.cpp

@@ -77 +77 @@
     MPI_Info info;
     MPI_Comm *ep_comm;
-    MPI_Comm_create_endpoints(MPI_COMM_WORLD, num_ep, info, ep_comm);  // servers should reach here too.
-      
-    globalComm = ep_comm[0];
+    if(omp_get_thread_num()==0)
+    {
+      MPI_Comm_create_endpoints(MPI_COMM_WORLD, num_ep, info, ep_comm);  // servers should reach here too.
+      passage = ep_comm;  
+    }
+    
+    #pragma omp barrier
+      
+    globalComm = passage[omp_get_thread_num()];
     
     int tmp_size;

XIOS/dev/branch_yushan/src/interface/c/icdata.cpp

@@ -64 +64 @@
       MPI_Initialized(&initialized);
 
+      #ifdef _usingEP
       if (initialized) local_comm = ep_lib::EP_Comm_f2c(static_cast< int >(*f_local_comm));
       else local_comm = MPI_COMM_NULL;
-      
+      #else
+      if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm);
+      else local_comm = MPI_COMM_NULL;
+      #endif
      
 
       CXios::initClientSide(str, local_comm, return_comm);
 
+      #ifdef _usingEP
       *f_return_comm = ep_lib::EP_Comm_c2f(return_comm);
-
-      //printf("in icdata.cpp, f_return_comm = %d\n", *f_return_comm);
+      #else
+      *f_return_comm = MPI_Comm_c2f(return_comm);
+      #endif
 
       CTimer::get("XIOS init").suspend();
@@ -89 +95 @@
      comm = ep_lib::EP_Comm_f2c(static_cast< int >(*f_comm));
 
-     //ep_lib::MPI_Comm ctx_comm;
-     //ep_lib::MPI_Comm_dup(comm, &ctx_comm);
     
      CClient::registerContext(str,comm);
      
-     printf("icdata.cpp: client register context %s : %p\n", context_id, &comm);
+     //printf("icdata.cpp: client register context %s : %p\n", context_id, &comm);
      
      CTimer::get("XIOS init context").suspend();

XIOS/dev/branch_yushan/src/interface/c/oasis_cinterface.cpp

@@ -26 +26 @@
     
     fxios_oasis_get_localcomm(&f_comm) ;
-    //comm=MPI_Comm_f2c(f_comm) ;
+    #ifdef _usingEP
+    comm=EP_Comm_f2c(f_comm.mpi_fint) ;
+    #else
+    comm=MPI_Comm_f2c(f_comm) ;
+    #endif
   }
  
@@ -34 +38 @@
     
     fxios_oasis_get_intracomm(&f_comm,server_id.data(),server_id.size()) ;
-    //comm_client_server=MPI_Comm_f2c(f_comm) ;
+    #ifdef _usingEP
+    comm_client_server=EP_Comm_f2c(f_comm.mpi_fint) ;
+    #else
+    comm_client_server=MPI_Comm_f2c(f_comm) ;
+    #endif
   }
  
@@ -42 +50 @@
     
     fxios_oasis_get_intercomm(&f_comm,server_id.data(),server_id.size()) ;
-    //comm_client_server=MPI_Comm_f2c(f_comm) ;
+    #ifdef _usingEP
+    comm_client_server=EP_Comm_f2c(f_comm.mpi_fint) ;
+    #else
+    comm_client_server=MPI_Comm_f2c(f_comm) ;
+    #endif
   }
 }

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

@@ -47 +47 @@
          wmpi = comm && !multifile;
          
-         ep_lib::MPI_Info info_null;
+         //ep_lib::MPI_Info info_null;
 
          if (wmpi)
@@ -57 +57 @@
             if (wmpi)
             {
-               CNetCdfInterface::createPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), static_cast<MPI_Info>(info_null.mpi_info), this->ncidp);
-               printf("creating file with createPar\n");
+               // printf("start creating file with createPar\n");
+               //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), MPI_INFO_NULL_STD, this->ncidp);
+               // printf("creating file with createPar\n");
             }
             else
@@ -74 +76 @@
             if (wmpi)
             {
-               CNetCdfInterface::openPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), static_cast<MPI_Info>(info_null.mpi_info), this->ncidp);
-               printf("opening file with openPar\n");
+//               printf("start opening file with openPar\n");
+               // 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), MPI_INFO_NULL_STD, this->ncidp);
+//               printf("opening file with openPar\n");
             }
             else