Variant for enabling tests, versions, cleanup (#13882)

* add variant for enabling testing

* enable tests and clean up other options

* add numbered versions

* updates to avoid enable_tests variant; correct versioning

* fixes for style

* appropriate partitioners are enabled if 'all' is specified - so no need to check in spec

* define url so spack knows how to fetch the tar.gz files for different versions

1 files changed, 52 insertions, 33 deletions

diff --git a/var/spack/repos/builtin/packages/mstk/package.py b/var/spack/repos/builtin/packages/mstk/package.py
index 53c3d3333b..f2d5f3867e 100644
--- a/var/spack/repos/builtin/packages/mstk/package.py
+++ b/var/spack/repos/builtin/packages/mstk/package.py
@@ -23,34 +23,53 @@ class Mstk(CMakePackage):
 
     homepage = "https://github.com/MeshToolkit/MSTK"
     git      = "https://github.com/MeshToolkit/MSTK"
+    url      = "https://github.com/MeshToolkit/MSTK/archive/3.2.1.tar.gz"
 
-    maintainers = ['julienloiseau']
+    maintainers = ['raovgarimella', 'julienloiseau']
 
     version('master', branch='master')
+    version('3.2.1', sha256='09bc6684abb576e34c324322db6f71f8987c6ec436a54256b85ef4db40185470')
+    version('3.2.0', sha256='57e58c5a7a456dbc608ce9f834a06c212a1aa64ac3ebc880ea0b8a19b000dab0')
+    version('3.1.3', sha256='03f6901cd6d563e1705a173c1a2fbbef10ab9a43f533f6ba758e357c03bdfa16')
+    version('3.1.2', sha256='1eb44c29554f45695f875fc60ab81554a2c46a041ef58a7224f3767d30e2846e')
+    version('3.1.1', sha256='5a03873c69fb38acd7ce27f2a5fa0643dd1cfcc3e214cff4aa26ee717651cc0b')
+    version('3.1.0', sha256='70e68d8a90cd2367015e0ab3459ed230a7995ad2297671742d9be6e28bc03dcf')
+    version('3.0.4', sha256='99e4c996bf22fd325335ed1391dfe735b0a338e8e4d733204d56dde7ef4eedf3')
+    version('3.0.3', sha256='618e371a48077f2b4ccfafd4d174c05f007b2ea7a51e0399df67442639409518')
+    version('3.0.2', sha256='b0172cd68e5137b8585d82c37b8a4af4b7e884f04d1b7d006a399d39447fe89e')
+    version('3.0.1', sha256='d44e4bf01b118b1d19710aa839b3f5f0c1a8391264a435f641ba4bd23bcf45ec')
+    version('3.0.0', sha256='d993ff5fc6c431067eb97e4089835c7790397d9c1ad88a56523c0591d451df19')
 
-    variant('parallel', default='none', description='Enable Parallel Support',
-            values=('none', 'metis', 'zoltan', 'parmetis'), multi=True)
     variant('exodusii', default=False, description='Enable ExodusII')
-    variant('use_markers', default=True, description="Enable MSTK to use markers")
+    variant('use_markers', default=True, description='Enable use of markers')
+    variant('parallel', default=False, description='Enable Parallel Support')
+    variant('partitioner', default='none',
+            values=('none', 'metis', 'zoltan', 'all'),
+            multi=False, description='Choose partitioner')
+    conflicts('partitioner=none', when='+parallel')
+    conflicts('partitioner=all', when='-parallel')
+    conflicts('partitioner=zoltan', when='-parallel')
 
-    depends_on("cmake@3.8:", type='build')
+    # MSTK turns on METIS only for parallel buildsu
+    conflicts('partitioner=metis', when='-parallel')
 
-    # Parallel variant
-    depends_on("mpi", when='parallel=metis')
-    depends_on("mpi", when='parallel=zoltan')
-    depends_on("mpi", when='parallel=parmetis')
-    depends_on("zoltan -fortran", when='parallel=zoltan')
-    depends_on("zoltan -fortran +parmetis", when='parallel=parmetis')
-    depends_on("zoltan -fortran +parmetis", when="parallel=zoltan +exodusii")
-    depends_on("metis", when="parallel=zoltan +exodusii")
+    # dependencies
+    depends_on('cmake@3.11:', type='build')
 
-    depends_on("metis", when='parallel=metis')
-    depends_on("metis", when='parallel=parmetis')
+    #
+    depends_on('mpi', when='+parallel')
+
+    depends_on('zoltan -fortran', when='partitioner=zoltan')
+    depends_on('zoltan -fortran', when='partitioner=all')
+    depends_on('metis', when='partitioner=metis')
+    depends_on('metis', when='partitioner=all')
 
     # Exodusii variant
     # The default exodusii build with mpi support
-    # It includes netcdf which includes hdf5
-    depends_on("exodusii", when='+exodusii')
+    depends_on('exodusii', when='+exodusii')
+
+    # Unit testing variant
+    depends_on('unittest-cpp', type='test')
 
     def cmake_args(self):
         options = []
@@ -60,29 +79,23 @@ class Mstk(CMakePackage):
             options.append('-DMSTK_USE_MARKERS=OFF')
 
         # Parallel variant
-        if not self.spec.satisfies('parallel=none'):
-            # Use mpi for compilation
-            options.append('-DCMAKE_CXX_COMPILER=' + self.spec['mpi'].mpicxx)
-            options.append('-DCMAKE_C_COMPILER=' + self.spec['mpi'].mpicc)
+        if '+parallel' in self.spec:
             options.append('-DENABLE_PARALLEL=ON')
         else:
             options.append('-DENABLE_PARALLEL=OFF')
 
-        if ("parmetis" in self.spec or "zoltan" in self.spec and
-            "+exodusii" in self.spec):
-            options.append("-DENABLE_METIS=ON")
-            options.append("-DENABLE_ZOLTAN=ON")
-            options.append('-DZOLTAN_NEEDS_ParMETIS=ON')
+        if 'partitioner=none' in self.spec:
+            options.append('-DENABLE_METIS=OFF')
+            options.append('-DENABLE_ZOLTAN=OFF')
         else:
-            if "zoltan" in self.spec:
-                options.append("-DENABLE_ZOLTAN=ON")
+            if 'zoltan' in self.spec:
+                options.append('-DENABLE_ZOLTAN=ON')
             else:
-                options.append("-DENABLE_ZOLTAN=OFF")
-            if "metis" in self.spec:
-                options.append("-DENABLE_METIS=ON")
+                options.append('-DENABLE_ZOLTAN=OFF')
+            if 'metis' in self.spec:
+                options.append('-DENABLE_METIS=ON')
             else:
-                options.append("-DENABLE_METIS=OFF")
-            options.append('-DZOLTAN_NEEDS_ParMETIS=OFF')
+                options.append('-DENABLE_METIS=OFF')
 
         # ExodusII variant
         if '+exodusii' in self.spec:
@@ -90,4 +103,10 @@ class Mstk(CMakePackage):
         else:
             options.append('-DENABLE_ExodusII=OFF')
 
+        # Unit test variant
+        if self.run_tests:
+            options.append('-DENABLE_Tests=ON')
+        else:
+            options.append('-DENABLE_Tests=OFF')
+
         return options