Changeset 1338 for XIOS/dev/branch_openmp/src

Timestamp:

11/21/17 10:47:57 (6 years ago)

Author:

yushan

Message:

dev_omp

Location:

XIOS/dev/branch_openmp/src

Files:

• buffer_client.cpp (modified) (1 diff)
• client.cpp (modified) (1 diff)
• context_client.cpp (modified) (1 diff)
• context_server.cpp (modified) (2 diffs)
• io/nc4_data_input.cpp (modified) (1 diff)
• io/netCdfInterface.cpp (modified) (1 diff)
• node/context.cpp (modified) (1 diff)
• node/field.cpp (modified) (2 diffs)
• node/file.cpp (modified) (2 diffs)
• test/test_remap_omp.f90 (modified) (1 diff)
• transformation/domain_algorithm_interpolate.cpp (modified) (2 diffs)

XIOS/dev/branch_openmp/src/buffer_client.cpp

@@ -30 +30 @@
     buffer[1] = new char[bufferSize];
     retBuffer = new CBufferOut(buffer[current], bufferSize);
-    info(10) << "CClientBuffer: allocated 2 x " << bufferSize << " bytes for server " << serverRank << " with a maximum of " << maxBufferedEvents << " buffered events" << endl;
+    //info(10) << "CClientBuffer: allocated 2 x " << bufferSize << " bytes for server " << serverRank << " with a maximum of " << maxBufferedEvents << " buffered events" << endl;
   }
 

XIOS/dev/branch_openmp/src/client.cpp

@@ -255 +255 @@
       }
       
-      info(20) << "Client side context is finalized"<<endl ;
-      report(0) <<" Performance report : Whole time from XIOS init and finalize: "<< CTimer::get("XIOS init/finalize").getCumulatedTime()<<" s"<<endl ;
-      report(0) <<" Performance report : total time spent for XIOS : "<< CTimer::get("XIOS").getCumulatedTime()<<" s"<<endl ;
-      report(0)<< " Performance report : time spent for waiting free buffer : "<< CTimer::get("Blocking time").getCumulatedTime()<<" s"<<endl ;
-      report(0)<< " Performance report : Ratio : "<< CTimer::get("Blocking time").getCumulatedTime()/CTimer::get("XIOS init/finalize").getCumulatedTime()*100.<<" %"<<endl ;
-      report(0)<< " Performance report : This ratio must be close to zero. Otherwise it may be usefull to increase buffer size or numbers of server"<<endl ;
+      //info(20) << "Client side context is finalized"<<endl ;
+      //report(0) <<" Performance report : Whole time from XIOS init and finalize: "<< CTimer::get("XIOS init/finalize").getCumulatedTime()<<" s"<<endl ;
+      //report(0) <<" Performance report : total time spent for XIOS : "<< CTimer::get("XIOS").getCumulatedTime()<<" s"<<endl ;
+      //report(0)<< " Performance report : time spent for waiting free buffer : "<< CTimer::get("Blocking time").getCumulatedTime()<<" s"<<endl ;
+      //report(0)<< " Performance report : Ratio : "<< CTimer::get("Blocking time").getCumulatedTime()/CTimer::get("XIOS init/finalize").getCumulatedTime()*100.<<" %"<<endl ;
+      //report(0)<< " Performance report : This ratio must be close to zero. Otherwise it may be usefull to increase buffer size or numbers of server"<<endl ;
 //      report(0)<< " Memory report : Current buffer_size : "<<CXios::bufferSize<<endl ;
-      report(0)<< " Memory report : Minimum buffer size required : " << CClientBuffer::maxRequestSize << " bytes" << endl ;
-      report(0)<< " Memory report : increasing it by a factor will increase performance, depending of the volume of data wrote in file at each time step of the file"<<endl ;
-      report(100)<<CTimer::getAllCumulatedTime()<<endl ;
+      //report(0)<< " Memory report : Minimum buffer size required : " << CClientBuffer::maxRequestSize << " bytes" << endl ;
+      //report(0)<< " Memory report : increasing it by a factor will increase performance, depending of the volume of data wrote in file at each time step of the file"<<endl ;
+      //report(100)<<CTimer::getAllCumulatedTime()<<endl ;
    }
 

