Changeset 1209 for XIOS/dev/branch_openmp/extern

Timestamp:

07/11/17 17:57:38 (7 years ago)

Author:

yushan

Message:

bug corrected. happened when certain threads send 0 elements in the allgatherv call

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_gatherv.cpp (modified) (13 diffs)

XIOS/dev/branch_openmp/extern/src_ep_dev/ep_gatherv.cpp

@@ -70 +70 @@
     }
 
-    for(int j=0; j<count; j+=BUFFER_SIZE)
+    for(int j=0; count!=0? j<count: j<count+1; j+=BUFFER_SIZE)
     {
       for(int k=1; k<num_ep; k++)
@@ -78 +78 @@
           #pragma omp critical (write_to_buffer)
           {
-            copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
+            if(count!=0) copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
             #pragma omp flush
           }
@@ -114 +114 @@
     }
 
-    for(int j=0; j<count; j+=BUFFER_SIZE)
+    for(int j=0; count!=0? j<count: j<count+1; j+=BUFFER_SIZE)
     {
       for(int k=1; k<num_ep; k++)
@@ -122 +122 @@
           #pragma omp critical (write_to_buffer)
           {
-            copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
+            if(count!=0) copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
             #pragma omp flush
           }
@@ -158 +158 @@
     }
 
-    for(int j=0; j<count; j+=BUFFER_SIZE)
+    for(int j=0; count!=0? j<count: j<count+1; j+=BUFFER_SIZE)
     {
       for(int k=1; k<num_ep; k++)
@@ -166 +166 @@
           #pragma omp critical (write_to_buffer)
           {
-            copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
+            if(count!=0) copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
             #pragma omp flush
           }
@@ -202 +202 @@
     }
 
-    for(int j=0; j<count; j+=BUFFER_SIZE)
+    for(int j=0; count!=0? j<count: j<count+1; j+=BUFFER_SIZE)
     {
       for(int k=1; k<num_ep; k++)
@@ -210 +210 @@
           #pragma omp critical (write_to_buffer)
           {
-            copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
+            if(count!=0)copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
             #pragma omp flush
           }
@@ -246 +246 @@
     }
 
-    for(int j=0; j<count; j+=BUFFER_SIZE)
+    for(int j=0; count!=0? j<count: j<count+1; j+=BUFFER_SIZE)
     {
       for(int k=1; k<num_ep; k++)
@@ -254 +254 @@
           #pragma omp critical (write_to_buffer)
           {
-            copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
+            if(count!=0) copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
             #pragma omp flush
           }
@@ -290 +290 @@
     }
 
-    for(int j=0; j<count; j+=BUFFER_SIZE)
+    for(int j=0; count!=0? j<count: j<count+1; j+=BUFFER_SIZE)
     {
       for(int k=1; k<num_ep; k++)
@@ -298 +298 @@
           #pragma omp critical (write_to_buffer)
           {
-            copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
+            if(count!=0) copy(send_buf+j, send_buf + min(BUFFER_SIZE, count-j) , buffer);
             #pragma omp flush
           }
@@ -520 +520 @@
     num_ep = comm.ep_comm_ptr->size_rank_info[1].second;
     mpi_size = comm.ep_comm_ptr->size_rank_info[2].second;
-
-    //printf("size of recvbuf = %lu\n", sizeof(recvbuf));
-    //printf("size of (char*)recvbuf = %lu\n", sizeof((char*)recvbuf));
     
-    if(ep_size == mpi_size) 
-      return ::MPI_Allgatherv(sendbuf, sendcount, static_cast< ::MPI_Datatype>(datatype), recvbuf, recvcounts, displs,
-                              static_cast< ::MPI_Datatype>(datatype), static_cast< ::MPI_Comm>(comm.mpi_comm));
-   
 
     int recv_plus_displs[ep_size];