Add underscore to make the macro name more readable

Piotr Luszczek · luszczek · commit 5e1fbd898ccc · 2015-06-08T22:46:27.000-04:00
diff --git a/INSTALL b/INSTALL
@@ -160,9 +160,9 @@ options and their meaning are:
 
     -DHPCG_DETAILED_DEBUG
 
-* Compile without MPI enabled::
+* Compile with MPI disabled::
 
-    -DHPCG_NOMPI
+    -DHPCG_NO_MPI
 
 * Compile without OpenMP enabled::
 
diff --git a/setup/Make.GCC_OMP b/setup/Make.GCC_OMP
@@ -96,7 +96,7 @@ HPCG_LIBS     =
 #
 # - Compile time options -----------------------------------------------
 #
-# -DHPCG_NOMPI		Define to disable MPI
+# -DHPCG_NO_MPI	        Define to disable MPI
 # -DHPCG_NOOPENMP	Define to disable OPENMP
 # -DHPCG_DEBUG       	Define to enable debugging output
 # -DHPCG_DETAILED_DEBUG Define to enable very detailed debugging output
@@ -106,7 +106,7 @@ HPCG_LIBS     =
 #    *) Build with OpenMP enabled.
 #    *) Not generate debugging output.
 #
-HPCG_OPTS     = -DHPCG_NOMPI
+HPCG_OPTS     = -DHPCG_NO_MPI
 #
 # ----------------------------------------------------------------------
 #
diff --git a/setup/Make.ICPC_OMP b/setup/Make.ICPC_OMP
@@ -96,7 +96,7 @@ HPCG_LIBS     =
 #
 # - Compile time options -----------------------------------------------
 #
-# -DHPCG_NOMPI		Define to disable MPI
+# -DHPCG_NO_MPI	        Define to disable MPI
 # -DHPCG_NOOPENMP	Define to disable OPENMP
 # -DHPCG_DEBUG       	Define to enable debugging output
 # -DHPCG_DETAILED_DEBUG Define to enable very detailed debugging output
@@ -106,7 +106,7 @@ HPCG_LIBS     =
 #    *) Build with OpenMP enabled.
 #    *) Not generate debugging output.
 #
-HPCG_OPTS     = -DHPCG_NOMPI
+HPCG_OPTS     = -DHPCG_NO_MPI
 #
 # ----------------------------------------------------------------------
 #
diff --git a/setup/Make.Linux_MPI b/setup/Make.Linux_MPI
@@ -96,7 +96,7 @@ HPCG_LIBS     =
 #
 # - Compile time options -----------------------------------------------
 #
-# -DHPCG_NOMPI		Define to disable MPI
+# -DHPCG_NO_MPI	        Define to disable MPI
 # -DHPCG_NOOPENMP	Define to disable OPENMP
 # -DHPCG_DEBUG       	Define to enable debugging output
 # -DHPCG_DETAILED_DEBUG Define to enable very detailed debugging output
diff --git a/setup/Make.Linux_Serial b/setup/Make.Linux_Serial
@@ -96,7 +96,7 @@ HPCG_LIBS     =
 #
 # - Compile time options -----------------------------------------------
 #
-# -DHPCG_NOMPI		Define to disable MPI
+# -DHPCG_NO_MPI	        Define to disable MPI
 # -DHPCG_NOOPENMP	Define to disable OPENMP
 # -DHPCG_DEBUG       	Define to enable debugging output
 # -DHPCG_DETAILED_DEBUG Define to enable very detailed debugging output
@@ -106,7 +106,7 @@ HPCG_LIBS     =
 #    *) Build with OpenMP enabled.
 #    *) Not generate debugging output.
 #
-HPCG_OPTS     = -DHPCG_NOMPI -DHPCG_NOOPENMP
+HPCG_OPTS     = -DHPCG_NO_MPI -DHPCG_NOOPENMP
 #
 # ----------------------------------------------------------------------
 #
diff --git a/setup/Make.MPIICPC_OMP b/setup/Make.MPIICPC_OMP
@@ -96,7 +96,7 @@ HPCG_LIBS     =
 #
 # - Compile time options -----------------------------------------------
 #
-# -DHPCG_NOMPI		Define to disable MPI
+# -DHPCG_NO_MPI		Define to disable MPI
 # -DHPCG_NOOPENMP	Define to disable OPENMP
 # -DHPCG_DEBUG       	Define to enable debugging output
 # -DHPCG_DETAILED_DEBUG Define to enable very detailed debugging output
diff --git a/setup/Make.MPI_GCC_OMP b/setup/Make.MPI_GCC_OMP
@@ -96,7 +96,7 @@ HPCG_LIBS     =
 #
 # - Compile time options -----------------------------------------------
 #
-# -DHPCG_NOMPI		Define to disable MPI
+# -DHPCG_NO_MPI	        Define to disable MPI
 # -DHPCG_NOOPENMP	Define to disable OPENMP
 # -DHPCG_DEBUG       	Define to enable debugging output
 # -DHPCG_DETAILED_DEBUG Define to enable very detailed debugging output
diff --git a/setup/Make.MPI_ICPC b/setup/Make.MPI_ICPC
@@ -96,7 +96,7 @@ HPCG_LIBS     =
 #
 # - Compile time options -----------------------------------------------
 #
-# -DHPCG_NOMPI		Define to disable MPI
+# -DHPCG_NO_MPI	        Define to disable MPI
 # -DHPCG_NOOPENMP	Define to disable OPENMP
 # -DHPCG_DEBUG       	Define to enable debugging output
 # -DHPCG_DETAILED_DEBUG Define to enable very detailed debugging output
diff --git a/setup/Make.MPI_ICPC_OMP b/setup/Make.MPI_ICPC_OMP
@@ -96,7 +96,7 @@ HPCG_LIBS     =
 #
 # - Compile time options -----------------------------------------------
 #
-# -DHPCG_NOMPI		Define to disable MPI
+# -DHPCG_NO_MPI	        Define to enable MPI
 # -DHPCG_NOOPENMP	Define to disable OPENMP
 # -DHPCG_DEBUG       	Define to enable debugging output
 # -DHPCG_DETAILED_DEBUG Define to enable very detailed debugging output
