Changeset 2a5451

Timestamp:

May 11, 2012, 8:36:18 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

2d4211

Parents:

36d56c

Message:

vmg now succeeds on test_comm.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1816 5161e1c8-67bf-11de-9fd5-51895aff932f

Location:

src

Files:

• base/command_list.cpp (modified) (2 diffs)
• base/timer.cpp (modified) (3 diffs)
• comm/comm.hpp (modified) (1 diff)
• comm/comm_mpi.cpp (modified) (3 diffs)
• comm/comm_mpi.hpp (modified) (1 diff)
• mg.cpp (modified) (2 diffs)
• units/particle/interface_fcs.cpp (modified) (2 diffs)

src/base/command_list.cpp

@@ -62 +62 @@
 
 #ifdef DEBUG_BARRIER
+    Comm& comm = *MG::GetComm();
 #ifdef HAVE_MPI
-    MPI_Barrier(MPI_COMM_WORLD);
+    comm.Barrier();
 #endif
-    MG::GetComm()->PrintStringOnce("Command \"%s\" start", iter->first.c_str());
+    comm.PrintStringOnce("Command \"%s\" start", iter->first.c_str());
 #endif
 
@@ -74 +75 @@
 #ifdef DEBUG_BARRIER
 #ifdef HAVE_MPI
-    MPI_Barrier(MPI_COMM_WORLD);
+    comm.Barrier();
 #endif
-    MG::GetComm()->PrintStringOnce("Command \"%s\" done", iter->first.c_str());
+    comm.PrintStringOnce("Command \"%s\" done", iter->first.c_str());
 #endif
 

src/base/timer.cpp

@@ -185 +185 @@
   Comm& comm = *MG::GetComm();
   char name[80];
-  int rank, size;
-
-  MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-  MPI_Comm_size(MPI_COMM_WORLD, &size);
+
+  int rank = comm.GlobalRank();
+  int size = comm.GlobalSize();
 
   vmg_float times[size];
@@ -196 +195 @@
 
   int timer_size = Timer::td.size();
-  MPI_Bcast(timer_size, 1, MPI_INT, 0, MPI_COMM_WORLD);
+  comm.GlobalBroadcast(timer_size);
 
   if (rank == 0) {
       for (iter=Timer::td.begin(); iter!=Timer::td.end(); ++iter) {
         std::strcpy(name, iter->first.c_str());
-        MPI_Bcast(name, 80, MPI_CHAR, 0, MPI_COMM_WORLD);
-        MPI_Gather(&Timer::td[name].duration, 1, MPI_DOUBLE, times, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);
-        MPI_Gather(&Timer::td[name].total, 1, MPI_INT, calls, 1, MPI_INT, 0, MPI_COMM_WORLD);
+        comm.GlobalBroadcast(name);
+        comm.GlobalGather(Timer::td[name].duration, times);
+        comm.GlobalGather(Timer::td[name].total, calls);
 
         int min_calls, max_calls;
@@ -227 +226 @@
   }else {
     for (int i=0; i<timer_size; ++i) {
-      MPI_Bcast(name, 80, MPI_CHAR, 0, MPI_COMM_WORLD);
-      MPI_Gather(&Timer::td[name].duration, 1, MPI_DOUBLE, times, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);
-      MPI_Gather(&Timer::td[name].total, 1, MPI_INT, calls, 1, MPI_INT, 0, MPI_COMM_WORLD);
+      comm.GlobalBroadcast(name);
+      comm.GlobalGather(Timer::td[name].duration, times);
+      comm.GlobalGather(Timer::td[name].total, calls);
     }
   }

src/comm/comm.hpp

@@ -71 +71 @@
   virtual void CommFromGhostsAsyncFinish(Grid& grid) = 0;
 
+  virtual void Barrier() {}
+
   virtual vmg_float GlobalSum(const vmg_float& value) {return value;}
   virtual vmg_float GlobalSumRoot(const vmg_float& value) {return value;}
   virtual void GlobalSumArray(vmg_float* array, const vmg_int& size) {}
+  virtual vmg_float GlobalMax(const vmg_float& value) {return value;}
+  virtual vmg_float GlobalMaxRoot(const vmg_float& value) {return value;}
+  virtual void GlobalMaxArray(vmg_float* array, const vmg_int& size) {}
+  virtual void GlobalBroadcast(vmg_float& value) {}
+  virtual void GlobalGather(vmg_float& value, vmg_float* array) {array[0] = value;}
 
   virtual vmg_int GlobalSum(const vmg_int& value) {return value;}
   virtual vmg_int GlobalSumRoot(const vmg_int& value) {return value;}
   virtual void GlobalSumArray(vmg_int* array, const vmg_int& size) {}
-
-  virtual vmg_float GlobalMax(const vmg_float& value) {return value;}
-  virtual vmg_float GlobalMaxRoot(const vmg_float& value) {return value;}
-  virtual void GlobalMaxArray(vmg_float* array, const vmg_int& size) {}
-
   virtual vmg_int GlobalMax(const vmg_int& value) {return value;}
   virtual vmg_int GlobalMaxRoot(const vmg_int& value) {return value;}
   virtual void GlobalMaxArray(vmg_int* array, const vmg_int& size) {}
+  virtual void GlobalBroadcast(vmg_int& value) {}
+  virtual void GlobalGather(vmg_int& value, vmg_int* array) {array[0] = value;}
+
+  virtual void GlobalBroadcast(char* str) {}
 
   virtual vmg_float LevelSum(const Grid& grid, const vmg_float& value) {return value;}

src/comm/comm_mpi.cpp

@@ -186 +186 @@
 }
 
+void CommMPI::Barrier()
+{
+  MPI_Barrier(comm_global);
+}
+
 vmg_float CommMPI::GlobalSum(const vmg_float& value)
 {
@@ -206 +211 @@
 }
 
+void CommMPI::GlobalBroadcast(vmg_float& value)
+{
+  MPI_Bcast(&value, 1, MPI_DOUBLE, 0, comm_global);
+}
+
+void CommMPI::GlobalGather(vmg_float& value, vmg_float* array)
+{
+  MPI_Gather(&value, 1, MPI_DOUBLE, array, 1, MPI_DOUBLE, 0, comm_global);
+}
+
 vmg_int CommMPI::GlobalSum(const vmg_int& value)
 {
@@ -264 +279 @@
 {
   MPI_Allreduce(MPI_IN_PLACE, array, size, MPI_INT, MPI_MAX, comm_global);
+}
+
+void CommMPI::GlobalBroadcast(vmg_int& value)
+{
+  MPI_Bcast(&value, 1, MPI_INT, 0, comm_global);
+}
+
+void CommMPI::GlobalGather(vmg_int& value, vmg_int* array)
+{
+  MPI_Gather(&value, 1, MPI_INT, array, 1, MPI_INT, 0, comm_global);
+}
+
+void CommMPI::GlobalBroadcast(char* str)
+{
+  MPI_Bcast(str, std::strlen(str)+1, MPI_CHAR, 0, comm_global);
 }
 

src/comm/comm_mpi.hpp

@@ -87 +87 @@
   void CommFromGhostsAsyncFinish(Grid& grid);
 
+  void Barrier();
+
   vmg_float GlobalSum(const vmg_float& value);
   vmg_float GlobalSumRoot(const vmg_float& value);
   void GlobalSumArray(vmg_float* array, const vmg_int& size);
+  vmg_float GlobalMax(const vmg_float& value);
+  vmg_float GlobalMaxRoot(const vmg_float& value);
+  void GlobalMaxArray(vmg_float* array, const vmg_int& size);
+  void GlobalBroadcast(vmg_float& value);
+  void GlobalGather(vmg_float& value, vmg_float* array);
 
   vmg_int GlobalSum(const vmg_int& value);
   vmg_int GlobalSumRoot(const vmg_int& value);
   void GlobalSumArray(vmg_int* array, const vmg_int& size);
-
-  vmg_float GlobalMax(const vmg_float& value);
-  vmg_float GlobalMaxRoot(const vmg_float& value);
-  void GlobalMaxArray(vmg_float* array, const vmg_int& size);
-
   vmg_int GlobalMax(const vmg_int& value);
   vmg_int GlobalMaxRoot(const vmg_int& value);
   void GlobalMaxArray(vmg_int* array, const vmg_int& size);
+  void GlobalBroadcast(vmg_int& value);
+  void GlobalGather(vmg_int& value, vmg_int* array);
+
+  void GlobalBroadcast(char* str);
 
   vmg_float LevelSum(const Grid& grid, const vmg_float& value);

src/mg.cpp

@@ -158 +158 @@
 #ifdef DEBUG_MEASURE_TIME
 #ifdef HAVE_MPI
-  MPI_Barrier(MPI_COMM_WORLD);
+  GetComm()->Barrier();
 #endif
   Timer::Start("CompleteRunningTime");
@@ -175 +175 @@
 #ifdef DEBUG_MEASURE_TIME
 #ifdef HAVE_MPI
-  MPI_Barrier(MPI_COMM_WORLD);
+  GetComm()->Barrier();
 #endif
   Timer::Stop("CompleteRunningTime");

src/units/particle/interface_fcs.cpp

@@ -107 +107 @@
   MPI_Errhandler mpiErrorHandler;
   MPI_Comm_create_errhandler(VMG::MPI::ConvertToException, &mpiErrorHandler);
-  MPI_Comm_set_errhandler(MPI_COMM_WORLD, mpiErrorHandler);
+  MPI_Comm_set_errhandler(mpi_comm, mpiErrorHandler);
 #endif
 
@@ -119 +119 @@
    * Register communication class.
    */
-  Comm* comm = new Particle::CommMPI(boundary, new DomainDecompositionMPI());
+  Comm* comm = new Particle::CommMPI(boundary, new DomainDecompositionMPI(), mpi_comm);
   comm->Register("COMM");