39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
|
From e6de09342ce9c4562cc062ff2c1bac4bd956bda0 Mon Sep 17 00:00:00 2001
|
||
|
From: Satish Balay <balay@mcs.anl.gov>
|
||
|
Date: Fri, 30 Mar 2018 09:53:12 -0500
|
||
|
Subject: [PATCH] hypre: update to version 2.14.0
|
||
|
|
||
|
Reported-by: Antonio Trande <anto.trande@gmail.com>
|
||
|
---
|
||
|
config/BuildSystem/config/packages/hypre.py | 2 +-
|
||
|
src/mat/impls/hypre/mhypre.c | 2 +-
|
||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
||
|
diff --git a/config/BuildSystem/config/packages/hypre.py b/config/BuildSystem/config/packages/hypre.py
|
||
|
index 1249b39..620e516 100644
|
||
|
--- a/config/BuildSystem/config/packages/hypre.py
|
||
|
+++ b/config/BuildSystem/config/packages/hypre.py
|
||
|
@@ -4,7 +4,7 @@ import os
|
||
|
class Configure(config.package.GNUPackage):
|
||
|
def __init__(self, framework):
|
||
|
config.package.GNUPackage.__init__(self, framework)
|
||
|
- self.gitcommit = 'v2.12.0'
|
||
|
+ self.gitcommit = 'v2.14.0'
|
||
|
self.download = ['git://https://github.com/LLNL/hypre','https://github.com/LLNL/hypre/archive/'+self.gitcommit+'.tar.gz']
|
||
|
self.functions = ['HYPRE_IJMatrixCreate']
|
||
|
self.includes = ['HYPRE.h']
|
||
|
diff --git a/src/mat/impls/hypre/mhypre.c b/src/mat/impls/hypre/mhypre.c
|
||
|
index 8a51581..65595f2 100644
|
||
|
--- a/src/mat/impls/hypre/mhypre.c
|
||
|
+++ b/src/mat/impls/hypre/mhypre.c
|
||
|
@@ -1450,6 +1450,6 @@ PETSC_EXTERN PetscErrorCode MatCreate_HYPRE(Mat B)
|
||
|
static PetscErrorCode hypre_array_destroy(void *ptr)
|
||
|
{
|
||
|
PetscFunctionBegin;
|
||
|
- hypre_TFree(ptr);
|
||
|
+ hypre_TFree(ptr,HYPRE_MEMORY_HOST);
|
||
|
PetscFunctionReturn(0);
|
||
|
}
|
||
|
--
|
||
|
2.10.5
|