Changeset 1149 for XIOS/dev/branch_yushan_merged/extern

Timestamp:

05/31/17 10:51:06 (7 years ago)

Author:

yushan

Message:

bug fixed in mpi_comm_split. Key needs to be specifify.

Location:

XIOS/dev/branch_yushan_merged/extern

Files:

• remap/src/intersect.cpp (modified) (1 diff)
• remap/src/mapper.cpp (modified) (11 diffs)
• src_ep_dev/ep_test.cpp (modified) (4 diffs)
• src_ep_dev/ep_wait.cpp (modified) (1 diff)

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

@@ -56 +56 @@
     for (int j = 0; j < b.n; j++)
     {
-// share a full edge ? be carefull at the orientation
-      assert(squaredist(a.vertex[ i       ], b.vertex[ j       ]) > 1e-10*1e-10 ||
-             squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]) > 1e-10*1e-10);
+      // share a full edge ? be carefull at the orientation
+      /*
+      if(squaredist(a.vertex[i], b.vertex[j]) > 1e-10*1e-10 ||
+         squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]) > 1e-10*1e-10 )
+      {      
+        printf("A : squaredist(a.vertex[%d], b.vertex[%d]) = %.10e  %d\n", 
+                i, j, squaredist(a.vertex[i], b.vertex[j]), 
+                squaredist(a.vertex[i], b.vertex[j]) > 1e-10*1e-10 ? true : false);
+        printf("B : squaredist(a.vertex[%d], b.vertex[%d]) = %.10e  %d\n", 
+                (i+1)%a.n, (j+1)%b.n, squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]),
+                squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]) > 1e-10*1e-10 ? true : false);
+
+        assert(squaredist(a.vertex[ i       ], b.vertex[ j       ]) > 1e-10*1e-10 ||
+               squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+1)%b.n]) > 1e-10*1e-10);
+        exit(0);
+      }*/
       if (   squaredist(a.vertex[ i       ], b.vertex[ j           ]) < 1e-10*1e-10 &&
              squaredist(a.vertex[(i+1)%a.n], b.vertex[(j+b.n-1)%b.n]) < 1e-10*1e-10)

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

@@ -270 +270 @@
     MPI_Status *status = new MPI_Status[4*mpiSize];
     
+    MPI_Waitall(nbRecvRequest, recvRequest, status);
     MPI_Waitall(nbSendRequest, sendRequest, status);
-    MPI_Waitall(nbRecvRequest, recvRequest, status);
+    
 
     /* for all indices that have been received from requesting ranks: pack values and gradients, then send */
@@ -300 +301 @@
                     sendNeighIds[rank][j] = sstree.localElements[recvElement[rank][j]].src_id;
             }
-            MPI_Issend(sendValue[rank],  nbRecvElement[rank], MPI_DOUBLE, rank, 0, communicator, &sendRequest[nbSendRequest]);
+            MPI_Issend(sendValue[rank], nbRecvElement[rank], MPI_DOUBLE, rank, 0, communicator, &sendRequest[nbSendRequest]);
             nbSendRequest++;
-            MPI_Issend(sendArea[rank],  nbRecvElement[rank], MPI_DOUBLE, rank, 0, communicator, &sendRequest[nbSendRequest]);
+            MPI_Issend(sendArea[rank], nbRecvElement[rank], MPI_DOUBLE, rank, 0, communicator, &sendRequest[nbSendRequest]);
             nbSendRequest++;
             if (order == 2)
@@ -317 +318 @@
                 MPI_Issend(sendNeighIds[rank], 4*nbRecvElement[rank], MPI_INT, rank, 0, communicator, &sendRequest[nbSendRequest]);
                 //ym  --> attention taille GloId
-                nbSendRequest++;
-                
+                nbSendRequest++;                
             }
         }
@@ -345 +345 @@
     }
     
-    MPI_Waitall(nbSendRequest, sendRequest, status);
     MPI_Waitall(nbRecvRequest, recvRequest, status);
+    MPI_Waitall(nbSendRequest, sendRequest, status); 
+    
     
 
@@ -407 +408 @@
         }
     }
-
+    
     /* free all memory allocated in this function */