XIOS/dev/branch_openmp/src/context_client.cpp

@@ -400 +400 @@
      for (itMap = itbMap; itMap != iteMap; ++itMap)
      {
-       report(10) << " Memory report : Context <" << context->getId() << "> : client side : memory used for buffer of each connection to server" << endl
-                  << "  +) To server with rank " << itMap->first << " : " << itMap->second << " bytes " << endl;
+       //report(10) << " Memory report : Context <" << context->getId() << "> : client side : memory used for buffer of each connection to server" << endl
+       //           << "  +) To server with rank " << itMap->first << " : " << itMap->second << " bytes " << endl;
        totalBuf += itMap->second;
      }
-     report(0) << " Memory report : Context <" << context->getId() << "> : client side : total memory used for buffer " << totalBuf << " bytes" << endl;
+     //report(0) << " Memory report : Context <" << context->getId() << "> : client side : total memory used for buffer " << totalBuf << " bytes" << endl;
 
      releaseBuffers();

XIOS/dev/branch_openmp/src/context_server.cpp

@@ -254 +254 @@
     {
       finished=true;
-      info(20)<<"Server Side context <"<<context->getId()<<"> finalized"<<endl;
+      //info(20)<<"Server Side context <"<<context->getId()<<"> finalized"<<endl;
       std::map<int, StdSize>::const_iterator itbMap = mapBufferSize_.begin(),
                                              iteMap = mapBufferSize_.end(), itMap;
@@ -260 +260 @@
       for (itMap = itbMap; itMap != iteMap; ++itMap)
       {
-        report(10)<< " Memory report : Context <"<<context->getId()<<"> : server side : memory used for buffer of each connection to client" << endl
-                  << "  +) With client of rank " << itMap->first << " : " << itMap->second << " bytes " << endl;
+        //report(10)<< " Memory report : Context <"<<context->getId()<<"> : server side : memory used for buffer of each connection to client" << endl
+        //          << "  +) With client of rank " << itMap->first << " : " << itMap->second << " bytes " << endl;
         totalBuf += itMap->second;
       }
       context->finalize();
-      report(0)<< " Memory report : Context <"<<context->getId()<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl;
+      //report(0)<< " Memory report : Context <"<<context->getId()<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl;
     }
     else if (event.classId==CContext::GetType()) CContext::dispatchEvent(event);

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

@@ -53 +53 @@
     CArray<double,1> fieldData(grid->getWrittenDataSize());
     if (!field->default_value.isEmpty()) fieldData = field->default_value;
