applied reviewer suggestions

This commit is contained in:
Gilbert Brietzke 2019-07-04 20:37:31 +02:00
parent 6892558456
commit 7db1540bc6

View File

@ -16,11 +16,15 @@ class Asagi(CMakePackage):
homepage = "https://github.com/TUM-I5/ASAGI" homepage = "https://github.com/TUM-I5/ASAGI"
git = "https://github.com/TUM-I5/ASAGI.git" git = "https://github.com/TUM-I5/ASAGI.git"
version('f633f96', commit='f633f96931ae00805f599078d5a1a6a830881554', version('1.0.1', commit='f633f96931ae00805f599078d5a1a6a830881554',
submodules=True, preferred=True) submodules=True, preferred=True)
version('1.0', commit='f67250798b435c308b9a1e7516f916f7855534ec',
submodules=True)
variant('link_type', default='shared',
description='build shared and/or static libraries',
values=('static', 'shared'), multi=True)
variant('shared', default=True, description="enable shared libraries")
variant('static', default=False, description="enable static libraries")
variant('fortran', default=True, description="enable fortran support") variant('fortran', default=True, description="enable fortran support")
variant('maxDimensions', default=4, variant('maxDimensions', default=4,
description="max. number of dimensions supported") description="max. number of dimensions supported")
@ -43,44 +47,24 @@ class Asagi(CMakePackage):
depends_on('netcdf ~mpi', when="~mpi") depends_on('netcdf ~mpi', when="~mpi")
depends_on('numactl', when="+numa") depends_on('numactl', when="+numa")
conflicts('%gcc@5:', when='@:1.0.0')
def cmake_args(self): def cmake_args(self):
args = [] link_type = self.spec.variants['link_type'].value
spec = self.spec
args.append('-DMAX_DIMENSIONS=' + args = ['-DMAX_DIMENSIONS=' + spec.variants['maxDimensions'].value,
self.spec.variants['maxDimensions'].value) '-DSHARED_LIB=' + ('ON' if 'shared' in link_type else 'OFF'),
'-DSTATIC_LIB=' + ('ON' if 'static' in link_type else 'OFF'),
if '~shared' in self.spec: '-DFORTRAN_SUPPORT=' + ('ON' if '+fortran' in spec else 'OFF'),
args.append('-DSHARED_LIB=OFF') '-DTHREADSAFE=' + ('ON' if '+threadsafe' in spec else 'OFF'),
'-DNOMPI=' + ('ON' if '~mpi' in spec else 'OFF'),
if '+static' in self.spec: '-DMPI3=' + ('ON' if '+mpi3' in spec else 'OFF'),
args.append('-DSTATIC_LIB=ON') '-DNONUMA=' + ('ON' if '~numa' in spec else 'OFF'),
'-DTESTS=' + ('ON' if '+tests' in spec else 'OFF'),
if '~fortran' in self.spec: '-DEXAMPLES=' + ('ON' if '+tests' in spec else 'OFF'),
args.append('-DFORTRAN_SUPPORT=OFF') '-DTHREADSAFE_COUNTER='
+ ('ON' if '+threadsafeCounter' in spec else 'OFF'),
if '~threadsafe' in self.spec: '-DTHREADSAFE_MPI='
args.append('-DTHREADSAFE=OFF') + ('ON' if '+threadsafeMPI' in spec else 'OFF'), ]
if '+threadsafeCounter' in self.spec:
args.append('-DTHREADSAFE_COUNTER=ON')
if '~threadsafeMPI' in self.spec:
args.append('-DTHREADSAFE_MPI=OFF')
if '~mpi' in self.spec:
args.append('-DNOMPI=ON')
if '~mpi3' in self.spec:
args.append('-DMPI3=OFF')
if '~numa' in self.spec:
args.append('-DNONUMA=ON')
if '+tests' in self.spec:
args.append('-DTESTS=ON')
if '+examples' in self.spec:
args.append('-DEXAMPLES=ON')
return args return args