Changeset b51c3b for src

Timestamp:

Apr 24, 2012, 3:38:21 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a150d0

Parents:

716da7

Message:

Minor changes to vmg.

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

Location:

src

Files:

• base/command_list.cpp (modified) (2 diffs)
• base/timer.cpp (modified) (1 diff)
• comm/comm.hpp (modified) (1 diff)
• comm/comm_mpi.cpp (modified) (1 diff)
• comm/comm_mpi.hpp (modified) (1 diff)

src/base/command_list.cpp

@@ -48 +48 @@
     MPI_Barrier(MPI_COMM_WORLD);
 #endif
-    comm->PrintString("Command \"%s\" start", iter->first.c_str());
+    comm->PrintStringOnce("Command \"%s\" start", iter->first.c_str());
 #endif
 
@@ -59 +59 @@
     MPI_Barrier(MPI_COMM_WORLD);
 #endif
-    comm->PrintString("Command \"%s\" done", iter->first.c_str());
+    comm->PrintStringOnce("Command \"%s\" done", iter->first.c_str());
 #endif
 

src/base/timer.cpp

@@ -184 +184 @@
 
     if (rank == 0) {
-      int min_calls, max_calls, avg_calls;
+      int min_calls, max_calls;
+      vmg_float avg_calls;
       vmg_float min_duration, max_duration, avg_duration;
       int rank_min_calls, rank_max_calls, rank_min_duration, rank_max_duration;

src/comm/comm.hpp

@@ -72 +72 @@
   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 vmg_float LevelSum(const Grid& grid, const vmg_float& value) {return value;}
   virtual vmg_float LevelSumRoot(const Grid& grid, const vmg_float& value) {return value;}

src/comm/comm_mpi.cpp

@@ -513 +513 @@
 {
   MPI_Allreduce(MPI_IN_PLACE, array, size, MPI_INT, MPI_SUM, comm_global);
+}
+
+vmg_float CommMPI::GlobalMax(const vmg_float& value)
+{
+  vmg_float result = value;
+  MPI_Allreduce(MPI_IN_PLACE, &result, 1, MPI_DOUBLE, MPI_MAX, comm_global);
+  return result;
+}
+
+vmg_float CommMPI::GlobalMaxRoot(const vmg_float& value)
+{
+  vmg_float recv_buffer = value;
+  vmg_float send_buffer = value;
+  MPI_Reduce(&send_buffer, &recv_buffer, 1, MPI_DOUBLE, MPI_MAX, 0, comm_global);
+  return recv_buffer;
+}
+
+void CommMPI::GlobalMaxArray(vmg_float* array, const vmg_int& size)
+{
+  MPI_Allreduce(MPI_IN_PLACE, array, size, MPI_DOUBLE, MPI_MAX, comm_global);
+}
+
+vmg_int CommMPI::GlobalMax(const vmg_int& value)
+{
+  vmg_int result = value;
+  MPI_Allreduce(MPI_IN_PLACE, &result, 1, MPI_INT, MPI_MAX, comm_global);
+  return result;
+}
+
+vmg_int CommMPI::GlobalMaxRoot(const vmg_int& value)
+{
+  vmg_int recv_buffer = value;
+  vmg_int send_buffer = value;
+  MPI_Reduce(&send_buffer, &recv_buffer, 1, MPI_INT, MPI_MAX, 0, comm_global);
+  return recv_buffer;
+}
+
+void CommMPI::GlobalMaxArray(vmg_int* array, const vmg_int& size)
+{
+  MPI_Allreduce(MPI_IN_PLACE, array, size, MPI_INT, MPI_MAX, comm_global);
 }
 

src/comm/comm_mpi.hpp

@@ -76 +76 @@
   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);
 
   vmg_float LevelSum(const Grid& grid, const vmg_float& value);