hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sirius, q-e-sirius (#18286)

Browse source 
* sirius: fix bug in shared spec

make +shared the default

* q-e-sirius: depend on sirius+shared, fix gcc@10

- add missing whitespace in -fallow-argument-mismatch.
- require sirius+shared
This commit is contained in:
Simon Pintarelli 2020-08-27 14:45:55 +02:00 committed by GitHub
parent 7fd8f74c23
commit 22329c4f92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
var/spack/repos/builtin/packages/q-e-sirius/package.py
View file

@ -57,7 +57,7 @@ class QESirius(Package):
depends_on('blas') depends_on('blas')
depends_on('lapack') depends_on('lapack')
depends_on('fftw-api@3') depends_on('fftw-api@3')
depends_on('sirius+fortran') depends_on('sirius+fortran+shared')
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')
depends_on('scalapack', when='+scalapack+mpi') depends_on('scalapack', when='+scalapack+mpi')
depends_on('elpa+openmp', when='+elpa+openmp') depends_on('elpa+openmp', when='+elpa+openmp')
@ -172,7 +172,6 @@ def install(self, spec, prefix):
options = ['-prefix={0}'.format(prefix_path)] options = ['-prefix={0}'.format(prefix_path)]
sirius = spec['sirius'] sirius = spec['sirius']
options.append('LIBS={0}'.format(sirius.libs[0])) options.append('LIBS={0}'.format(sirius.libs[0]))
options.append('LD_LIBS={0}'.format(sirius.libs[0])) options.append('LD_LIBS={0}'.format(sirius.libs[0]))
@ -203,7 +202,7 @@ def install(self, spec, prefix):
f90flags = 'F90FLAGS=-cpp -I {0}/sirius'.format(header_dir) f90flags = 'F90FLAGS=-cpp -I {0}/sirius'.format(header_dir)
if self.spec.satisfies('%gcc@10:'): if self.spec.satisfies('%gcc@10:'):
f90flags += '-fallow-argument-mismatch' f90flags += ' -fallow-argument-mismatch'
options.append(f90flags) options.append(f90flags)

3
var/spack/repos/builtin/packages/sirius/package.py
View file

@ -44,7 +44,7 @@ class Sirius(CMakePackage, CudaPackage):
'gfx1011', 'gfx1012' 'gfx1011', 'gfx1012'
) )
variant('shared', default=False, description="Build shared libraries") variant('shared', default=True, description="Build shared libraries")
variant('openmp', default=True, description="Build with OpenMP support") variant('openmp', default=True, description="Build with OpenMP support")
variant('fortran', default=False, description="Build Fortran bindings") variant('fortran', default=False, description="Build Fortran bindings")
variant('python', default=False, description="Build Python bindings") variant('python', default=False, description="Build Python bindings")
@ -161,7 +161,6 @@ def _def(variant, flag=None):
_def('+rocm') _def('+rocm')
] ]
if '@:6.2.999' in self.spec:
args += [_def('+shared', 'BUILD_SHARED_LIBS')] args += [_def('+shared', 'BUILD_SHARED_LIBS')]
lapack = spec['lapack'] lapack = spec['lapack']