Changeset 1146 for XIOS/dev/branch_yushan_merged/extern/src_ep_dev

Timestamp:

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

Author:

yushan

Message:

save modif

Location:

XIOS/dev/branch_yushan_merged/extern/src_ep_dev

Files:

• ep_alltoall.cpp (modified) (1 diff)
• ep_wait.cpp (modified) (3 diffs)

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;