Changeset 1056 for XIOS/dev/branch_yushan/extern

Timestamp:

02/21/17 08:40:09 (7 years ago)

Author:

yushan

Message:

one file mode OK. Tested with test_client

Location:

XIOS/dev/branch_yushan/extern/src_ep_dev

Files:

• ep_fortran.cpp (modified) (2 diffs)
• ep_gatherv.cpp (modified) (3 diffs)
• ep_scatterv.cpp (modified) (2 diffs)
• ep_split.cpp (modified) (2 diffs)

XIOS/dev/branch_yushan/extern/src_ep_dev/ep_fortran.cpp

@@ -32 +32 @@
     {
       fc_comm_map.insert(std::make_pair( std::make_pair( fint, omp_get_thread_num()) , comm));
-      printf("MAP insert: %d, %d, %p\n", fint, omp_get_thread_num(), &comm);
+      printf("EP_Comm_c2f : MAP insert: %d, %d, %p\n", fint, omp_get_thread_num(), &comm);
     }
     
@@ -52 +52 @@
       MPI_Comm comm_ptr;
       comm_ptr =  it->second;
-      printf("MAP find: %d, %d, %p\n", it->first.first, it->first.second, &comm_ptr);
+      printf("EP_Comm_f2c : MAP find: %d, %d, %p\n", it->first.first, it->first.second, &comm_ptr);
       return  comm_ptr;
     }

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

@@ -323 +323 @@
   {
   
-    
-    
-
     if(!comm.is_ep && comm.mpi_comm)
     {
@@ -350 +347 @@
     mpi_size = comm.ep_comm_ptr->size_rank_info[2].second;
     
+    if(ep_rank != root)
+    {
+      recvcounts = new int[ep_size];
+      displs = new int[ep_size];
+    }
+    
     MPI_Bcast(const_cast< int* >(recvcounts), ep_size, MPI_INT, root, comm);
     MPI_Bcast(const_cast< int* >(displs), ep_size, MPI_INT, root, comm);
@@ -441 +444 @@
         delete[] static_cast<char*>(local_gather_recvbuf);
       }
+    }
+    else
+    {
+      delete[] recvcounts;
+      delete[] displs;
     }
     return 0;

XIOS/dev/branch_yushan/extern/src_ep_dev/ep_scatterv.cpp

@@ -318 +318 @@
     num_ep = comm.ep_comm_ptr->size_rank_info[1].second;
     mpi_size = comm.ep_comm_ptr->size_rank_info[2].second;
+
+    if(ep_rank != root)
+    {
+      sendcounts = new int[ep_size];
+      displs = new int[ep_size];
+    }
     
     MPI_Bcast(const_cast<int*>(sendcounts), ep_size, MPI_INT, root, comm);
@@ -414 +420 @@
       }
     }
+    else
+    {
+      delete[] sendcounts;
+      delete[] displs;
+    }
 
   }

XIOS/dev/branch_yushan/extern/src_ep_dev/ep_split.cpp

@@ -74 +74 @@
 
 
-    while(color_list.size())
+    while(!color_list.empty())
     {
       int target_color = color_list.front();
@@ -124 +124 @@
       if(color == all_color[i])
       {
-        color_index = i;
+        //color_index = i;
         for(int j=0; j<colored_key_loc[i].size(); j++)
         {