diff options
| author | Robert Pavel <rspavel@lanl.gov> | 2020-04-01 12:32:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 13:32:15 -0500 |
| commit | 47f135534ca3a8cf5f370fb0656c5d238741cdb7 (patch) | |
| tree | 969677f46e56340e6c64edb0b98c71711ac80dfd /var | |
| parent | 64b14b64c00bc6885acc1ff4d9b76898f66a8a86 (diff) | |
| download | spack-47f135534ca3a8cf5f370fb0656c5d238741cdb7.tar.gz spack-47f135534ca3a8cf5f370fb0656c5d238741cdb7.tar.bz2 spack-47f135534ca3a8cf5f370fb0656c5d238741cdb7.tar.xz spack-47f135534ca3a8cf5f370fb0656c5d238741cdb7.zip | |
Added v3 of Laghos (#15806)
* Added v3 of Laghos
Added v3 of Laghos as per
https://github.com/CEED/Laghos/blob/v3.0/README.md
* Update var/spack/repos/builtin/packages/laghos/package.py
Changed develop->master as per PR
Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>
* Made Metis Dependency Explicit
Added explicit metis dependency
* Folded @develop Laghos Deps in to @3.0:
Theoretically there will be a difference between develop and 3.0: in the
future but currently there is not
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/laghos/package.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index 7edb886a83..438da2f5cf 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -18,15 +18,15 @@ class Laghos(MakefilePackage): url = "https://github.com/CEED/Laghos/archive/v1.0.tar.gz" git = "https://github.com/CEED/Laghos.git" - version('develop', branch='master') + version('master', branch='master') + version('3.0', sha256='4db56286e15b42ecdc8d540c4888a7dec698b019df9c7ccb8319b7ea1f92d8b4') version('2.0', sha256='dd3632d5558889beec2cd3c49eb60f633f99e6d886ac868731610dd006c44c14') version('1.1', sha256='53b9bfe2af263c63eb4544ca1731dd26f40b73a0d2775a9883db51821bf23b7f') version('1.0', sha256='af50a126355a41c758fcda335a43fdb0a3cd97e608ba51c485afda3dd84a5b34') variant('metis', default=True, description='Enable/disable METIS support') - depends_on('mfem@develop+mpi+metis', when='@develop+metis') - depends_on('mfem@develop+mpi~metis', when='@develop~metis') + depends_on('metis@4.0.3:', when='+metis') # Recommended mfem version for laghos v2.0 is: ^mfem@3.4.1-laghos-v2.0 depends_on('mfem@3.4.0:+mpi+metis', when='@2.0+metis') @@ -36,6 +36,11 @@ class Laghos(MakefilePackage): depends_on('mfem@3.3.1-laghos-v1.0:+mpi+metis', when='@1.0,1.1+metis') depends_on('mfem@3.3.1-laghos-v1.0:+mpi~metis', when='@1.0,1.1~metis') + # 3.0 requirements + depends_on('hypre@2.11.2', when='@3.0:') + depends_on('mfem@develop+mpi+metis', when='@3.0:+metis') + depends_on('mfem@develop+mpi~metis', when='@3.0:~metis') + @property def build_targets(self): targets = [] @@ -46,6 +51,11 @@ class Laghos(MakefilePackage): targets.append('TEST_MK=%s' % spec['mfem'].package.test_mk) targets.append('CXX=%s' % spec['mpi'].mpicxx) + if self.version >= ver('3.0'): + targets.append('HYPRE_DIR=%s' % spec['hypre'].prefix) + if '+metis' in self.spec: + targets.append('METIS_DIR=%s' % spec['metis'].prefix) + return targets # See lib/spack/spack/build_systems/makefile.py |