Changeset 1073 for XIOS

Timestamp:

03/15/17 17:17:30 (7 years ago)

Author:

yushan

Message:

add test_omp ; Using threads : modif for context_initialize

Location:

XIOS/dev/branch_yushan

Files:

• bld.cfg (modified) (1 diff)
• extern/remap/src/clipper.cpp (modified) (1 diff)
• extern/remap/src/clipper.hpp (modified) (1 diff)
• extern/remap/src/timerRemap.hpp (modified) (1 diff)
• src/client.cpp (modified) (6 diffs)
• src/client.hpp (modified) (1 diff)
• src/cxios.cpp (modified) (5 diffs)
• src/cxios.hpp (modified) (2 diffs)
• src/test/test_client.f90 (modified) (3 diffs)
• src/test/test_omp.f90 (added)
• src/xml_node.hpp (modified) (1 diff)
• src/xml_parser.cpp (modified) (1 diff)
• src/xml_parser.hpp (modified) (1 diff)

XIOS/dev/branch_yushan/bld.cfg

@@ -36 +36 @@
 #bld::target test_remap.exe
 #bld::target test_new_features.exe test_unstruct_complete.exe 
-bld::target test_omp.exe #test_complete.exe test_client.exe
+bld::target test_omp.exe test_client.exe #test_complete.exe 
 bld::exe_dep
 

XIOS/dev/branch_yushan/extern/remap/src/clipper.cpp

@@ -52 +52 @@
 
 static double const pi = 3.141592653589793238;
-#pragma omp threadprivate(pi)
 
 static double const two_pi = pi *2;
-#pragma omp threadprivate(two_pi)
 
 static double const def_arc_tolerance = 0.25;
-#pragma omp threadprivate(def_arc_tolerance)
 
 enum Direction { dRightToLeft, dLeftToRight };
 
 static int const Unassigned = -1;  //edge not currently 'owning' a solution
-#pragma omp threadprivate(Unassigned)
 
 static int const Skip = -2;        //edge that would otherwise close a path
-#pragma omp threadprivate(Skip)
 
 #define HORIZONTAL (-1.0E+40)

XIOS/dev/branch_yushan/extern/remap/src/clipper.hpp

@@ -73 +73 @@
   typedef int cInt;
   static cInt const loRange = 0x7FFF;
-  #pragma omp threadprivate(loRange)
 
   static cInt const hiRange = 0x7FFF;
-  #pragma omp threadprivate(hiRange)
 
 #else
   typedef signed long long cInt;
   static cInt const loRange = 0x3FFFFFFF;
-  #pragma omp threadprivate(loRange)
 
   static cInt const hiRange = 0x3FFFFFFFFFFFFFFFLL;
-  #pragma omp threadprivate(hiRange)
   
   typedef signed long long long64;     //used by Int128 class

XIOS/dev/branch_yushan/extern/remap/src/timerRemap.hpp

@@ -27 +27 @@
     void print(void);
     static map<string,CTimer*> allTimer;
-    //#pragma omp threadprivate(allTimer)
 
     static double getTime(void);

XIOS/dev/branch_yushan/src/client.cpp

@@ -30 +30 @@
       if (initialized) is_MPI_Initialized=true ;
       else is_MPI_Initialized=false ;
+
+
       
 // don't use OASIS
@@ -35 +37 @@
       {
 // localComm doesn't given
+
+        printf("check : localComm == MPI_COMM_NULL = %d\n", localComm == MPI_COMM_NULL);
+
         if (localComm == MPI_COMM_NULL)
         {
@@ -41 +46 @@
             //MPI_Init(NULL, NULL);
             int return_level;
+            #ifdef _intelmpi
             MPI_Init_thread(NULL, NULL, 3, &return_level);
             assert(return_level == 3);
+            #elif _openmpi
+            MPI_Init_thread(NULL, NULL, 2, &return_level);
+            assert(return_level == 2);
+            #endif
           }
           CTimer::get("XIOS").resume() ;
@@ -49 +59 @@
 
           unsigned long hashClient=hashString(codeId) ;
-          unsigned long hashServer; //=hashString(CXios::xiosCodeId) ;
-          hashServer=hashString("xios.x") ;
+          unsigned long hashServer=hashString(CXios::xiosCodeId) ;
+          //hashServer=hashString("xios.x") ;
           unsigned long* hashAll ;
           int size ;
@@ -56 +66 @@
           int i,c ;
 
-          MPI_Comm_size(CXios::globalComm,&size) ;
+          MPI_Comm_size(CXios::globalComm,&size);
           MPI_Comm_rank(CXios::globalComm,&rank);
+
+          printf("client init : codeId = %s, xiosCodeId = %s, rank = %d(%d), size = %d\n", codeId, CXios::xiosCodeId, rank, omp_get_thread_num(), size);
+          
 
           hashAll=new unsigned long[size] ;
@@ -198 +211 @@
 
         MPI_Intercomm_create(contextComm,0,CXios::globalComm,serverLeader,10+globalRank,&contextInterComm) ;
-        info(10)<<"Register new Context : "<<id<<endl ;
+        //info(10)<<"Register new Context : "<<id<<endl ;
                       
 

XIOS/dev/branch_yushan/src/client.hpp

@@ -4 +4 @@
 #include "xios_spl.hpp"
 #include "mpi.hpp"
-#ifdef _usingEP
-//#include "ep_declaration.hpp"
-#endif
 
 

XIOS/dev/branch_yushan/src/cxios.cpp

@@ -22 +22 @@
   bool CXios::isServer ;
   MPI_Comm CXios::globalComm ;
-  // #pragma omp threadprivate(CXios::globalComm)
-
   bool CXios::usingOasis ;
   bool CXios::usingServer = false;
@@ -37 +35 @@
   {    
     set_new_handler(noMemory);
-    //#pragma omp critical(_output)
     #pragma omp master
     {
@@ -97 +94 @@
 
     int tmp_rank;
-    MPI_Comm_rank(MPI_COMM_WORLD, &tmp_rank);
-    if(isClient) printf("client thread %d/%d, globalComm = %p\n", omp_get_thread_num(), tmp_rank, &passage[omp_get_thread_num()]);
-    if(isServer) printf("server thread %d/%d, globalComm = %p\n", omp_get_thread_num(), tmp_rank, &passage[omp_get_thread_num()]);
+    MPI_Comm_rank(globalComm, &tmp_rank);
+    if(isClient) printf("client thread %d/%d\n", omp_get_thread_num(), tmp_rank);
+    if(isServer) printf("server thread %d/%d\n", omp_get_thread_num(), tmp_rank);
     
   }
@@ -115 +112 @@
     initialize() ;
 
-   
+
+
     CClient::initialize(codeId,localComm,returnComm) ;
+
+
     if (CClient::getRank()==0) globalRegistry = new CRegistry(returnComm) ;
 
@@ -123 +123 @@
     isServer = !usingServer;
     
+    printf("CXios::initClientSide OK, printLogs2Files = %d\n", printLogs2Files);
     
     if (printLogs2Files)

XIOS/dev/branch_yushan/src/cxios.hpp

@@ -44 +44 @@
 
      static bool isClient ; //!< Check if xios is client
-     //#pragma omp threadprivate(isClient)
+     #pragma omp threadprivate(isClient)
 
      static bool isServer ; //!< Check if xios is server
-     //#pragma omp threadprivate(isServer)
+     #pragma omp threadprivate(isServer)
 
      static MPI_Comm globalComm ; //!< Global communicator
@@ -56 +56 @@
 
      static bool usingOasis ; //!< Using Oasis
-     //#pragma omp threadprivate(usingOasis)
+     #pragma omp threadprivate(usingOasis)
 
      static bool usingServer ; //!< Using server (server mode)
-     //#pragma omp threadprivate(usingServer)
+     #pragma omp threadprivate(usingServer)
 
      static double bufferSizeFactor; //!< Factor used to tune the buffer size
-     //#pragma omp threadprivate(bufferSizeFactor)
+     #pragma omp threadprivate(bufferSizeFactor)
 
      static const double defaultBufferSizeFactor; //!< Default factor value
-     //#pragma omp threadprivate(defaultBufferSizeFactor)
+     #pragma omp threadprivate(defaultBufferSizeFactor)
 
      static StdSize minBufferSize; //!< Minimum buffer size
-     //#pragma omp threadprivate(minBufferSize)
+     #pragma omp threadprivate(minBufferSize)
 
      static bool isOptPerformance; //!< Check if buffer size is for performance (as large as possible)
-     //#pragma omp threadprivate(isOptPerformance)
+     #pragma omp threadprivate(isOptPerformance)
 
      static CRegistry* globalRegistry ; //!< global registry which is wrote by the root process of the servers
-     //#pragma omp threadprivate(globalRegistry)
+     #pragma omp threadprivate(globalRegistry)
 
     public:

XIOS/dev/branch_yushan/src/test/test_client.f90

@@ -3 +3 @@
   USE xios
   USE mod_wait
-  use omp_lib
   IMPLICIT NONE
   INCLUDE "mpif.h"
@@ -40 +39 @@
   CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr)
   if(rank < 2) then
+
   
   CALL xios_initialize(id,return_comm=comm)
@@ -45 +45 @@
   CALL MPI_COMM_RANK(comm,rank,ierr)
   CALL MPI_COMM_SIZE(comm,size,ierr)
+
 
   DO j=1,nj_glo

XIOS/dev/branch_yushan/src/xml_node.hpp

@@ -49 +49 @@
 
             static StdString RootName;
-            //#pragma omp threadprivate(RootName)
+            #pragma omp threadprivate(RootName)
 
       }; //class CXMLParser

XIOS/dev/branch_yushan/src/xml_parser.cpp

@@ -15 +15 @@
       void CXMLParser::ParseFile(const StdString & filename, const std::set<StdString>& parseContextList)
       {
-         //printf("thread %d, parsefile = %s\n", omp_get_thread_num(), filename.c_str());
          StdIFStream ifs ( filename.c_str() , StdIFStream::in );
          if ( (ifs.rdstate() & std::ifstream::failbit ) != 0 )

XIOS/dev/branch_yushan/src/xml_parser.hpp

@@ -20 +20 @@
             static void ParseString(const StdString & xmlContent);
             static void ParseStream(StdIStream & stream, const string& fluxId, const std::set<StdString>& parseList);
+            
             template <class T>
                static void ParseInclude(StdIStream & stream, const string& fluxId, T & object);