Update STRUMPACK package: (#9580)

* add new version 3.1.0
* add conflict for parmetis without mpi
* strumpack >= 3.1.0 uses -DTPL_ENABLE_<package> instead of
  -DSTRUMPACK_USE_<package>
* require cmake at least 3.2

1 files changed, 26 insertions, 40 deletions

diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py
index b332b7fa90..cb0108e91a 100644
--- a/var/spack/repos/builtin/packages/strumpack/package.py
+++ b/var/spack/repos/builtin/packages/strumpack/package.py
@@ -22,6 +22,7 @@ class Strumpack(CMakePackage):
     git      = "https://github.com/pghysels/STRUMPACK.git"
 
     version('master', branch='master')
+    version('3.1.0', sha256='b4f91b7d433955518b04538be1c726afc5de4bffb163e982ef8844d391b26fa7')
     version('3.0.3', sha256='2bd2a40d9585b769ae4ba461de02c6e36433bf2b21827f824a50f2fdf73389f7')
     version('3.0.2', sha256='828e5ec59019b2c74e008745b04ceebbb7ef1313fb4e3ac01fa8ff350799df38')
     version('3.0.1', sha256='b4a4d870c589937e22e77a6c4b52a96fd808f0b564e363f826ae5ffc94b9d000')
@@ -46,19 +47,24 @@ class Strumpack(CMakePackage):
     variant('build_tests', default=False,
             description='Build test routines')
 
-    depends_on('cmake', type='build')
+    depends_on('cmake@3.2:', type='build')
     depends_on('mpi', when='+mpi')
     depends_on('blas')
     depends_on('lapack')
     depends_on('scalapack', when='+mpi')
     depends_on('metis')
-    depends_on('parmetis', when='+parmetis+mpi')
+    depends_on('parmetis', when='+parmetis')
     depends_on('scotch~metis', when='+scotch')
     depends_on('scotch~metis+mpi', when='+scotch+mpi')
 
+    conflicts('+parmetis', when='~mpi')
+
     def cmake_args(self):
         spec = self.spec
 
+        def on_off(varstr):
+            return 'ON' if varstr in spec else 'OFF'
+
         if '+mpi' in spec:
             args = ['-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc,
                     '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx,
@@ -67,43 +73,23 @@ class Strumpack(CMakePackage):
         else:
             args = ['-DSTRUMPACK_USE_MPI=OFF']
 
-        if '+openmp' in spec:
-            args.append('-DSTRUMPACK_USE_OPENMP=ON')
-        else:
-            args.append('-DSTRUMPACK_USE_OPENMP=OFF')
-
-        if spec.satisfies('+parmetis+mpi'):
-            args.append('-DSTRUMPACK_USE_PARMETIS=ON')
-        else:
-            args.append('-DSTRUMPACK_USE_PARMETIS=OFF')
-
-        if '+scotch' in spec:
-            args.append('-DSTRUMPACK_USE_SCOTCH=ON')
-        else:
-            args.append('-DSTRUMPACK_USE_SCOTCH=OFF')
-
-        if '+c_interface' in spec:
-            args.append('-DSTRUMPACK_C_INTERFACE=ON')
-        else:
-            args.append('-DSTRUMPACK_C_INTERFACE=OFF')
-
-        if '+count_flops' in spec:
-            args.append('-DSTRUMPACK_COUNT_FLOPS=ON')
-        else:
-            args.append('-DSTRUMPACK_COUNT_FLOPS=OFF')
-
-        if '+task_timers' in spec:
-            args.append('-DSTRUMPACK_TASK_TIMERS=ON')
-        else:
-            args.append('-DSTRUMPACK_TASK_TIMERS=OFF')
-
-        if '+build_dev_tests' in spec:
-            args.append('-DSTRUMPACK_DEV_TESTING=ON')
-        else:
-            args.append('-DSTRUMPACK_DEV_TESTING=OFF')
-
-        if '+build_tests' in spec:
-            args.append('-DSTRUMPACK_BUILD_TESTS=ON')
+        args.extend([
+            '-DSTRUMPACK_USE_OPENMP=%s' % on_off('+openmp'),
+            '-DSTRUMPACK_C_INTERFACE=%s' % on_off('+c_interface'),
+            '-DSTRUMPACK_COUNT_FLOPS=%s' % on_off('+count_flops'),
+            '-DSTRUMPACK_TASK_TIMERS=%s' % on_off('+task_timers'),
+            '-DSTRUMPACK_DEV_TESTING=%s' % on_off('+build_dev_tests'),
+            '-DSTRUMPACK_BUILD_TESTS=%s' % on_off('+build_tests')
+        ])
+
+        if spec.satisfies('@3.0.4:'):
+            args.extend([
+                '-DTPL_ENABLE_PARMETIS=%s' % on_off('+parmetis'),
+                '-DTPL_ENABLE_SCOTCH=%s' % on_off('+scotch')
+            ])
         else:
-            args.append('-DSTRUMPACK_BUILD_TESTS=OFF')
+            args.extend([
+                '-DSTRUMPACK_USE_PARMETIS=%s' % on_off('+parmetis'),
+                '-DSTRUMPACK_USE_SCOTCH=%s' % on_off('+scotch')
+            ])
         return args