Changeset 1146 for XIOS/dev/branch_yushan_merged/extern

Timestamp:

05/24/17 16:59:40 (7 years ago)

Author:

yushan

Message:

save modif

Location:

XIOS/dev/branch_yushan_merged/extern

Files:

• remap/src/clipper.cpp (modified) (2 diffs)
• remap/src/mapper.cpp (modified) (4 diffs)
• remap/src/timerRemap.cpp (modified) (2 diffs)
• remap/src/timerRemap.hpp (modified) (1 diff)
• src_ep_dev/ep_alltoall.cpp (modified) (1 diff)
• src_ep_dev/ep_wait.cpp (modified) (3 diffs)

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

@@ -1047 +1047 @@
 
   //create a new edge array ...
-  TEdge *edges = new TEdge [highI +1];
+  TEdge *edges = new TEdge[highI+1];
 
   bool IsFlat = true;
@@ -4274 +4274 @@
 {
   //The equation of a line in general form (Ax + By + C = 0)
-  //given 2 points (x¹,y¹) & (x²,y²) is ...
-  //(y¹ - y²)x + (x² - x¹)y + (y² - y¹)x¹ - (x² - x¹)y¹ = 0
-  //A = (y¹ - y²); B = (x² - x¹); C = (y² - y¹)x¹ - (x² - x¹)y¹
-  //perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²)
+  //given 2 points (x,y) & (x,y) is ...
+  //(y - y)x + (x - x)y + (y - y)x - (x - x)y = 0
+  //A = (y - y); B = (x - x); C = (y - y)x - (x - x)y
+  //perpendicular distance of point (x,y) = (Ax + By + C)/Sqrt(A + B)
   //see http://en.wikipedia.org/wiki/Perpendicular_distance
   double A = double(ln1.Y - ln2.Y);

XIOS/dev/branch_yushan_merged/extern/remap/src/mapper.cpp

@@ -548 +548 @@
     }
 
+    MPI_Waitall(nbSendRequest, sendRequest, status);
     MPI_Waitall(nbRecvRequest, recvRequest, status);
-    MPI_Waitall(nbSendRequest, sendRequest, status);
 
     for (int rank = 0; rank < mpiSize; rank++)
@@ -620 +620 @@
     }
 
+    MPI_Waitall(nbSendRequest, sendRequest, status);
     MPI_Waitall(nbRecvRequest, recvRequest, status);
-    MPI_Waitall(nbSendRequest, sendRequest, status);
-
+ 
     int nbNeighbourNodes = 0;
     for (int rank = 0; rank < mpiSize; rank++)
@@ -803 +803 @@
         }
     }
-
+ 
+    MPI_Waitall(nbSendRequest, sendRequest, status);
     MPI_Waitall(nbRecvRequest, recvRequest, status);
-    MPI_Waitall(nbSendRequest, sendRequest, status);
+    
     char **sendBuffer2 = new char*[mpiSize];
     char **recvBuffer2 = new char*[mpiSize];
@@ -886 +887 @@
         }
     }
-
+    
+    MPI_Waitall(nbSendRequest, sendRequest, status);
     MPI_Waitall(nbRecvRequest, recvRequest, status);
-    MPI_Waitall(nbSendRequest, sendRequest, status);
+   
 
     delete [] sendRequest;

XIOS/dev/branch_yushan_merged/extern/remap/src/timerRemap.cpp

@@ -9 +9 @@
 using namespace std;
 
-map<string,CTimer*> CTimer::allTimer;
+map<string,CTimer*> *CTimer::allTimer = 0;
 
 CTimer::CTimer(const string& name_) : name(name_)
@@ -55 +55 @@
 CTimer& CTimer::get(const string name)
 {
+        if(allTimer == 0) allTimer = new map<string,CTimer*>;
         map<string,CTimer*>::iterator it;
-        it=allTimer.find(name);
-        if (it==allTimer.end()) it=allTimer.insert(pair<string,CTimer*>(name,new CTimer(name))).first;
+        it=(*allTimer).find(name);
+        if (it==(*allTimer).end()) it=(*allTimer).insert(pair<string,CTimer*>(name,new CTimer(name))).first;
         return *(it->second);
 }

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

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

XIOS/dev/branch_yushan_merged/extern/src_ep_dev/ep_alltoall.cpp

@@ -10 +10 @@
   int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm)
   {
+    assert(static_cast< ::MPI_Datatype>(sendtype) == static_cast< ::MPI_Datatype>(recvtype));
     ::MPI_Aint typesize, llb;
     ::MPI_Type_get_extent(static_cast< ::MPI_Datatype>(sendtype), &llb, &typesize);
+    
+    int ep_size;
+    MPI_Comm_size(comm, &ep_size);
 
-    for(int i=0; i<comm.ep_comm_ptr->size_rank_info[0].second; i++)
+    for(int i=0; i<ep_size; i++)
     {
-      MPI_Gather((char*)sendbuf+i*sendcount*typesize, sendcount, sendtype, recvbuf, recvcount, recvtype, i, comm);
+      MPI_Gather(sendbuf+i*sendcount*typesize, sendcount, sendtype, recvbuf, recvcount, recvtype, i, comm);
     }
 

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

@@ -86 +86 @@
 
         int finished = 0;
-        bool finished_index[count];
+        int finished_index[count];
 
         for(int i=0; i<count; i++)
@@ -97 +97 @@
             for(int i=0; i<count; i++)
             {
+                //MPI_Test(&array_of_requests[i], &finished_index[i], &array_of_statuses[i]);
                 if(finished_index[i] == false) // this request has not been tested.
                 {
@@ -102 +103 @@
                     {      
                         MPI_Wait(&array_of_requests[i], &array_of_statuses[i]);
-                        if(array_of_requests[i].type == 3)
-                        {
-                            //int check_count;
-                            //MPI_Get_count(&array_of_statuses[i], array_of_requests[i].ep_datatype, &check_count);
-                            //check_sum_recv(array_of_requests[i].buf, count, array_of_requests[i].ep_datatype, array_of_requests[i].ep_src, array_of_requests[i].ep_tag, array_of_requests[i].comm, 2);
-                        }
                         finished++;
                         finished_index[i] = true;