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

sundials: update to v3.0.0 (#6004)

Browse Source
This commit is contained in:
David Gardner 2017-10-30 21:49:13 -07:00 committed by Christoph Junghans
parent 50d932d9f1
commit 10b27ec788
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
var/spack/repos/builtin/packages/sundials/package.py
View File

@ -39,9 +39,8 @@ class Sundials(CMakePackage):
# Versions # Versions
# ========================================================================== # ==========================================================================
version('3.0.0-beta-2', version('3.0.0', '5163a44cedd7398bddda442ba00313b8')
git='https://github.com/LLNL/sundials.git', tag='v3.0.0-beta-2') version('2.7.0', 'c304631b9bc82877d7b0e9f4d4fd94d3')
version('2.7.0', 'c304631b9bc82877d7b0e9f4d4fd94d3', preferred=True)
version('2.6.2', '3deeb0ede9f514184c6bd83ecab77d95') version('2.6.2', '3deeb0ede9f514184c6bd83ecab77d95')
# ========================================================================== # ==========================================================================
@ -65,9 +64,7 @@ class Sundials(CMakePackage):
) )
# Index type # Index type
# NOTE: Default to True until v3.0.0 is final as only 64bit integers are variant('int64', default=False,
# supported before v3.0.0.
variant('int64', default=True,
description='Use 64bit integers for indices') description='Use 64bit integers for indices')
# Parallelism # Parallelism
@ -140,7 +137,7 @@ class Sundials(CMakePackage):
conflicts('+examples-raja', when='@:2.7.0') conflicts('+examples-raja', when='@:2.7.0')
# External libraries incompatible with 64-bit indices # External libraries incompatible with 64-bit indices
conflicts('+lapack', when='@3.0.0-beta-2: +int64') conflicts('+lapack', when='@3.0.0: +int64')
conflicts('+hypre', when='+hypre@:2.6.1a +int64') conflicts('+hypre', when='+hypre@:2.6.1a +int64')
# External libraries incompatible with single precision # External libraries incompatible with single precision
@ -182,8 +179,8 @@ class Sundials(CMakePackage):
depends_on('suite-sparse', when='+klu') depends_on('suite-sparse', when='+klu')
# Require that external libraries built with the same precision # Require that external libraries built with the same precision
depends_on('petsc~double', when='+petsc precision=single') depends_on('petsc~double~complex', when='+petsc precision=single')
depends_on('petsc+double', when='+petsc precision=double') depends_on('petsc+double~complex', when='+petsc precision=double')
# Require that external libraries built with the same index type # Require that external libraries built with the same index type
depends_on('hypre~int64', when='+hypre ~int64') depends_on('hypre~int64', when='+hypre ~int64')
@ -227,8 +224,8 @@ def on_off(varstr):
'-DSUNDIALS_PRECISION=%s' % spec.variants['precision'].value '-DSUNDIALS_PRECISION=%s' % spec.variants['precision'].value
]) ])
# index type (after v2.7.0) # index type (v3.0.0 or later)
if not spec.satisfies('@:2.7.0'): if spec.satisfies('@3.0.0:'):
if '+int64' in spec: if '+int64' in spec:
args.extend(['-DSUNDIALS_INDEX_TYPE=int64_t']) args.extend(['-DSUNDIALS_INDEX_TYPE=int64_t'])
else: else:
@ -285,7 +282,7 @@ def on_off(varstr):
# Building with SuperLU_MT # Building with SuperLU_MT
if '+superlu-mt' in spec: if '+superlu-mt' in spec:
if not spec.satisfies('@:2.7.0'): if spec.satisfies('@3.0.0:'):
args.extend([ args.extend([
'-DBLAS_ENABLE=ON', '-DBLAS_ENABLE=ON',
'-DBLAS_LIBRARIES=%s' % spec['blas'].libs '-DBLAS_LIBRARIES=%s' % spec['blas'].libs
@ -319,7 +316,7 @@ def on_off(varstr):
]) ])
# Examples # Examples
if not spec.satisfies('@:2.7.0'): if spec.satisfies('@3.0.0:'):
args.extend([ args.extend([
'-DEXAMPLES_ENABLE_C=%s' % on_off('+examples-c'), '-DEXAMPLES_ENABLE_C=%s' % on_off('+examples-c'),
'-DEXAMPLES_ENABLE_CXX=%s' % on_off('+examples-cxx'), '-DEXAMPLES_ENABLE_CXX=%s' % on_off('+examples-cxx'),