diff --git a/src/CG.cpp b/src/CG.cpp
@@ -66,7 +66,7 @@ int CG(const SparseMatrix & A, CGData & data, const Vector & b, Vector & x,
 
 
   double t0 = 0.0, t1 = 0.0, t2 = 0.0, t3 = 0.0, t4 = 0.0, t5 = 0.0;
-//#ifndef HPCG_NOMPI
+//#ifndef HPCG_NO_MPI
 //  double t6 = 0.0;
 //#endif
   local_int_t nrow = A.localNumberOfRows;
@@ -135,7 +135,7 @@ int CG(const SparseMatrix & A, CGData & data, const Vector & b, Vector & x,
   times[3] += t3; // SPMV time
   times[4] += t4; // AllReduce time
   times[5] += t5; // preconditioner apply time
-//#ifndef HPCG_NOMPI
+//#ifndef HPCG_NO_MPI
 //  times[6] += t6; // exchange halo time
 //#endif
   times[0] += mytimer() - t_begin;  // Total time. All done...
diff --git a/src/CG_ref.cpp b/src/CG_ref.cpp
@@ -65,7 +65,7 @@ int CG_ref(const SparseMatrix & A, CGData & data, const Vector & b, Vector & x,
 
 
   double t0 = 0.0, t1 = 0.0, t2 = 0.0, t3 = 0.0, t4 = 0.0, t5 = 0.0;
-//#ifndef HPCG_NOMPI
+//#ifndef HPCG_NO_MPI
 //  double t6 = 0.0;
 //#endif
 
@@ -136,7 +136,7 @@ int CG_ref(const SparseMatrix & A, CGData & data, const Vector & b, Vector & x,
   times[3] += t3; // SPMV time
   times[4] += t4; // AllReduce time
   times[5] += t5; // preconditioner apply time
-//#ifndef HPCG_NOMPI
+//#ifndef HPCG_NO_MPI
 //  times[6] += t6; // exchange halo time
 //#endif
   times[0] += mytimer() - t_begin;  // Total time. All done...
diff --git a/src/CheckAspectRatio.cpp b/src/CheckAspectRatio.cpp
@@ -19,8 +19,8 @@
 
 #include <algorithm>
 
-#ifndef HPCG_NOMPI
-#include <mpi.h> // If this routine is not compiled with HPCG_NOMPI
+#ifndef HPCG_NO_MPI
+#include <mpi.h>
 #endif
 
 #include "hpcg.hpp"
@@ -40,7 +40,7 @@ CheckAspectRatio(double smallest_ratio, int x, int y, int z, const char *what, b
       HPCG_fout.flush();
     }
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
     MPI_Abort(MPI_COMM_WORLD, 127);
 #endif
 
diff --git a/src/ComputeDotProduct_ref.cpp b/src/ComputeDotProduct_ref.cpp
@@ -18,7 +18,7 @@
  HPCG routine
  */
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
 #include <mpi.h>
 #include "mytimer.hpp"
 #endif
@@ -63,7 +63,7 @@ int ComputeDotProduct_ref(const local_int_t n, const Vector & x, const Vector &
     for (local_int_t i=0; i<n; i++) local_result += xv[i]*yv[i];
   }
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
   // Use MPI's reduce function to collect all partial sums
   double t0 = mytimer();
   double global_result = 0.0;
diff --git a/src/ComputeResidual.cpp b/src/ComputeResidual.cpp
@@ -17,8 +17,8 @@
 
  HPCG routine
  */
-#ifndef HPCG_NOMPI
-#include <mpi.h> // If this routine is not compiled with HPCG_NOMPI
+#ifndef HPCG_NO_MPI
+#include <mpi.h>
 #endif
 #ifndef HPCG_NOOPENMP
 #include <omp.h> // If this routine is not compiled with HPCG_NOOPENMP
@@ -76,7 +76,7 @@ int ComputeResidual(const local_int_t n, const Vector & v1, const Vector & v2, d
   }
 #endif
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
   // Use MPI's reduce function to collect all partial sums
   double global_residual = 0;
   MPI_Allreduce(&local_residual, &global_residual, 1, MPI_DOUBLE, MPI_MAX, MPI_COMM_WORLD);
diff --git a/src/ComputeSPMV_ref.cpp b/src/ComputeSPMV_ref.cpp
@@ -20,7 +20,7 @@
 
 #include "ComputeSPMV_ref.hpp"
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
 #include "ExchangeHalo.hpp"
 #endif
 
@@ -49,7 +49,7 @@ int ComputeSPMV_ref( const SparseMatrix & A, Vector & x, Vector & y) {
   assert(x.localLength>=A.localNumberOfColumns); // Test vector lengths
   assert(y.localLength>=A.localNumberOfRows);
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
     ExchangeHalo(A,x);
 #endif
   const double * const xv = x.values;
diff --git a/src/ComputeSYMGS_ref.cpp b/src/ComputeSYMGS_ref.cpp
@@ -18,7 +18,7 @@
  HPCG routine
  */
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
 #include "ExchangeHalo.hpp"
 #endif
 #include "ComputeSYMGS_ref.hpp"
@@ -55,7 +55,7 @@ int ComputeSYMGS_ref( const SparseMatrix & A, const Vector & r, Vector & x) {
 
   assert(x.localLength==A.localNumberOfColumns); // Make sure x contain space for halo values
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
   ExchangeHalo(A,x);
 #endif
 
diff --git a/src/ExchangeHalo.cpp b/src/ExchangeHalo.cpp
@@ -18,7 +18,8 @@
  HPCG routine
  */
 
-#ifndef HPCG_NOMPI  // Compile this routine only if running in parallel
+// Compile this routine only if running with MPI
+#ifndef HPCG_NO_MPI
 #include <mpi.h>
 #include "Geometry.hpp"
 #include "ExchangeHalo.hpp"
@@ -107,4 +108,5 @@ void ExchangeHalo(const SparseMatrix & A, Vector & x) {
 
   return;
 }
-#endif // ifndef HPCG_NOMPI
+#endif
+// ifndef HPCG_NO_MPI
diff --git a/src/GenerateProblem.cpp b/src/GenerateProblem.cpp
@@ -18,7 +18,7 @@
  HPCG routine
  */
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
 #include <mpi.h>
 #endif
 
@@ -178,7 +178,7 @@ void GenerateProblem(SparseMatrix & A, Vector * b, Vector * x, Vector * xexact)
 #endif
 
   global_int_t totalNumberOfNonzeros = 0;
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
   // Use MPI's reduce function to sum all nonzeros
 #ifdef HPCG_NO_LONG_LONG
   MPI_Allreduce(&localNumberOfNonzeros, &totalNumberOfNonzeros, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD);
diff --git a/src/ReportResults.cpp b/src/ReportResults.cpp
@@ -18,8 +18,8 @@
  HPCG routine
  */
 
-#ifndef HPCG_NOMPI
-#include <mpi.h> // If this routine is not compiled with HPCG_NOMPI
+#ifndef HPCG_NO_MPI
+#include <mpi.h>
 #endif
 
 #include "ReportResults.hpp"
@@ -54,7 +54,7 @@ void ReportResults(const SparseMatrix & A, int numberOfMgLevels, int numberOfCgS
 
   double minOfficialTime = 1800; // Any official benchmark result much run at least this many seconds
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
   double t4 = times[4];
   double t4min = 0.0;
   double t4max = 0.0;
@@ -216,7 +216,7 @@ void ReportResults(const SparseMatrix & A, int numberOfMgLevels, int numberOfCgS
     doc.get("User Optimization Overheads")->add("Optimization phase time (sec)", (times[7]));
     doc.get("User Optimization Overheads")->add("Optimization phase time vs reference SpMV+MG time", times[7]/times[8]);
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
     doc.add("DDOT Timing Variations","");
     doc.get("DDOT Timing Variations")->add("Min DDOT MPI_Allreduce time",t4min);
     doc.get("DDOT Timing Variations")->add("Max DDOT MPI_Allreduce time",t4max);
diff --git a/src/SetupHalo.cpp b/src/SetupHalo.cpp
@@ -18,7 +18,7 @@
  HPCG routine
  */
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
 #include <mpi.h>
 #include <map>
 #include <set>
@@ -56,7 +56,7 @@ void SetupHalo(SparseMatrix & A) {
   global_int_t ** mtxIndG = A.mtxIndG;
   local_int_t ** mtxIndL = A.mtxIndL;
 
-#ifdef HPCG_NOMPI  // In the non-MPI case we simply copy global indices to local index storage
+#ifdef HPCG_NO_MPI  // In the non-MPI case we simply copy global indices to local index storage
 #ifndef HPCG_NOOPENMP
   #pragma omp parallel for
 #endif
@@ -175,7 +175,8 @@ void SetupHalo(SparseMatrix & A) {
   }
 #endif
 
-#endif // ifndef HPCG_NOMPI
+#endif
+// ifdef HPCG_NO_MPI
 
   return;
 }
diff --git a/src/SparseMatrix.hpp b/src/SparseMatrix.hpp
@@ -55,7 +55,7 @@ struct SparseMatrix_STRUCT {
   mutable MGData * mgData; // Pointer to the coarse level data for this fine matrix
   void * optimizationData;  // pointer that can be used to store implementation-specific data
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
   local_int_t numberOfExternalValues; //!< number of entries that are external to this process
   int numberOfSendNeighbors; //!< number of neighboring processes that will be send local data
   local_int_t totalToBeSent; //!< total number of entries to be sent
@@ -94,7 +94,7 @@ inline void InitializeSparseMatrix(SparseMatrix & A, Geometry * geom) {
   A.isMgOptimized      = true;
   A.isWaxpbyOptimized     = true;
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
   A.numberOfExternalValues = 0;
   A.numberOfSendNeighbors = 0;
   A.totalToBeSent = 0;
@@ -155,7 +155,7 @@ inline void DeleteMatrix(SparseMatrix & A) {
   if (A.matrixValues) delete [] A.matrixValues;
   if (A.matrixDiagonal)           delete [] A.matrixDiagonal;
 
-#ifndef HPCG_NOMPI
+#ifndef HPCG_NO_MPI
   if (A.elementsToSend)       delete [] A.elementsToSend;
   if (A.neighbors)              delete [] A.neighbors;
   if (A.receiveLength)            delete [] A.receiveLength;
diff --git a/src/TestSymmetry.cpp b/src/TestSymmetry.cpp
@@ -24,8 +24,8 @@
 using std::endl;
 #include <vector>
 #include <cmath>
-#ifndef HPCG_NOMPI
-#include <mpi.h> // If this routine is not compiled with -DHPCG_NOMPI then include mpi.h
+#ifndef HPCG_NO_MPI
+#include <mpi.h>
 #endif
 
 #include "hpcg.hpp"
diff --git a/src/init.cpp b/src/init.cpp
diff --git a/src/main.cpp b/src/main.cpp
diff --git a/src/mytimer.cpp b/src/mytimer.cpp
diff --git a/unittesting/yaml_output/Makefile b/unittesting/yaml_output/Makefile

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ HPCG_LIBS =`
`96`	`96`	`#`
`97`	`97`	`# - Compile time options -----------------------------------------------`
`98`	`98`	`#`
`99`		`-# -DHPCG_NOMPI Define to disable MPI`
	`99`	`+# -DHPCG_NO_MPI Define to disable MPI`
`100`	`100`	`# -DHPCG_NOOPENMP Define to disable OPENMP`
`101`	`101`	`# -DHPCG_DEBUG Define to enable debugging output`
`102`	`102`	`# -DHPCG_DETAILED_DEBUG Define to enable very detailed debugging output`
`@@ -106,7 +106,7 @@ HPCG_LIBS =`
`106`	`106`	`# *) Build with OpenMP enabled.`
`107`	`107`	`# *) Not generate debugging output.`
`108`	`108`	`#`
`109`		`-HPCG_OPTS = -DHPCG_NOMPI`
	`109`	`+HPCG_OPTS = -DHPCG_NO_MPI`
`110`	`110`	`#`
`111`	`111`	`# ----------------------------------------------------------------------`
`112`	`112`	`#`