Add mumax-3.10 release version (#18740)

This PR adds the current release version of mumax and tweaks the install
of the previous beta version.

- Set the url parameter to reflect the release version over the beta
  version. Hopefully, this will be consistent going forward.
- Set an explicit url for the previous beta version.
- Accept values for `cuda_arch`. The previous version had its own list
  but the release version does not.
- Replace the built in cuda compute capabilities list with the one
  provided by Spack for the 3.10beta version.

1 files changed, 27 insertions, 5 deletions

diff --git a/var/spack/repos/builtin/packages/mumax/package.py b/var/spack/repos/builtin/packages/mumax/package.py
index ac9183c45e..e221ece6bc 100644
--- a/var/spack/repos/builtin/packages/mumax/package.py
+++ b/var/spack/repos/builtin/packages/mumax/package.py
@@ -12,14 +12,19 @@ class Mumax(MakefilePackage, CudaPackage):
     """GPU accelerated micromagnetic simulator."""
 
     homepage = "http://mumax.github.io"
-    url      = "https://github.com/mumax/3/archive/3.10beta.tar.gz"
+    url      = "https://github.com/mumax/3/archive/v3.10.tar.gz"
 
-    version('3.10beta', sha256='f20fbd90a4b531fe5a0d8acc3d4505a092a5e426f5f53218a22a87d445daf0e9')
+    maintainers = ['glennpj']
+
+    version('3.10',
+            sha256='42c858661cec3896685ff4babea11e711f71fd6ea37d20c2bed7e4a918702caa',
+            preferred=True)
+    version('3.10beta',
+            sha256='f20fbd90a4b531fe5a0d8acc3d4505a092a5e426f5f53218a22a87d445daf0e9',
+            url='https://github.com/mumax/3/archive/3.10beta.tar.gz')
 
     variant('cuda', default=True,
             description='Use CUDA; must be true')
-    variant('cuda_arch', 'N/A',
-            description='Mumax will build GPU kernels that it supports')
     variant('gnuplot', default=False,
             description='Use gnuplot for graphs')
 
@@ -30,7 +35,17 @@ class Mumax(MakefilePackage, CudaPackage):
     conflicts('~cuda', msg='mumax requires cuda')
 
     patch('https://github.com/mumax/3/commit/2cf5c9a6985c9eb16a124c6bd96aed75b4a30c24.patch',
-          sha256='a43b2ca6c9f9edfb1fd6d916a599f85a57c8bb3f9ee38148b1988fd82feec8ad')
+          sha256='a43b2ca6c9f9edfb1fd6d916a599f85a57c8bb3f9ee38148b1988fd82feec8ad',
+          when='@3.10beta')
+
+    @property
+    def cuda_arch(self):
+        cuda_arch = ' '.join(self.spec.variants['cuda_arch'].value)
+        if cuda_arch == 'none':
+            raise InstallError(
+                'Must select at least one value for cuda_arch'
+            )
+        return cuda_arch
 
     @property
     def gopath(self):
@@ -50,11 +65,18 @@ class Mumax(MakefilePackage, CudaPackage):
 
     # filter out targets that do not exist
     def edit(self, spec, prefix):
+        filter_file(r'(^all: cudakernels) hooks$', r'\1', 'Makefile')
+
+    @when('@3.10beta')
+    def edit(self, spec, prefix):
         filter_file(r'(^ln -sf .*)', r'#\1', 'make.bash')
         filter_file(r'(^\(cd test)', r'#\1', 'make.bash')
+        filter_file(r'(for cc in ).*(; do)', r'\1{0}\2'.format(self.cuda_arch),
+                    'cuda/make.bash')
 
     def setup_build_environment(self, env):
         env.prepend_path('GOPATH', self.gopath)
+        env.set('CUDA_CC', self.cuda_arch)
 
     def install(self, spec, prefix):
         make()