diff options
| author | David Gardner <gardner48@llnl.gov> | 2017-11-08 21:06:34 -0800 |
|---|---|---|
| committer | Christoph Junghans <christoph.junghans@gmail.com> | 2017-11-08 22:06:34 -0700 |
| commit | a656bc300a4f98f73a54105a0cc9546c59d207cb (patch) | |
| tree | 82d92409097605366cf39c5873b440e743d0c244 | |
| parent | 3159841e332bec9ccabde644a4ce8008d530e6ef (diff) | |
| download | spack-a656bc300a4f98f73a54105a0cc9546c59d207cb.tar.gz spack-a656bc300a4f98f73a54105a0cc9546c59d207cb.tar.bz2 spack-a656bc300a4f98f73a54105a0cc9546c59d207cb.tar.xz spack-a656bc300a4f98f73a54105a0cc9546c59d207cb.zip | |
add patch for building sundials (#6161)
* add patch for building sundials on mac
* add upper limit on the patch
| -rw-r--r-- | var/spack/repos/builtin/packages/sundials/package.py | 7 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/sundials/test_nvector_parhyp.patch | 18 |
2 files changed, 25 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/sundials/package.py b/var/spack/repos/builtin/packages/sundials/package.py index 1c2fa177f2..2dd05bf127 100644 --- a/var/spack/repos/builtin/packages/sundials/package.py +++ b/var/spack/repos/builtin/packages/sundials/package.py @@ -197,6 +197,13 @@ class Sundials(CMakePackage): depends_on('superlu-mt+blas', when='+superlu-mt') # ========================================================================== + # Patches + # ========================================================================== + + # remove OpenMP header file and function from hypre vector test code + patch('test_nvector_parhyp.patch', when='@2.7.0:3.0.0') + + # ========================================================================== # SUNDIALS Settings # ========================================================================== diff --git a/var/spack/repos/builtin/packages/sundials/test_nvector_parhyp.patch b/var/spack/repos/builtin/packages/sundials/test_nvector_parhyp.patch new file mode 100644 index 0000000000..ecb71d4a5f --- /dev/null +++ b/var/spack/repos/builtin/packages/sundials/test_nvector_parhyp.patch @@ -0,0 +1,18 @@ +--- a/examples/nvector/parhyp/test_nvector_parhyp.c ++++ b/examples/nvector/parhyp/test_nvector_parhyp.c +@@ -24,7 +24,6 @@ + #include "test_nvector.h" + + #include <mpi.h> +-#include <omp.h> + + #if defined( SUNDIALS_HAVE_POSIX_TIMERS) && defined(_POSIX_TIMERS) + #include <time.h> +@@ -74,7 +73,6 @@ int main(int argc, char *argv[]) + /* printf("\nRunning with vector length %ld \n \n", veclen); */ + /* Get processor number and total number of processes */ + MPI_Init(&argc, &argv); +- /* omp_set_num_threads(4); */ + comm = MPI_COMM_WORLD; + MPI_Comm_size(comm, &nprocs); + MPI_Comm_rank(comm, &myid); |