From dd64bdc3130ac23f06ff6f4397428912b5c1a793 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 10 Oct 2019 09:11:15 -0500 Subject: hypre: add compatibility patch for petsc/mfem build failures (#13116) --- .../repos/builtin/packages/hypre/hypre21800-compat.patch | 12 ++++++++++++ var/spack/repos/builtin/packages/hypre/package.py | 1 + 2 files changed, 13 insertions(+) create mode 100644 var/spack/repos/builtin/packages/hypre/hypre21800-compat.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/hypre21800-compat.patch b/var/spack/repos/builtin/packages/hypre/hypre21800-compat.patch new file mode 100644 index 0000000000..7f0c84e8cf --- /dev/null +++ b/var/spack/repos/builtin/packages/hypre/hypre21800-compat.patch @@ -0,0 +1,12 @@ +diff --git a/src/parcsr_mv/_hypre_parcsr_mv.h b/src/parcsr_mv/_hypre_parcsr_mv.h +index db08548d1..119d0b3d9 100644 +--- a/src/parcsr_mv/_hypre_parcsr_mv.h ++++ b/src/parcsr_mv/_hypre_parcsr_mv.h +@@ -800,6 +800,7 @@ HYPRE_Int hypre_ParCSRMatrixCopy ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B + HYPRE_Int hypre_FillResponseParToCSRMatrix ( void *p_recv_contact_buf , HYPRE_Int contact_size , HYPRE_Int contact_proc , void *ro , MPI_Comm comm , void **p_send_response_buf , HYPRE_Int *response_message_size ); + hypre_ParCSRMatrix *hypre_ParCSRMatrixUnion ( hypre_ParCSRMatrix *A , hypre_ParCSRMatrix *B ); + hypre_ParCSRMatrix* hypre_ParCSRMatrixClone ( hypre_ParCSRMatrix *A, HYPRE_Int copy_data ); ++#define hypre_ParCSRMatrixCompleteClone(A) hypre_ParCSRMatrixClone(A,0) + hypre_ParCSRMatrix* hypre_ParCSRMatrixClone_v2 ( hypre_ParCSRMatrix *A, HYPRE_Int copy_data, HYPRE_Int memory_location ); + #ifdef HYPRE_USING_CUDA + //hypre_int hypre_ParCSRMatrixIsManaged(hypre_ParCSRMatrix *a); diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 8396531479..fc5bf923c7 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -59,6 +59,7 @@ class Hypre(Package): patch('darwin-shared-libs-for-hypre-2.14.0.patch', when='+shared@2.14.0 platform=darwin') patch('superlu-dist-link-2.15.0.patch', when='+superlu-dist @2.15:2.16.0') patch('superlu-dist-link-2.14.0.patch', when='+superlu-dist @:2.14.0') + patch('hypre21800-compat.patch', when='@2.18.0') depends_on("mpi", when='+mpi') depends_on("blas") -- cgit v1.2.3-70-g09d2