Fixed some unused variables.

Revised QUICKSTART, Makefiles and configure to take a
path and file argument instead of arch=...

Fixed the HPCG logo to be "High Performance Conjugate Gradients"
(plural).

Updated other files for 2.0 release

git-svn-id: svn+ssh://software.sandia.gov/svn/hpcg/trunk@228 5e06a57e-6b39-4354-92a0-249a7d0c5410

BUGS

@@ -1,11 +1,9 @@
 ==============================================================
  List of the known problems with the HPCG software
 
- Current as of release HPCG - 0.3 - September 25, 2013
+ Current as of release HPCG - 2.0 - January 28, 2014
 ==============================================================
-- Known failure in MPI_Irecv call in ExchangeHalo.cpp when 
-  local_int_t is 'long long' with 4000 MPI processes on the
-  Sandia system chama.  Bug is being explored.
+- No known bugs
 
 ==============================================================
 

COPYRIGHT

@@ -1,9 +1,9 @@
 ======================================================================
  -- High Performance Conjugate Gradient Benchmark (HPCG)
-    HPCG - 1.0 - November 19, 2013
+    HPCG - 2.0 - January 28, 2014
 
     Michael A. Heroux
-    Scalable Algorithms Group, Computing Research Division
+    Scalable Algorithms Group, Computing Research Center
     Sandia National Laboratories, Albuquerque, NM
 
     Piotr Luszczek

Makefile

@@ -1,9 +1,11 @@
 # -*- Makefile -*-
 
 # by default, "arch" is unknown
-arch = UNKNOWN
+#arch = UNKNOWN
+#include setup/Make.$(arch)
 
-include setup/Make.$(arch)
+setup_file = setup/Make.UNKNOWN
+include $(setup_file)
 
 HPCG_DEPS = src/CG.o src/CG_ref.o src/TestCG.o src/ComputeResidual.o \
          src/ExchangeHalo.o src/GenerateGeometry.o src/GenerateProblem.o \

Makefile.ext

@@ -1,8 +1,10 @@
 # -*- Makefile -*-
 
-arch = UNKNOWN
+#arch = UNKNOWN
+setup_file = UNKNOWN
 
-include setup/Make.$(arch)
+#include setup/Make.$(arch)
+include $(setup_file)
 
 
 HPCG_DEPS = src/CG.o \

QUICKSTART

@@ -21,12 +21,12 @@ NOTE: The instructions in this file assume you are working with a version
       mkdir My_MPI_OMP_BUILD
 
 3) 'cd' to your build directory, and run the configure command located in the
-   main hpcg directory, defining the arch argument to be the suffix of your
-   setup file defined in step 1.  Then run 'make'.
+   main hpcg directory, defining the path and file argument to be the location
+   of the setup file defined in step 1.  Then run 'make'.
 
    Example commands:
       cd My_MPI_OMP_BUILD
-      ../configure arch=My_MPI_OMP
+      ../configure ../setup/Make.My_MPI_OMP
       make
 
 4) If make is successful, you will have a bin directory containing the files
@@ -46,7 +46,7 @@ NOTE: The instructions in this file assume you are working with a version
    the results are valid, and explain how to report them.
 
    Example commands:
-      less HPCG-Benchmark-0.2_2013:09:25-17:17:52.yaml
-      mail hpcg-results@software.sandia.gov < HPCG-Benchmark-0.2_2013:09:25-17:17:52.yaml 
+      less HPCG-Benchmark-1.1_2014:01:22-22:46:06.yaml
+      mail hpcg-results@software.sandia.gov < HPCG-Benchmark-1.1_2014:01:22-22:46:06.yaml
 
 6) If results are not valid, do not submit them.

TODO

@@ -3,7 +3,6 @@
  HPCG - 2.0 - January 28, 2014
 ==============================================================
 
-- Add support for TUNING and OFFICIAL execution modes.
 - Add support for derived MPI Communicators (other than MPI_COMM_WORLD)
 
 ==============================================================

TUNING

@@ -32,14 +32,16 @@ Sandia National Laboratories; University of Tennessee, Knoxville
 * Line 3: This line specifies the local (to an MPI process) dimensions of the
 problem. By default, this line reads:
 
-100 100 100
+104 104 104
 
 which means that each MPI process will be computing a solution for a cube of
-size 100 points.
+size 104 points.
 
 * Line 4: This line specifies the number of seconds of how long the timed
 portion of the benchmark should run. By default, this line reads:
 
-18000
+60
 
