From 219846684bef2313223e80ddf6578c2ec14fd540 Mon Sep 17 00:00:00 2001 From: Cody Balos Date: Wed, 3 Oct 2018 19:37:54 -0700 Subject: SUNDIALS: add new versions (#9401) * Add SUNDIALS 3.2.0 and 4.0.0-dev.2 releases. * Update CMake dependency version constraints * Update CMake args to find raja dependency --- .../repos/builtin/packages/sundials/package.py | 37 +++++++++++----------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 989dedd716..ba0e99d0a1 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -38,24 +38,16 @@ class Sundials(CMakePackage): # ========================================================================== # Versions # ========================================================================== - - version('4.0.0-dev.1', - sha256='6354e1d266b60c23766137b4ffa9bbde8bca97a562ccd94cab756b597ed753c1') - version('4.0.0-dev', - sha256='50e526327461aebe463accf6ef56f9c6773df65025f3020b9ce68b83bbf5dd27') - version('3.1.2', - sha256='a8985bb1e851d90e24260450667b134bc13d71f5c6effc9e1d7183bd874fe116', - preferred=True) - version('3.1.1', - sha256='a24d643d31ed1f31a25b102a1e1759508ce84b1e4739425ad0e18106ab471a24') - version('3.1.0', - sha256='18d52f8f329626f77b99b8bf91e05b7d16b49fde2483d3a0ea55496ce4cdd43a') - version('3.0.0', - sha256='28b8e07eecfdef66e2c0d0ea0cb1b91af6e4e94d71008abfe80c27bf39f63fde') - version('2.7.0', - sha256='d39fcac7175d701398e4eb209f7e92a5b30a78358d4a0c0fcc23db23c11ba104') - version('2.6.2', - sha256='d8ed0151509dd2b0f317b318a4175f8b95a174340fc3080b8c20617da8aa4d2f') + version('4.0.0-dev.2', sha256='124fc12f2a68d32210c20f5005510607e0833764afaef2a70b741bc922519984') + version('4.0.0-dev.1', sha256='6354e1d266b60c23766137b4ffa9bbde8bca97a562ccd94cab756b597ed753c1') + version('4.0.0-dev', sha256='50e526327461aebe463accf6ef56f9c6773df65025f3020b9ce68b83bbf5dd27') + version('3.2.0', sha256='d2b690afecadf8b5a048bb27ab341de591d714605b98d3518985dfc2250e93f9', preferred=True) + version('3.1.2', sha256='a8985bb1e851d90e24260450667b134bc13d71f5c6effc9e1d7183bd874fe116') + version('3.1.1', sha256='a24d643d31ed1f31a25b102a1e1759508ce84b1e4739425ad0e18106ab471a24') + version('3.1.0', sha256='18d52f8f329626f77b99b8bf91e05b7d16b49fde2483d3a0ea55496ce4cdd43a') + version('3.0.0', sha256='28b8e07eecfdef66e2c0d0ea0cb1b91af6e4e94d71008abfe80c27bf39f63fde') + version('2.7.0', sha256='d39fcac7175d701398e4eb209f7e92a5b30a78358d4a0c0fcc23db23c11ba104') + version('2.6.2', sha256='d8ed0151509dd2b0f317b318a4175f8b95a174340fc3080b8c20617da8aa4d2f') # ========================================================================== # Variants @@ -178,7 +170,8 @@ class Sundials(CMakePackage): # Build dependencies depends_on('cmake@2.8.1:', type='build') depends_on('cmake@2.8.12:', type='build', when='@3.1.2') - depends_on('cmake@3.0.2:', type='build', when='@4.0.0:') + depends_on('cmake@3.0.2:', type='build', when='@4.0.0-dev.1') + depends_on('cmake@3.1.3:', type='build', when='@3.2.0,4.0.0-dev.2') # MPI related dependencies depends_on('mpi', when='+mpi') @@ -340,6 +333,12 @@ class Sundials(CMakePackage): '-DPETSC_LIBRARY_DIR=%s' % spec['petsc'].prefix.lib ]) + # Building with RAJA + if '+raja' in spec: + args.extend([ + '-DRAJA_DIR=%s' % spec['raja'].prefix.share.raja.cmake + ]) + # Examples if spec.satisfies('@3.0.0:'): args.extend([ -- cgit v1.2.3-60-g2f50