From 85de5276684c5ebb0a3d17fd34cc9f8a83de92b1 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Tue, 5 Oct 2021 01:00:11 -0700 Subject: sundials: Add 5.8.0 and sycl variant (#26524) --- var/spack/repos/builtin/packages/sundials/package.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 2dc036317b..acb6f993a6 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -14,8 +14,7 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): Solvers)""" homepage = "https://computing.llnl.gov/projects/sundials" - urls = ["https://computing.llnl.gov/projects/sundials/download/sundials-2.7.0.tar.gz", - "https://github.com/LLNL/sundials/releases/download/v2.7.0/sundials-2.7.0.tar.gz"] + url = "https://github.com/LLNL/sundials/releases/download/v2.7.0/sundials-2.7.0.tar.gz" git = "https://github.com/llnl/sundials.git" tags = ['radiuss', 'e4s'] @@ -25,6 +24,7 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): # Versions # ========================================================================== version('develop', branch='develop') + version('5.8.0', sha256='d4ed403351f72434d347df592da6c91a69452071860525385b3339c824e8a213') version('5.7.0', sha256='8d6dd094feccbb8d6ecc41340ec16a65fabac82ed4415023f6d7c1c2390ea2f3') version('5.6.1', sha256='16b77999ec7e7f2157aa1d04ca1de4a2371ca8150e056d24951d0c58966f2a83') version('5.6.0', sha256='95e4201912e150f29c6f6f7625de763385e2073dae7f929c4a544561ea29915d') @@ -78,6 +78,8 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): description='Enable Pthreads parallel vector') variant('raja', default=False, description='Enable RAJA vector') + variant('sycl', default=False, + description='Enable SYCL vector') # External libraries variant('hypre', default=False, @@ -129,6 +131,7 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): conflicts('+petsc', when='@:2.6.2') conflicts('+cuda', when='@:2.7.0') conflicts('+raja', when='@:2.7.0') + conflicts('+sycl', when='@:5.6.0') conflicts('~int64', when='@:2.7.0') conflicts('+superlu-dist', when='@:4.1.0') conflicts('+f2003', when='@:4.1.0') @@ -272,7 +275,8 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): args.extend([ self.define_from_variant('MPI_ENABLE', 'mpi'), self.define_from_variant('OPENMP_ENABLE', 'openmp'), - self.define_from_variant('PTHREAD_ENABLE', 'pthread') + self.define_from_variant('PTHREAD_ENABLE', 'pthread'), + self.define_from_variant('ENABLE_SYCL', 'sycl') ]) if '+cuda' in spec: @@ -679,4 +683,10 @@ class Sundials(CMakePackage, CudaPackage, ROCmPackage): self.run_test('examples/nvector/hip/test_nvector_hip', options=['10', '0', '0'], work_dir=self._extra_tests_path) + if '+sycl' in self.spec: + self.run_test('examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl', + work_dir=self._extra_tests_path) + self.run_test('examples/nvector/sycl/test_nvector_sycl', + options=['10', '0', '0'], + work_dir=self._extra_tests_path) return -- cgit v1.2.3-70-g09d2