-
+    #ifdef _usingEP
+      SuperClass::type = ONE_FILE;
+      printf("SuperClass::type = %d\n", SuperClass::type);
+    #endif
+        
     switch (SuperClass::type)
     {

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

@@ -128 +128 @@
 int CNetCdfInterface::close(int ncId)
 {
-  int status = nc_close(ncId);
-  if (NC_NOERR != status)
-  {
-    StdString errormsg(nc_strerror(status));
-    StdStringStream sstr;
-    sstr << "Error when calling function nc_close(ncId)" << std::endl
-         << errormsg << std::endl
-         << "Unable to close file, given its id: " << ncId << std::endl;
-    StdString e = sstr.str();
-    throw CNetCdfException(e);
-  }
-
+  int status = NC_NOERR;
+  #pragma omp master
+  {
+    status = nc_close(ncId);
+    if (NC_NOERR != status)
+    {
+      StdString errormsg(nc_strerror(status));
+      StdStringStream sstr;
+      sstr << "Error when calling function nc_close(ncId)" << std::endl
+           << errormsg << std::endl
+           << "Unable to close file, given its id: " << ncId << std::endl;
+      StdString e = sstr.str();
+      throw CNetCdfException(e);
+    }
+  }
   return status;
 }

XIOS/dev/branch_openmp/src/node/context.cpp

@@ -1205 +1205 @@
    void CContext::updateCalendar(int step)
    {
-      info(50) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;
+      //info(50) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;
       calendar->update(step);
-      info(50) << "updateCalendar : after : " << calendar->getCurrentDate() << endl;
+      //info(50) << "updateCalendar : after : " << calendar->getCurrentDate() << endl;
 #ifdef XIOS_MEMTRACK_LIGHT
       info(50) << " Current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte, at timestep "<<step<<" of context "<<this->getId()<<endl ;

XIOS/dev/branch_openmp/src/node/field.cpp

@@ -316 +316 @@
     while (currentDate >= lastDataRequestedFromServer)
     {
-      info(20) << "currentDate : " << currentDate << endl ;
-      info(20) << "lastDataRequestedFromServer : " << lastDataRequestedFromServer << endl ;
-      info(20) << "file->output_freq.getValue() : " << file->output_freq.getValue() << endl ;
-      info(20) << "lastDataRequestedFromServer + file->output_freq.getValue() : " << lastDataRequestedFromServer + file->output_freq << endl ;
+      //info(20) << "currentDate : " << currentDate << endl ;
+      //info(20) << "lastDataRequestedFromServer : " << lastDataRequestedFromServer << endl ;
+      //info(20) << "file->output_freq.getValue() : " << file->output_freq.getValue() << endl ;
+      //info(20) << "lastDataRequestedFromServer + file->output_freq.getValue() : " << lastDataRequestedFromServer + file->output_freq << endl ;
 
       dataRequested |= sendReadDataRequest(lastDataRequestedFromServer + file->output_freq);
@@ -518 +518 @@
       while (isDataLate && timer.getCumulatedTime() < CXios::recvFieldTimeout);
 
-      if (isDataLate)
-        ERROR("void CField::checkForLateDataFromServer(void)",
-              << "Late data at timestep = " << currentDate);
+      //if (isDataLate)
+      //  ERROR("void CField::checkForLateDataFromServer(void)",
+      //        << "Late data at timestep = " << currentDate);
     }
   }

XIOS/dev/branch_openmp/src/node/file.cpp

@@ -596 +596 @@
 
       bool isCollective = par_access.isEmpty() || par_access == par_access_attr::collective;
-
-      if (isOpen) data_out->closeFile();
-      if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective));
-      else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
-      isOpen = true;
+      #ifdef _usingEP
+        //printf("multifile was %d\n", multifile);
+        //multifile = true;
+        if (isOpen) data_out->closeFile();
+        if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective));
+        else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
+        isOpen = true;
+      #elif _usingMPI
+        if (isOpen) data_out->closeFile();
+        if (time_counter_name.isEmpty()) data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective));
+        else data_in = boost::shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));
+        isOpen = true;
+      #endif
     }
   }
@@ -655 +663 @@
 
      // Now everything is ok, close it
-     close();
+     //close();
    }
 

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

@@ -95 +95 @@
   ALLOCATE(lval1(interpolatedLlm))
   ALLOCATE(lval2(llm2))
+  lval2 = 0
+  lval=0
+  lval1=0
 
   ierr=NF90_INQ_VARID(ncid,"lon",varid)

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

@@ -405 +405 @@
   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, 0, &poleComme);
+  ep_lib::MPI_Comm_split(client->intraComm, interMapValuePole.empty() ? 0 : 1, mykey, &poleComme);
   if (!poleComme.is_null())
   {
@@ -423 +426 @@
     std::vector<int> displ(nbClientPole,0);
     ep_lib::MPI_Allgather(&nbWeight,1,MPI_INT,&recvCount[0],1,MPI_INT,poleComme) ;
-
     displ[0]=0;
     for(int n=1;n<nbClientPole;++n) displ[n]=displ[n-1]+recvCount[n-1] ;