zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

petsc: add +hwloc and +openmp variants (#23675)

Browse Source
This commit is contained in:
lpoirel 2021-06-01 11:37:19 +02:00 committed by GitHub
parent 389b02cf71
commit f8794afcbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/petsc/package.py
View File

@ -141,6 +141,10 @@ class Petsc(Package):
description='Activates support for Saws') description='Activates support for Saws')
variant('libyaml', default=False, variant('libyaml', default=False,
description='Activates support for YAML') description='Activates support for YAML')
variant('openmp', default=False,
description='Activates support for openmp')
variant('hwloc', default=False,
description='Activates support for hwloc')
# 3.8.0 has a build issue with MKL - so list this conflict explicitly # 3.8.0 has a build issue with MKL - so list this conflict explicitly
conflicts('^intel-mkl', when='@3.8.0') conflicts('^intel-mkl', when='@3.8.0')
@ -247,8 +251,10 @@ class Petsc(Package):
depends_on('superlu-dist@xsdk-0.2.0+int64', when='@xsdk-0.2.0+superlu-dist+mpi+int64') depends_on('superlu-dist@xsdk-0.2.0+int64', when='@xsdk-0.2.0+superlu-dist+mpi+int64')
depends_on('superlu-dist@develop~int64', when='@main+superlu-dist+mpi~int64') depends_on('superlu-dist@develop~int64', when='@main+superlu-dist+mpi~int64')
depends_on('superlu-dist@develop+int64', when='@main+superlu-dist+mpi+int64') depends_on('superlu-dist@develop+int64', when='@main+superlu-dist+mpi+int64')
depends_on('mumps+mpi~int64~metis~parmetis', when='+mumps~metis') depends_on('mumps+mpi~int64~metis~parmetis~openmp', when='+mumps~metis~openmp')
depends_on('mumps+mpi~int64+metis+parmetis', when='+mumps+metis') depends_on('mumps+mpi~int64+metis+parmetis~openmp', when='+mumps+metis~openmp')
depends_on('mumps+mpi~int64~metis~parmetis+openmp', when='+mumps~metis+openmp')
depends_on('mumps+mpi~int64+metis+parmetis+openmp', when='+mumps+metis+openmp')
depends_on('scalapack', when='+mumps') depends_on('scalapack', when='+mumps')
depends_on('trilinos@12.6.2:+mpi', when='@3.7.0:+trilinos+mpi') depends_on('trilinos@12.6.2:+mpi', when='@3.7.0:+trilinos+mpi')
depends_on('trilinos@xsdk-0.2.0+mpi', when='@xsdk-0.2.0+trilinos+mpi') depends_on('trilinos@xsdk-0.2.0+mpi', when='@xsdk-0.2.0+trilinos+mpi')
@ -272,6 +278,7 @@ class Petsc(Package):
depends_on('p4est+mpi', when='+p4est+mpi') depends_on('p4est+mpi', when='+p4est+mpi')
depends_on('saws', when='+saws') depends_on('saws', when='+saws')
depends_on('libyaml', when='+libyaml') depends_on('libyaml', when='+libyaml')
depends_on('hwloc', when='+hwloc')
# Using the following tarballs # Using the following tarballs
# * petsc-3.12 (and older) - includes docs # * petsc-3.12 (and older) - includes docs
@ -368,6 +375,9 @@ def install(self, spec, prefix):
'--with-scalapack=0' '--with-scalapack=0'
]) ])
if spec.satisfies('+openmp'):
options.append('--with-openmp=1')
# Activates library support if needed (i.e. direct dependency) # Activates library support if needed (i.e. direct dependency)
if '^libjpeg-turbo' in spec: if '^libjpeg-turbo' in spec:
jpeg_library = 'libjpeg-turbo' jpeg_library = 'libjpeg-turbo'
@ -378,7 +388,7 @@ def install(self, spec, prefix):
'trilinos', 'fftw', 'valgrind', 'gmp', 'libpng', 'trilinos', 'fftw', 'valgrind', 'gmp', 'libpng',
'giflib', 'mpfr', 'netcdf-c', 'parallel-netcdf', 'giflib', 'mpfr', 'netcdf-c', 'parallel-netcdf',
'moab', 'random123', 'exodusii', 'cgns', 'memkind', 'moab', 'random123', 'exodusii', 'cgns', 'memkind',
'p4est', 'saws', 'libyaml', jpeg_library): 'p4est', 'saws', 'libyaml', 'hwloc', jpeg_library):
# Cannot check `library in spec` because of transitive deps # Cannot check `library in spec` because of transitive deps
# Cannot check variants because parmetis keys on +metis # Cannot check variants because parmetis keys on +metis
library_requested = library in spec.dependencies_dict() library_requested = library in spec.dependencies_dict()