diff options
| author | Satish Balay <balay@mcs.anl.gov> | 2019-10-23 09:29:28 -0500 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-10-23 09:29:28 -0500 |
| commit | 25d63aa44c240ef22c57bbcbec47ff1d247f6a46 (patch) | |
| tree | ebcf955dd2688c0faf829c36d16337497c833b5d | |
| parent | af65146ef69fcde10d53b2ee12f82a9c28361e23 (diff) | |
| download | spack-25d63aa44c240ef22c57bbcbec47ff1d247f6a46.tar.gz spack-25d63aa44c240ef22c57bbcbec47ff1d247f6a46.tar.bz2 spack-25d63aa44c240ef22c57bbcbec47ff1d247f6a46.tar.xz spack-25d63aa44c240ef22c57bbcbec47ff1d247f6a46.zip | |
petsc: add version 3.12.1 [and variant: batch] (#13390)
* petsc: add version 3.12.1 [and variant: batch]
* fix test_prs_update_old_api errors
| -rw-r--r-- | var/spack/repos/builtin/packages/petsc/package.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 72f331b136..e436ffd02f 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -24,6 +24,7 @@ class Petsc(Package): version('develop', branch='master') version('xsdk-0.2.0', tag='xsdk-0.2.0') + version('3.12.1', sha256='b72d895d0f4a79acb13ebc782b47b26d10d4e5706d399f533afcd5b3dba13737') version('3.12.0', sha256='ba9ecf69783c7ebf05bd1c91dd1d4b38bf09b7a2d5f9a774aa6bb46deff7cb14') version('3.11.4', sha256='319cb5a875a692a67fe5b1b90009ba8f182e21921ae645d38106544aff20c3c1') version('3.11.3', sha256='199ad9650a9f58603b49e7fff7cd003ceb03aa231e5d37d0bf0496c6348eca81') @@ -94,6 +95,8 @@ class Petsc(Package): description='Build for KNL') variant('X', default=False, description='Activate X support') + variant('batch', default=False, + description='Enable when mpiexec is not available to run binaries') # 3.8.0 has a build issue with MKL - so list this conflict explicitly conflicts('^intel-mkl', when='@3.8.0') @@ -240,6 +243,8 @@ class Petsc(Package): '--with-blas-lapack-lib=%s' % lapack_blas.joined() ]) + if '+batch' in spec: + options.append('--with-batch=1') if '+knl' in spec: options.append('--with-avx-512-kernels') options.append('--with-memalign=64') @@ -372,19 +377,20 @@ class Petsc(Package): '-pc_type', 'hypre', '-pc_hypre_type', 'boomeramg') - def setup_environment(self, spack_env, run_env): + def setup_build_environment(self, env): # configure fails if these env vars are set outside of Spack - spack_env.unset('PETSC_DIR') - spack_env.unset('PETSC_ARCH') + env.unset('PETSC_DIR') + env.unset('PETSC_ARCH') + def setup_run_environment(self, env): # Set PETSC_DIR in the module file - run_env.set('PETSC_DIR', self.prefix) - run_env.unset('PETSC_ARCH') + env.set('PETSC_DIR', self.prefix) + env.unset('PETSC_ARCH') - def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + def setup_dependent_build_environment(self, env, dependent_spec): # Set up PETSC_DIR for everyone using PETSc package - spack_env.set('PETSC_DIR', self.prefix) - spack_env.unset('PETSC_ARCH') + env.set('PETSC_DIR', self.prefix) + env.unset('PETSC_ARCH') @property def headers(self): |