Compare commits
83 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
504200e8fe | ||
|
4d8538482e | ||
|
5858f4e434 | ||
|
741bedec23 | ||
|
e164894ff2 | ||
|
c3687f5e2c | ||
|
e253d58202 | ||
|
24ed9054e6 | ||
|
743d442b43 | ||
|
cf09a67c34 | ||
|
9645be1945 | ||
|
39d86b8af9 | ||
|
fe126458ea | ||
|
e4aecf6a4d | ||
|
1b5941d08d | ||
|
8fee3e3501 | ||
|
411aa4b4f0 | ||
|
00b3630aa4 | ||
|
9abc8ad16a | ||
|
5cba6bd5e0 | ||
|
3494a026c2 | ||
|
b5c1e78c3d | ||
|
457faff280 | ||
|
c834cf6d2b | ||
|
9eea208c79 | ||
|
219133e3ee | ||
|
8bd9c29427 | ||
|
0634fc9786 | ||
|
bf2bc91829 | ||
|
b3437b038f | ||
|
d0a20eb9e3 | ||
|
869c105c82 | ||
|
ad20d020cc | ||
|
d0bddcb1d4 | ||
|
d293ecb508 | ||
|
5ee887765f | ||
|
68a6967f92 | ||
|
6676695f85 | ||
|
c949957b0b | ||
|
412a009d55 | ||
|
8ec405dfc6 | ||
|
471d88f626 | ||
|
3258770087 | ||
|
76748955e1 | ||
|
ff23c78bba | ||
|
751baf77f4 | ||
|
eada8e54da | ||
|
d890f27303 | ||
|
862f4dce3c | ||
|
6a0cc22576 | ||
|
8e2c25f12a | ||
|
48342c7434 | ||
|
4f1a6627ab | ||
|
55957426de | ||
|
a765aa37f9 | ||
|
a7a64a926c | ||
|
f12f75c95b | ||
|
3386a9b6c9 | ||
|
6c55a29a54 | ||
|
9d99770e02 | ||
|
4caff6160d | ||
|
3acb8216a6 | ||
|
f1fb570ad7 | ||
|
7d2e1c843b | ||
|
f8f0dc1d88 | ||
|
6e63e4c22c | ||
|
b7b1cc3950 | ||
|
5192caf8c5 | ||
|
6628f24209 | ||
|
5ed657e6d6 | ||
|
a954b44285 | ||
|
4d56ca7d40 | ||
|
d1274421a2 | ||
|
f020fb3842 | ||
|
c1598ba3a4 | ||
|
51365ed0f9 | ||
|
fcb9e8675e | ||
|
abc714a41f | ||
|
71da664024 | ||
|
9fedc4f4c1 | ||
|
45b8086018 | ||
|
eebca3e02a | ||
|
07fe131dee |
32
.gitignore
vendored
32
.gitignore
vendored
@ -14,3 +14,35 @@
|
||||
/petsc-3.11.1.tar.gz
|
||||
/petsc-3.11.2.tar.gz
|
||||
/petsc-3.11.3.tar.gz
|
||||
/petsc-3.12.0.tar.gz
|
||||
/petsc-3.12.1.tar.gz
|
||||
/petsc-3.12.2.tar.gz
|
||||
/petsc-3.12.3.tar.gz
|
||||
/petsc-3.12.4.tar.gz
|
||||
/petsc-3.13.0.tar.gz
|
||||
/petsc-3.13.1.tar.gz
|
||||
/petsc-3.13.2.tar.gz
|
||||
/petsc-3.13.3.tar.gz
|
||||
/petsc-3.13.4.tar.gz
|
||||
/petsc-3.13.5.tar.gz
|
||||
/petsc-3.14.1.tar.gz
|
||||
/petsc-3.14.2.tar.gz
|
||||
/petsc-3.14.4.tar.gz
|
||||
/petsc-3.14.5.tar.gz
|
||||
/petsc-3.14.6.tar.gz
|
||||
/petsc-with-docs-3.15.0.tar.gz
|
||||
/petsc4py-3.15.0.tar.gz
|
||||
/petsc-with-docs-3.15.1.tar.gz
|
||||
/petsc4py-3.15.1.tar.gz
|
||||
/petsc-with-docs-3.15.2.tar.gz
|
||||
/petsc4py-3.15.2.tar.gz
|
||||
/petsc-with-docs-3.15.3.tar.gz
|
||||
/petsc4py-3.15.3.tar.gz
|
||||
/petsc-with-docs-3.15.4.tar.gz
|
||||
/petsc4py-3.15.4.tar.gz
|
||||
/petsc-with-docs-3.16.0.tar.gz
|
||||
/petsc4py-3.16.0.tar.gz
|
||||
/petsc-with-docs-3.16.3.tar.gz
|
||||
/petsc4py-3.16.3.tar.gz
|
||||
/petsc-with-docs-3.16.4.tar.gz
|
||||
/petsc4py-3.16.4.tar.gz
|
||||
|
11
petsc-3.13-fix_mumps_includes.patch
Normal file
11
petsc-3.13-fix_mumps_includes.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/config/BuildSystem/config/packages/MUMPS.orig.py 2020-03-30 05:33:12.000000000 +0200
|
||||
+++ b/config/BuildSystem/config/packages/MUMPS.py 2020-04-03 17:01:49.237255499 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
['libcmumps.a','libdmumps.a','libsmumps.a','libzmumps.a','libmumps_common.a','libpord.a','libmpiseq.a'],
|
||||
['libcmumps.a','libdmumps.a','libsmumps.a','libzmumps.a','libmumps_common.a','libpord.a','libpthread.a','libmpiseq.a']]
|
||||
self.functions = ['dmumps_c']
|
||||
- self.includes = ['dmumps_c.h']
|
||||
+ self.includes = ['MUMPS/dmumps_c.h']
|
||||
#
|
||||
self.fc = 1
|
||||
self.precisions = ['single','double']
|
22
petsc-3.13.0-fix_metis64.patch
Normal file
22
petsc-3.13.0-fix_metis64.patch
Normal file
@ -0,0 +1,22 @@
|
||||
--- a/config/BuildSystem/config/packages/metis.orig.py 2020-03-29 16:29:06.000000000 +0200
|
||||
+++ b/config/BuildSystem/config/packages/metis.py 2020-04-03 18:00:37.013851959 +0200
|
||||
@@ -8,8 +8,8 @@
|
||||
self.download = ['git://https://bitbucket.org/petsc/pkg-metis.git','https://bitbucket.org/petsc/pkg-metis/get/'+self.gitcommit+'.tar.gz']
|
||||
self.downloaddirnames = ['petsc-pkg-metis']
|
||||
self.functions = ['METIS_PartGraphKway']
|
||||
- self.includes = ['metis.h']
|
||||
- self.liblist = [['libmetis.a'],['libmetis.a','libexecinfo.a']]
|
||||
+ self.includes = ['metis64.h']
|
||||
+ self.liblist = [['libmetis64.a'],['libmetis64.a','libexecinfo.a']]
|
||||
self.hastests = 1
|
||||
self.useddirectly = 0
|
||||
return
|
||||
@@ -50,7 +50,7 @@
|
||||
config.package.Package.configureLibrary(self)
|
||||
oldFlags = self.compilers.CPPFLAGS
|
||||
self.compilers.CPPFLAGS += ' '+self.headers.toString(self.include)
|
||||
- if not self.checkCompile('#include "metis.h"', '#if (IDXTYPEWIDTH != '+ str(self.getDefaultIndexSize())+')\n#error incompatible IDXTYPEWIDTH\n#endif'):
|
||||
+ if not self.checkCompile('#include "metis64.h"', '#if (IDXTYPEWIDTH != '+ str(self.getDefaultIndexSize())+')\n#error incompatible IDXTYPEWIDTH\n#endif'):
|
||||
if self.defaultIndexSize == 64:
|
||||
msg= '--with-64-bit-indices option requires a metis build with IDXTYPEWIDTH=64.\n'
|
||||
else:
|
@ -3,7 +3,7 @@ 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>
|
||||
Reported-by: Antonio Trande <sagitter@fedoraproject.org>
|
||||
---
|
||||
config/BuildSystem/config/packages/hypre.py | 2 +-
|
||||
src/mat/impls/hypre/mhypre.c | 2 +-
|
||||
@ -13,26 +13,22 @@ diff --git a/config/BuildSystem/config/packages/hypre.py b/config/BuildSystem/co
|
||||
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):
|
||||
@@ -5,7 +5,7 @@
|
||||
def __init__(self, framework):
|
||||
config.package.GNUPackage.__init__(self, framework)
|
||||
- self.gitcommit = 'v2.12.0'
|
||||
+ self.gitcommit = 'v2.15.1'
|
||||
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
|
||||
self.version = '2.19.0'
|
||||
- self.minversion = '2.14'
|
||||
+ self.minversion = '2.11.2'
|
||||
self.versionname = 'HYPRE_RELEASE_VERSION'
|
||||
self.versioninclude = 'HYPRE_config.h'
|
||||
self.requiresversion = 1
|
||||
--- 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)
|
||||
@@ -2131,6 +2131,6 @@
|
||||
static PetscErrorCode hypre_array_destroy(void *ptr)
|
||||
{
|
||||
PetscFunctionBegin;
|
||||
- hypre_TFree(ptr);
|
||||
+ hypre_TFree(ptr,HYPRE_MEMORY_HOST);
|
||||
- hypre_TFree(ptr,HYPRE_MEMORY_HOST);
|
||||
+ hypre_TFree(ptr);
|
||||
PetscFunctionReturn(0);
|
||||
}
|
||||
--
|
||||
2.10.5
|
11
petsc-3.14.1-fix_pkgconfig_file.patch
Normal file
11
petsc-3.14.1-fix_pkgconfig_file.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/config/PETSc/Configure.orig.py 2020-03-30 05:33:12.000000000 +0200
|
||||
+++ b/config/PETSc/Configure.py 2020-04-04 22:58:19.770481378 +0200
|
||||
@@ -148,7 +148,7 @@
|
||||
if not os.path.exists(os.path.join(self.petscdir.dir,self.arch.arch,'lib','pkgconfig')):
|
||||
os.makedirs(os.path.join(self.petscdir.dir,self.arch.arch,'lib','pkgconfig'))
|
||||
with open(os.path.join(self.petscdir.dir,self.arch.arch,'lib','pkgconfig',petsc_pc),'w') as fd:
|
||||
- cflags_inc = ['-I${includedir}']
|
||||
+ cflags_inc = ['-I${includedir}/petsc']
|
||||
if self.framework.argDB['prefix']:
|
||||
fd.write('prefix='+self.installdir.dir+'\n')
|
||||
else:
|
13
petsc-3.15.0-fix_sundials_version.patch
Normal file
13
petsc-3.15.0-fix_sundials_version.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- a/config/BuildSystem/config/packages/sundials2.orig.py 2019-09-30 01:36:08.000000000 +0200
|
||||
+++ b/config/BuildSystem/config/packages/sundials2.py 2020-04-04 16:15:52.074244560 +0200
|
||||
@@ -3,8 +3,8 @@
|
||||
class Configure(config.package.GNUPackage):
|
||||
def __init__(self, framework):
|
||||
config.package.GNUPackage.__init__(self, framework)
|
||||
- self.version = '2.5.0'
|
||||
- self.maxversion = '2.5.100000'
|
||||
+ self.version = '5.2.0'
|
||||
+ self.maxversion = '5.7.000000'
|
||||
self.versionname = 'SUNDIALS_PACKAGE_VERSION'
|
||||
self.download = ['http://ftp.mcs.anl.gov/pub/petsc/externalpackages/sundials-'+self.version+'p1.tar.gz']
|
||||
self.downloaddirnames = ['sundials']
|
13
petsc-3.4.1-avoid_fake_MKL_detection.patch
Normal file
13
petsc-3.4.1-avoid_fake_MKL_detection.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- a/config/BuildSystem/config/packages/BlasLapack.orig.py 2020-11-03 19:01:59.000000000 +0100
|
||||
+++ b/config/BuildSystem/config/packages/BlasLapack.py 2020-11-09 10:37:06.551705855 +0100
|
||||
@@ -546,8 +546,8 @@
|
||||
'''Check for Intel MKL library'''
|
||||
self.libraries.saveLog()
|
||||
if self.libraries.check(self.dlib, 'mkl_set_num_threads'):
|
||||
- self.mkl = 1
|
||||
- self.addDefine('HAVE_MKL',1)
|
||||
+ self.mkl = 0
|
||||
+ self.addDefine('HAVE_MKL',0)
|
||||
'''Set include directory for mkl.h and friends'''
|
||||
'''(the include directory is in CPATH if mklvars.sh has been sourced.'''
|
||||
''' if the script hasn't been sourced, we still try to pick up the include dir)'''
|
@ -1,17 +0,0 @@
|
||||
diff --git a/lib/petsc/conf/rules b/lib/petsc/conf/rules
|
||||
index c6cfba4..7491faf 100644
|
||||
--- lib/petsc/conf/rules
|
||||
+++ lib/petsc/conf/rules
|
||||
@@ -37,9 +37,10 @@ chklib_dir: chk_makej
|
||||
@if [ ! -d "${INSTALL_LIB_DIR}" ]; then \
|
||||
echo Making directory ${INSTALL_LIB_DIR} for library; ${MKDIR} ${INSTALL_LIB_DIR} ; fi
|
||||
|
||||
-
|
||||
# 3. Check if the shared libs are out of date
|
||||
-chkopts: chk_upgrade
|
||||
+chkopts:
|
||||
+ @true
|
||||
+chkopts_disabled: chk_upgrade
|
||||
@for LIBNAME in ${SHLIBS}; do \
|
||||
library=${INSTALL_LIB_DIR}/$$LIBNAME.a; \
|
||||
sharedlibrary=${INSTALL_LIB_DIR}/$$LIBNAME.${SL_LINKER_SUFFIX}; \
|
11
petsc-porting_to_python311.patch
Normal file
11
petsc-porting_to_python311.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/src/petsc4py.PETSc.origin.c 2022-01-06 03:57:32.000000000 +0100
|
||||
+++ b/src/petsc4py.PETSc.c 2022-01-12 20:44:44.434469854 +0100
|
||||
@@ -193,7 +193,7 @@
|
||||
#define CYTHON_FAST_PYCCALL (CYTHON_FAST_PYCALL && PY_VERSION_HEX >= 0x030600B1)
|
||||
#endif
|
||||
#if CYTHON_USE_PYLONG_INTERNALS
|
||||
- #include "longintrepr.h"
|
||||
+ #include "cpython/longintrepr.h"
|
||||
#undef SHIFT
|
||||
#undef BASE
|
||||
#undef MASK
|
1455
petsc.spec
1455
petsc.spec
File diff suppressed because it is too large
Load Diff
3
sources
3
sources
@ -1 +1,2 @@
|
||||
SHA512 (petsc-3.11.3.tar.gz) = e545f69e87bc72950939ff3cec3e0ba225a5b3e7f1cb93b0fb6123194eb7240ac1d97ba397235d8ab872c653caab1427673124e5e1e706b796c0ae46ec1bcffa
|
||||
SHA512 (petsc-with-docs-3.16.4.tar.gz) = 55a835b63bdf30fd50dc327dc9fca94f8eb80fc5bf16f43238e89880d8137992028fe8a6906d2b59967370a9040456e26db27bfebfd0a4b88ea698f49de2f839
|
||||
SHA512 (petsc4py-3.16.4.tar.gz) = f431461ed2464651b1adb1f60f2e29913bb5bf889feb06a494c88bf43192733809b1a65724e29b4ec14ecb6e012af92a62a58c3fa18b50cf30c556a69e0aba7b
|
||||
|
Loading…
Reference in New Issue
Block a user