Add a new package for AMG and fix build issues in the amg2013 package (#5909)

* amg2013: fix build issues

* amg: add new package

* Update package.py

* amg2013: standardize option name

* amg: standardize option names

2 files changed, 90 insertions, 12 deletions

diff --git a/var/spack/repos/builtin/packages/amg/package.py b/var/spack/repos/builtin/packages/amg/package.py
new file mode 100644
index 0000000000..7fde4b08fc
--- /dev/null
+++ b/var/spack/repos/builtin/packages/amg/package.py
@@ -0,0 +1,74 @@
+##############################################################################
+# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 0s2111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Amg(MakefilePackage):
+    """AMG is a parallel algebraic multigrid solver for linear systems arising
+       from problems on unstructured grids.  The driver provided with AMG
+       builds linear systems for various 3-dimensional problems.
+    """
+    tags = ['proxy-app', 'ecp-proxy-app']
+
+    homepage = "https://codesign.llnl.gov/amg2013.php"
+    git      = "https://github.com/LLNL/AMG"
+
+    version('1.0', git=git, tag='1.0')
+    version('develop', git=git, branch='master')
+
+    variant('openmp', default=True, description='Build with OpenMP support')
+    variant('optflags', default=False, description='Additional optimizations')
+    variant('int64', default=False, description='Use 64-bit integers for global variables')
+
+    depends_on('mpi')
+
+    @property
+    def build_targets(self):
+        targets = []
+
+        include_cflags = ['-DTIMER_USE_MPI']
+        include_lflags = ['-lm']
+
+        if '+openmp' in self.spec:
+            include_cflags.append('-DHYPRE_USING_OPENMP')
+            include_cflags.append(self.compiler.openmp_flag)
+            include_lflags.append(self.compiler.openmp_flag)
+            if '+optflags' in self.spec:
+                include_cflags.append('-DHYPRE_USING_PERSISTENT_COMM')
+                include_cflags.append('-DHYPRE_HOPSCOTCH')
+
+        if '+int64' in self.spec:
+            include_cflags.append('-DHYPRE_BIGINT')
+
+        targets.append('INCLUDE_CFLAGS={0}'.format(' '.join(include_cflags)))
+        targets.append('INCLUDE_LFLAGS={0}'.format(' '.join(include_lflags)))
+        targets.append('CC={0}'.format(self.spec['mpi'].mpicc))
+
+        return targets
+
+    def install(self, spec, prefix):
+        mkdirp(prefix.bin)
+        install('test/amg', prefix.bin)
+        install_tree('docs', prefix.docs)
diff --git a/var/spack/repos/builtin/packages/amg2013/package.py b/var/spack/repos/builtin/packages/amg2013/package.py
index 2a2d8ffbb1..3aace51dfb 100644
--- a/var/spack/repos/builtin/packages/amg2013/package.py
+++ b/var/spack/repos/builtin/packages/amg2013/package.py
@@ -40,7 +40,8 @@ class Amg2013(MakefilePackage):
             url='https://codesign.llnl.gov/amg2013/amg2013.tgz')
 
     variant('openmp', default=True, description='Build with OpenMP support')
-    variant('assumepartition', default=False, description='Assumed partition (for thousands of processors)')
+    variant('assumedpartition', default=False, description='Use assumed partition (for thousands of processors)')
+    variant('int64', default=False, description='Use 64-bit integers for global variables')
 
     depends_on('mpi')
 
@@ -48,16 +49,19 @@ class Amg2013(MakefilePackage):
     def build_targets(self):
         targets = []
 
-        include_cflags = ' -DTIMER_USE_MPI '
-        include_lflags = ' -lm '
-
-        if '+assumepartition' in self.spec:
-            include_cflags += ' -DHYPRE_NO_GLOBAL_PARTITION '
+        include_cflags = ['-DTIMER_USE_MPI']
+        include_lflags = ['-lm']
 
         if '+openmp' in self.spec:
-            include_cflags += ' -DHYPRE_USING_OPENMP '
-            include_cflags += self.compiler.openmp_flag
-            include_lflags += ' ' + self.compiler.openmp_flag
+            include_cflags.append('-DHYPRE_USING_OPENMP')
+            include_cflags.append(self.compiler.openmp_flag)
+            include_lflags.append(self.compiler.openmp_flag)
+
+        if '+assumedpartition' in self.spec:
+            include_cflags.append('-DHYPRE_NO_GLOBAL_PARTITION')
+
+        if '+int64' in self.spec:
+            include_cflags.append('-DHYPRE_LONG_LONG')
 
         targets.append('INCLUDE_CFLAGS={0}'.format(' '.join(include_cflags)))
         targets.append('INCLUDE_LFLAGS={0}'.format(' '.join(include_lflags)))
@@ -68,6 +72,6 @@ class Amg2013(MakefilePackage):
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
         install('test/amg2013', prefix.bin)
-        install_tree('docs', prefix.doc)
-        install('COPYRIGHT', prefix.doc)
-        install('COPYING.LESSER', prefix.doc)
+        install_tree('docs', prefix.docs)
+        install('COPYRIGHT', prefix.docs)
+        install('COPYING.LESSER', prefix.docs)