-    for (int rank = 0; rank < mpiSize; rank++)
+    /*for (int rank = 0; rank < mpiSize; rank++)
     {
         if (nbSendElement[rank] > 0)
@@ -446 +447 @@
     delete[] sendNeighIds;
     delete[] recvNeighIds;
+    */
     return i;
 }
@@ -546 +548 @@
         }
     }
-
+    
+    MPI_Waitall(nbRecvRequest, recvRequest, status);
     MPI_Waitall(nbSendRequest, sendRequest, status);
-    MPI_Waitall(nbRecvRequest, recvRequest, status);
 
     for (int rank = 0; rank < mpiSize; rank++)
@@ -619 +621 @@
     }
 
+    MPI_Waitall(nbRecvRequest, recvRequest, status);
     MPI_Waitall(nbSendRequest, sendRequest, status);
-    MPI_Waitall(nbRecvRequest, recvRequest, status);
  
     int nbNeighbourNodes = 0;
@@ -803 +805 @@
     }
  
+    MPI_Waitall(nbRecvRequest, recvRequest, status);
     MPI_Waitall(nbSendRequest, sendRequest, status);
-    MPI_Waitall(nbRecvRequest, recvRequest, status);
+    
     
     char **sendBuffer2 = new char*[mpiSize];
@@ -878 +881 @@
         {
             MPI_Issend(sendBuffer2[rank], sentMessageSize[rank], MPI_CHAR, rank, 0, communicator, &sendRequest[nbSendRequest]);
-            printf("proc %d send %d elements to proc %d\n", mpiRank, sentMessageSize[rank], rank);
             nbSendRequest++;
         }
@@ -884 +886 @@
         {
             MPI_Irecv(recvBuffer2[rank], recvMessageSize[rank], MPI_CHAR, rank, 0, communicator, &recvRequest[nbRecvRequest]);
-            printf("proc %d recv %d elements from proc %d\n", mpiRank, recvMessageSize[rank], rank);
             nbRecvRequest++;
         }
     }
     
+    MPI_Waitall(nbRecvRequest, recvRequest, status);
     MPI_Waitall(nbSendRequest, sendRequest, status);
-    MPI_Waitall(nbRecvRequest, recvRequest, status);
+   
    
 

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

@@ -15 +15 @@
 namespace ep_lib {
 
-        int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status)
-        {
-                Debug("MPI_Test with EP");
+  int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status)
+  {
+    Debug("MPI_Test with EP");
 
     *flag = false;
@@ -56 +56 @@
     if(request->type == 3)  // imrecv
     {
-      ::MPI_Request mpi_request = static_cast< ::MPI_Request >(request->mpi_request);
+      ::MPI_Request *mpi_request = static_cast< ::MPI_Request* >(&(request->mpi_request));
       ::MPI_Status mpi_status;
-      ::MPI_Test(&mpi_request, flag, &mpi_status);
+      
+      ::MPI_Errhandler_set(MPI_COMM_WORLD_STD, MPI_ERRORS_RETURN);
+      int error_code = ::MPI_Test(mpi_request, flag, &mpi_status);
+      if (error_code != MPI_SUCCESS) {
+      
+         char error_string[BUFSIZ];
+         int length_of_error_string, error_class;
+      
+         ::MPI_Error_class(error_code, &error_class);
+         ::MPI_Error_string(error_class, error_string, &length_of_error_string);
+         printf("%s\n", error_string);
+      }
+      
       if(*flag)
       {
@@ -79 +91 @@
     }
                 
-        }
+  }
 
 
-        int MPI_Testall(int count, MPI_Request *array_of_requests, int *flag, MPI_Status *array_of_statuses)
-        {
-          Debug("MPI_Testall with EP");
+  int MPI_Testall(int count, MPI_Request *array_of_requests, int *flag, MPI_Status *array_of_statuses)
+  {
+    Debug("MPI_Testall with EP");
     *flag = true;
     int i=0;
@@ -92 +104 @@
       i++;
     }
-        }
+  }
 
 

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

@@ -100 +100 @@
           if(array_of_requests[i].type != 2) // isend or imrecv
           {      
-            MPI_Wait(&array_of_requests[i], &array_of_statuses[i]);
+            //MPI_Wait(&array_of_requests[i], &array_of_statuses[i]);
+            int tested=false;
+            while(!tested) MPI_Test(&array_of_requests[i], &tested, &array_of_statuses[i]);
             finished++;
             finished_index[i] = true;