-which means that the timed portion of the benchmark will run 5 hours.
+which means that the timed portion of the benchmark will run 1 minute.
+This length of time is not sufficient for submitting an official run
+but does give sufficient data for tuning the benchmark in most cases.

bin/hpcg.dat

@@ -1,4 +1,4 @@
 HPCG benchmark input file
 Sandia National Laboratories; University of Tennessee, Knoxville
-100 100 100
-3600
+104 104 104
+60

configure

@@ -5,18 +5,19 @@ bld_path=`pwd`
 
 #FIXME: need to check whether src and bld are the same (test f1 -ef f2)
 
-if test x"$#" != x"1" -o x`echo "$1" | sed -e 's/arch=..*/arch=/'` != x"arch=" -o x`echo "$1" | sed -e 's/arch=//'` = "x" ; then
-  echo
-  echo Please specify '"'arch'"' argument, for example:
-  echo
-  echo $0 arch=Unix
-  echo
-  exit 127
-fi
+#if test x"$#" != x"1" -o x`echo "$1" | sed -e 's/arch=..*/arch=/'` != x"arch=" -o x`echo "$1" | sed -e 's/arch=//'` = "x" ; then
+#  echo
+#  echo Please specify '"'arch'"' argument, for example:
+#  echo
+#  echo $0 arch=Unix
+#  echo
+#  exit 127
+#fi
 
-arg_arch=`echo "$1" | sed -e 's/arch=//'`
+#arg_arch=`echo "$1" | sed -e 's/arch=//'`
 
-setup_file=${src_path}/setup/Make.${arg_arch}
+#setup_file=${src_path}/setup/Make.${arg_arch}
+setup_file="$1"
 
 if test ! -f $setup_file ; then
   echo
@@ -31,7 +32,8 @@ if test -d $mkfile -o -f $mkfile ; then
   rm -rf $mkfile
 fi
 
-sed -e "s:HPCG_ROOT_PATH:${bld_path}:g" ${src_path}/Makefile.ext | sed -e "s:HPCG_SRC_PATH:${src_path}:g" | sed -e "s:UNKNOWN:${arg_arch}:" > $mkfile
+#sed -e "s:HPCG_ROOT_PATH:${bld_path}:g" ${src_path}/Makefile.ext | sed -e "s:HPCG_SRC_PATH:${src_path}:g" | sed -e "s:UNKNOWN:${arg_arch}:" > $mkfile
+sed -e "s:HPCG_ROOT_PATH:${bld_path}:g" ${src_path}/Makefile.ext | sed -e "s:HPCG_SRC_PATH:${src_path}:g" | sed -e "s:UNKNOWN:${setup_file}:" > $mkfile
 
 # creating missing directories
 for path in src testing bin setup

setup/Make.UNKNOWN

@@ -2,7 +2,7 @@
 
 arch=UNKNOWN
 
-VERSION = 1.1
+VERSION = 2.0
 
 UNKNOWN:
 	@echo

src/GenerateCoarseProblem.cpp

@@ -64,7 +64,6 @@ void GenerateCoarseProblem(const SparseMatrix & Af) {
   }
 
 
-  local_int_t localNumberOfNonzeros = 0;
   // TODO:  This triply nested loop could be flattened or use nested parallelism
 #ifndef HPCG_NOOPENMP
   #pragma omp parallel for

src/ReportResults.cpp

@@ -82,7 +82,6 @@ void ReportResults(const SparseMatrix & A, int numberOfMgLevels, int numberOfCgS
     double fnops_precond = 0.0;
     const SparseMatrix * Af = &A;
     for (int i=1; i<numberOfMgLevels; ++i) {
-        double fnrow_Af = Af->totalNumberOfRows;
         double fnnz_Af = Af->totalNumberOfNonzeros;
         double fnumberOfPresmootherSteps = Af->mgData->numberOfPresmootherSteps;
         double fnumberOfPostsmootherSteps = Af->mgData->numberOfPostsmootherSteps;

testing/main.cpp

@@ -117,7 +117,7 @@ int main(int argc, char * argv[]) {
   Vector b, x, xexact;
   GenerateProblem(A, &b, &x, &xexact);
   SetupHalo(A);
-  int numberOfMgLevels = 3; // Number of levels including first
+  int numberOfMgLevels = 4; // Number of levels including first
   SparseMatrix * curLevelMatrix = &A;
   for (int level = 1; level< numberOfMgLevels; ++level) {
 	  GenerateCoarseProblem(*curLevelMatrix);

tools/hpcg.dox

@@ -32,7 +32,7 @@ PROJECT_NAME           = HPCG
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         ="Version 1.1"
+PROJECT_NUMBER         ="Version 2.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer